diff --git a/lib/pages/discover/task_detail.dart b/lib/pages/discover/task_detail.dart
index 7ab9ee9..f39ce9b 100644
--- a/lib/pages/discover/task_detail.dart
+++ b/lib/pages/discover/task_detail.dart
@@ -61,70 +61,24 @@ class _TaskDetailState extends State<TaskDetail> {
                                       ),
                                     ),
                                   ),
-                                  Container(
-                                    padding: EdgeInsets.only(left: 14.w, right: 18.w, top: 8.w, bottom: 8.w),
-                                    decoration: BoxDecoration(
-                                        border: Border(
-                                            bottom: BorderSide(width: 1.w, color: const Color.fromRGBO(212, 212, 212, 1))
-                                        )
-                                    ),
-                                    alignment: Alignment.centerLeft,
-                                    child: Text(
-                                      "1.${
-                                          roomController.taskTemplateData.value.subList!.firstWhere(
-                                                (e) => e.sort == 1,
-                                            orElse: () => SubList(sort: 0),
-                                          ).sort != 0 ? roomController.taskTemplateData.value.subList!.firstWhere(
-                                                (e) => e.sort == 1,
-                                            orElse: () => SubList(sort: 0),
-                                          ).subTaskDesc : ""
-                                      };",
-                                      style: TextStyle(
-                                          fontSize: 14.w
-                                      ),
-                                    ),
-                                  ),
-                                  Container(
+                                  for (int i = 0; i < roomController.taskTemplateData.value.subList!.length; i++)
+                                    Container(
                                     padding: EdgeInsets.only(left: 14.w, right: 18.w, top: 8.w, bottom: 8.w),
                                     decoration: BoxDecoration(
-                                        border: Border(
+                                        border: i < roomController.taskTemplateData.value.subList!.length - 1 ? Border(
                                             bottom: BorderSide(width: 1.w, color: const Color.fromRGBO(212, 212, 212, 1))
-                                        )
+                                        ) : null
                                     ),
                                     alignment: Alignment.centerLeft,
                                     child: Text(
-                                      "2.${
-                                          roomController.taskTemplateData.value.subList!.firstWhere(
-                                                (e) => e.sort == 2,
-                                            orElse: () => SubList(sort: 0),
-                                          ).sort != 0 ? roomController.taskTemplateData.value.subList!.firstWhere(
-                                                (e) => e.sort == 2,
-                                            orElse: () => SubList(sort: 0),
-                                          ).subTaskDesc : ""
-                                      };",
+                                      "${i + 1}.${
+                                          roomController.taskTemplateData.value.subList![i].subTaskDesc ?? ""
+                                      }${i < roomController.taskTemplateData.value.subList!.length - 1? ";" : ""}",
                                       style: TextStyle(
                                           fontSize: 14.w
                                       ),
                                     ),
                                   ),
-                                  Container(
-                                    padding: EdgeInsets.only(left: 14.w, right: 18.w, top: 8.w, bottom: 8.w),
-                                    alignment: Alignment.centerLeft,
-                                    child: Text(
-                                      "3.${
-                                          roomController.taskTemplateData.value.subList!.firstWhere(
-                                                (e) => e.sort == 3,
-                                            orElse: () => SubList(sort: 0),
-                                          ).sort != 0 ? roomController.taskTemplateData.value.subList!.firstWhere(
-                                                (e) => e.sort == 3,
-                                            orElse: () => SubList(sort: 0),
-                                          ).subTaskDesc : ""
-                                      }",
-                                      style: TextStyle(
-                                          fontSize: 14.w
-                                      ),
-                                    ),
-                                  )
                                 ],
                               ),
                             ),