Browse Source

1、fixed:0018086: 【体检系统】【web客户端】已做部分体检项后,“已做体检项”tab下显示一个空行

guanxinyi 1 year ago
parent
commit
82cc093888

+ 11 - 3
lib/pages/medical_checkup_station/registration/controller/list.dart

@@ -43,12 +43,20 @@ class RegistrationListController {
     "HEITCMC"
   ];
   Map<String, dynamic> examData = {};
-  List<String> examList() {
-    List<String> missingData = _allExam
+  List<String> noMedicalCheckUpList() {
+    List<String> noCheckUpList = _allExam
         .where((element) =>
             !(currentResident.finishedExamKeys ?? []).contains(element))
         .toList();
-    return missingData;
+    return noCheckUpList;
+  }
+
+  List<String> medicalCheckUpList() {
+    List<String> checkUpList = _allExam
+        .where((element) =>
+            (currentResident.finishedExamKeys ?? []).contains(element))
+        .toList();
+    return checkUpList;
   }
 
   /// 是否有健康检测的页面权限

+ 7 - 5
lib/pages/medical_checkup_station/registration/view/index.dart

@@ -85,11 +85,14 @@ class RegistrationList extends GetView<RegistrationController> {
                   return Container(
                     child: Column(
                       children: [
-                        if (controller.listController.examList().length != 0)
+                        if (controller.listController
+                                .noMedicalCheckUpList()
+                                .length !=
+                            0)
                           _buildTitle("未做体检项"),
                         Column(
                           children: controller.listController
-                              .examList()
+                              .noMedicalCheckUpList()
                               .map((e) => ListTile(
                                     title: Text(_currentExam[e] ?? ''),
                                     onTap: () {},
@@ -103,9 +106,8 @@ class RegistrationList extends GetView<RegistrationController> {
                             0)
                           _buildTitle("已做体检项"),
                         Column(
-                          children: (controller.listController.currentResident
-                                      .finishedExamKeys ??
-                                  [])
+                          children: controller.listController
+                              .medicalCheckUpList()
                               .map((e) => ListTile(
                                     title: Text(_currentExam[e] ?? ''),
                                     onTap: () {},