一体机时间控件优化、默认时间、搜索逻辑优化

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

@@ -69,10 +69,9 @@ class HealthCheckLeft extends GetView<HealthCheckListController> {
             Get.dialog(
               FilterTime(
                 onConfirm: (start, end) {
-                  controller.getRegisterInfoPage(
-                    startTime: start,
-                    endTime: end,
-                  );
+                  controller.startTime = start;
+                  controller.endTime = start;
+                  controller.getRegisterInfoPage();
                 },
               ),
             );

lib/pages/medical/widgets/health_check/health_check_list/controller.dart

@@ -37,6 +37,9 @@ class HealthCheckListController extends GetxController {
     idNumber: '',
   );
 
+  DateTime? startTime;
+  DateTime? endTime;
+
   /// 手动填写的病人名字
   PatientDTO? patientInfo = PatientDTO();
 
@@ -68,8 +71,6 @@ class HealthCheckListController extends GetxController {
     int? pageSize = 10,
     int? pageIndex = 1,
     String? keyword = "",
-    DateTime? startTime,
-    DateTime? endTime,
   }) async {
     tableLoading = true;
     currPageIndex = pageIndex!;
@@ -78,8 +79,8 @@ class HealthCheckListController extends GetxController {
       pageSize: pageSize,
       pageIndex: pageIndex,
       keyword: keyword,
-      startTime: startTime,
-      endTime: endTime,
+      startTime: this.startTime,
+      endTime: this.endTime,
     );
 
     List<ResidentModel> _residentList = [];
@@ -198,9 +199,9 @@ class HealthCheckListController extends GetxController {
 
   _initData() async {
     var now = DateTime.now();
-    var startTime = new DateTime(now.year, now.month, now.day);
-    var endTime = startTime.add(Duration(hours: 23, minutes: 59, seconds: 59));
-    await getRegisterInfoPage(startTime: startTime, endTime: endTime);
+    startTime = new DateTime(now.year, now.month, now.day);
+    endTime = startTime!.add(Duration(hours: 23, minutes: 59, seconds: 59));
+    await getRegisterInfoPage();
     Get.find<IDeviceManager>().onScanCode.addListener(_onScanCode);
   }
 

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

@@ -67,10 +67,9 @@ class HeartCheckLeft extends GetView<HeartCheckListController> {
             Get.dialog(
               FilterTime(
                 onConfirm: (start, end) {
-                  controller.getRegisterInfoPage(
-                    startTime: start,
-                    endTime: end,
-                  );
+                  controller.startTime = start;
+                  controller.endTime = end;
+                  controller.getRegisterInfoPage();
                 },
               ),
             );

lib/pages/medical/widgets/health_heart_check/health_check_list/controller.dart

@@ -26,6 +26,10 @@ class HeartCheckListController extends GetxController {
     idNumber: '',
   );
 
+  DateTime? startTime;
+
+  DateTime? endTime;
+
   /// 手动填写的病人名字
   PatientDTO? patientInfo = PatientDTO();
 
@@ -50,12 +54,11 @@ class HeartCheckListController extends GetxController {
   /// 扫码事件
   final FEventHandler<String> onScanCode = FEventHandler<String>();
   final debouncer = Debouncer(milliseconds: 2000);
+
   Future<void> getRegisterInfoPage({
     int? pageSize = 10,
     int? pageIndex = 1,
     String? keyword = "",
-    DateTime? startTime,
-    DateTime? endTime,
   }) async {
     tableLoading = true;
     currPageIndex = pageIndex!;
@@ -201,9 +204,9 @@ class HeartCheckListController extends GetxController {
 
   _initData() async {
     var now = DateTime.now();
-    var startTime = new DateTime(now.year, now.month, now.day);
-    var endTime = startTime.add(Duration(hours: 23, minutes: 59, seconds: 59));
-    await getRegisterInfoPage(startTime: startTime, endTime: endTime);
+    startTime = new DateTime(now.year, now.month, now.day);
+    endTime = startTime!.add(Duration(hours: 23, minutes: 59, seconds: 59));
+    await getRegisterInfoPage();
     Get.find<IDeviceManager>().onScanCode.addListener(_onScanCode);
   }
 

lib/pages/medical_checkup_station/registration/controller.dart

@@ -59,10 +59,10 @@ class RegistrationController extends GetxController {
 
   _initData() async {
     var now = DateTime.now();
-    var startTime = new DateTime(now.year, now.month, now.day);
-    var endTime = startTime.add(Duration(hours: 23, minutes: 59, seconds: 59));
-    await listController.getRegisterInfoPage(
-        startTime: startTime, endTime: endTime);
+    listController.state.startTime = new DateTime(now.year, now.month, now.day);
+    listController.state.endTime = listController.state.startTime!
+        .add(Duration(hours: 23, minutes: 59, seconds: 59));
+    await listController.getRegisterInfoPage();
     if (!kIsWeb) {
       List<PrinterInfo>? printerInfoList = await queryLocalUSBPrinter();
       if (printerInfoList.length == 0) {

lib/pages/medical_checkup_station/registration/controller/form.dart

@@ -152,16 +152,10 @@ class RegistrationFormController {
     required PatientDTO patient,
     required bool isVital,
   }) async {
-    var now = DateTime.now();
-    var startTime = new DateTime(now.year, now.month, now.day);
-    var endTime = startTime.add(Duration(hours: 23, minutes: 59, seconds: 59));
     await createResident(
       patient,
       isVital: isVital,
     );
-    await registrationController.listController.getRegisterInfoPage(
-      startTime: startTime,
-      endTime: endTime,
-    );
+    await registrationController.listController.getRegisterInfoPage();
   }
 }

lib/pages/medical_checkup_station/registration/controller/list.dart

@@ -63,8 +63,6 @@ class RegistrationListController {
     int? pageSize = 10,
     int? pageIndex = 1,
     String? keyword = "",
-    DateTime? startTime,
-    DateTime? endTime,
   }) async {
     registrationController.tableLoading = true;
     registrationController.currPageIndex = pageIndex!;
@@ -74,8 +72,8 @@ class RegistrationListController {
       pageSize: pageSize,
       pageIndex: pageIndex,
       keyword: keyword,
-      startTime: startTime,
-      endTime: endTime,
+      startTime: state.startTime,
+      endTime: state.endTime,
     );
 
     List<ResidentModel> _residentList = [];

lib/pages/medical_checkup_station/registration/state/list.dart

@@ -15,6 +15,9 @@ class ListState {
   set resultsAndSuggestions(String? value) =>
       _resultsAndSuggestions.value = value;
   String? get resultsAndSuggestions => _resultsAndSuggestions.value;
+
+  DateTime? startTime;
+  DateTime? endTime;
 }
 
 class ResidentModel {

lib/pages/medical_checkup_station/registration/widgets/filter/filter_time.dart

@@ -25,7 +25,7 @@ class FilterTime extends StatelessWidget {
   Widget build(BuildContext context) {
     var now = DateTime.now();
     DateTime newDay = DateTime(now.year, now.month, now.day);
-    _startTime = newDay.add(Duration(days: -30));
+    _startTime = newDay;
     _endTime = newDay.add(Duration(hours: 23, minutes: 59));
     // 设置日期格式为 年-月-日 时:分
     String startFormattedDate =

lib/pages/medical_checkup_station/registration/widgets/filter/index.dart

@@ -112,14 +112,8 @@ class RegistrationFilter extends GetView<RegistrationController> {
             clearable: true,
             onClear: () {},
             onSearch: (value) {
-              var now = DateTime.now();
-              var startTime = new DateTime(now.year, now.month, now.day);
-              var endTime =
-                  startTime.add(Duration(hours: 23, minutes: 59, seconds: 59));
               controller.listController.getRegisterInfoPage(
                 keyword: value,
-                startTime: startTime,
-                endTime: endTime,
               );
             },
           ),
@@ -128,10 +122,9 @@ class RegistrationFilter extends GetView<RegistrationController> {
           onPressed: () {
             Get.dialog(FilterTime(
               onConfirm: (start, end) {
-                controller.listController.getRegisterInfoPage(
-                  startTime: start,
-                  endTime: end,
-                );
+                controller.listController.state.startTime = start;
+                controller.listController.state.endTime = end;
+                controller.listController.getRegisterInfoPage();
               },
             ));
           },