1、心电支持筛选

lib/pages/medical/widgets/health_check/health_check_left/index.dart

@@ -3,7 +3,6 @@
 import 'package:fis_ui/types/widget_builders.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:vitalapp/components/button.dart';
 import 'package:vitalapp/components/search_input.dart';
 import 'package:vitalapp/pages/medical/widgets/health_check/health_check_list/controller.dart';
 import 'package:vitalapp/pages/medical/widgets/health_check/health_check_list/view.dart';
@@ -65,30 +64,25 @@ class HealthCheckLeft extends GetView<HealthCheckListController> {
             },
           ),
         ),
-        Expanded(child: SizedBox()),
-        SizedBox(
-          width: 140,
-          height: 60,
-          child: VButton(
-            onTap: () {
-              Get.dialog(FilterTime(
+        IconButton(
+          onPressed: () {
+            Get.dialog(
+              FilterTime(
                 onConfirm: (start, end) {
                   controller.getRegisterInfoPage(
                     startTime: start,
                     endTime: end,
                   );
                 },
-              ));
-            },
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: const [
-                Icon(Icons.filter_alt, size: 24),
-                Text("筛选", style: TextStyle(fontSize: 20)),
-              ],
-            ),
+              ),
+            );
+          },
+          icon: Icon(
+            Icons.filter_alt,
+            size: 24,
           ),
         ),
+        Expanded(child: SizedBox()),
       ],
     );
   }

lib/pages/medical/widgets/health_check/view.dart

@@ -49,6 +49,7 @@ class _HealthCheckState extends State<HealthCheck> {
   @override
   void dispose() {
     medicalController.onSelectExam.removeListener(selectExamEvent);
+    Get.delete<MedicalController>();
     super.dispose();
   }
 

lib/pages/medical/widgets/health_heart_check/health_check_left/index.dart

@@ -7,6 +7,7 @@ import 'package:vitalapp/components/search_input.dart';
 import 'package:vitalapp/pages/medical/widgets/health_heart_check/health_check_list/controller.dart';
 import 'package:vitalapp/pages/medical/widgets/health_heart_check/health_check_list/view.dart';
 import 'package:vitalapp/pages/medical_checkup_station/registration/state/list.dart';
+import 'package:vitalapp/pages/medical_checkup_station/registration/widgets/filter/filter_time.dart';
 
 class HeartCheckLeft extends GetView<HeartCheckListController> {
   HeartCheckLeft({
@@ -37,27 +38,50 @@ class HeartCheckLeft extends GetView<HeartCheckListController> {
   }
 
   Widget _buildHeartCheckFilter() {
-    return Container(
-      alignment: Alignment.centerLeft,
-      margin: const EdgeInsets.all(10.0), // 设置外边距
-      padding: const EdgeInsets.all(5.0), // 设置内边距
-      decoration: BoxDecoration(
-        color: Colors.grey[200], // 设置背景颜色
-        borderRadius: BorderRadius.circular(16.0), // 设置圆角边框
-      ),
-      height: 60,
-      width: 520,
-      child: VSearchInput(
-        textEditingController: TextEditingController(text: ""),
-        placeholder: "请输入身份证号码",
-        clearable: true,
-        onClear: () {},
-        onSearch: (value) {
-          controller.getRegisterInfoPage(
-            keyword: value,
-          );
-        },
-      ),
+    return Row(
+      children: [
+        Container(
+          alignment: Alignment.centerLeft,
+          margin: const EdgeInsets.all(10.0), // 设置外边距
+          padding: const EdgeInsets.all(5.0), // 设置内边距
+          decoration: BoxDecoration(
+            color: Colors.grey[200], // 设置背景颜色
+            borderRadius: BorderRadius.circular(16.0), // 设置圆角边框
+          ),
+          height: 60,
+          width: 520,
+          child: VSearchInput(
+            textEditingController: TextEditingController(text: ""),
+            placeholder: "请输入身份证号码",
+            clearable: true,
+            onClear: () {},
+            onSearch: (value) {
+              controller.getRegisterInfoPage(
+                keyword: value,
+              );
+            },
+          ),
+        ),
+        IconButton(
+          onPressed: () {
+            Get.dialog(
+              FilterTime(
+                onConfirm: (start, end) {
+                  controller.getRegisterInfoPage(
+                    startTime: start,
+                    endTime: end,
+                  );
+                },
+              ),
+            );
+          },
+          icon: Icon(
+            Icons.filter_alt,
+            size: 24,
+          ),
+        ),
+        Expanded(child: SizedBox()),
+      ],
     );
   }
 }

lib/pages/medical/widgets/health_heart_check/view.dart

@@ -42,6 +42,8 @@ class _HeartTableCheckState extends State<HeartTableCheck> {
   @override
   void dispose() {
     medicalController.onSelectExam.removeListener(selectExamEvent);
+    Get.delete<MedicalController>();
+
     super.dispose();
   }
 
@@ -64,7 +66,7 @@ class _HeartTableCheckState extends State<HeartTableCheck> {
               /// 这是表格选中
               controller.currectSelected =
                   controller.residentList.indexOf(value);
-              controller.update(["healthCheck_table"]);
+              controller.update(["heartCheck_table"]);
               await _onResponseClick(value, true);
             },
           ),