Эх сурвалжийг харах

1、解决合并后丢失的代码

guanxinyi 1 жил өмнө
parent
commit
b286e37955

+ 7 - 0
lib/managers/index.dart

@@ -1,5 +1,6 @@
 import 'package:get/get.dart';
 import 'package:vitalapp/managers/account.dart';
+import 'package:vitalapp/managers/ai_manager.dart';
 import 'package:vitalapp/managers/cachedRecord.dart';
 import 'package:vitalapp/managers/contract.dart';
 import 'package:vitalapp/managers/contract_template.dart';
@@ -8,10 +9,12 @@ import 'package:vitalapp/managers/device.dart';
 import 'package:vitalapp/managers/diagnosis.dart';
 import 'package:vitalapp/managers/dictionary.dart';
 import 'package:vitalapp/managers/doctor.dart';
+import 'package:vitalapp/managers/entry_manager.dart';
 import 'package:vitalapp/managers/exam.dart';
 import 'package:vitalapp/managers/follow_up.dart';
 import 'package:vitalapp/managers/health_check_record.dart';
 import 'package:vitalapp/managers/interfaces/account.dart';
+import 'package:vitalapp/managers/interfaces/ai_manager.dart';
 import 'package:vitalapp/managers/interfaces/cachedRecord.dart';
 import 'package:vitalapp/managers/interfaces/contract.dart';
 import 'package:vitalapp/managers/interfaces/data_convert.dart';
@@ -20,6 +23,7 @@ import 'package:vitalapp/managers/interfaces/device.dart';
 import 'package:vitalapp/managers/interfaces/diagnosis.dart';
 import 'package:vitalapp/managers/interfaces/dictionary.dart';
 import 'package:vitalapp/managers/interfaces/doctor.dart';
+import 'package:vitalapp/managers/interfaces/entry.dart';
 import 'package:vitalapp/managers/interfaces/exam.dart';
 import 'package:vitalapp/managers/interfaces/follow_up.dart';
 import 'package:vitalapp/managers/interfaces/health_check_record.dart';
@@ -90,6 +94,9 @@ abstract class ManagerCenter {
 
     Get.put<IDataSyncManager>(DataSyncManager());
     Get.put<IUpgradeManager>(UpgradeManager());
+
+    Get.put<IAIManager>(AIManager());
+    Get.put<IEntryManager>(EntryManager());
     Get.put<ILanguageConfigManager>(LanguageConfigManager());
     Get.put<IRemedicalManager>(RemedicalManager());
     Get.put<IReportManager>(ReportManager());

+ 9 - 21
lib/pages/home/controller.dart

@@ -1,7 +1,6 @@
 import 'dart:async';
 
 import 'package:fis_jsonrpc/rpc.dart';
-import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
@@ -234,6 +233,14 @@ class HomeController extends FControllerBase with HomeNavMixin {
   }
 
   void switchNavByName(String name, [Map? patientInfo]) {
+    if (Store.user.currentSelectPatientInfo == null) {
+      /// 有些路由跳转之前需要判断有没有选择居民
+      if (["/patient/detail"].contains(name)) {
+        PromptBox.toast("当前未选择居民,请先选择居民后再操作。");
+        return;
+      }
+    }
+
     state.currentSelectMenu = name;
     NavGotoHelper.goto(name, patientInfo);
   }
@@ -282,12 +289,6 @@ class HomeController extends FControllerBase with HomeNavMixin {
           routeName: "/medical",
           iconWidget: _buildImgIcon('diagnosisDisplay.png'),
         ),
-        // HomeMenuItem(
-        //   key: 'SZZX',
-        //   title: "设置中心",
-        //   routeName: "/settings",
-        //   iconData: Icons.settings,
-        // ),
       ];
     }
   }
@@ -302,22 +303,9 @@ class HomeController extends FControllerBase with HomeNavMixin {
           }
         }
       });
-      // if (kDebugMode && !menuItems.any((element) => element.key == 'FSZD')) {
-      //   menuItems.add(
-      //     HomeMenuItem(
-      //       key: 'FSZD',
-      //       routeName: '/remedicalRecordView',
-      //       title: '分时诊断',
-      //        iconWidget: _PatientAddIconProxyWidget(
-      //         baseIcon: _buildImgIcon('healthRecord.png'),
-      //       ),
-      //     ),
-      //   );
-      // }
-      // menuItems.add(homeMenuItems.firstWhere((x) => x.key == "ZYTZ"));
+
       state.menuItems = menuItems;
     } else {
-      // state.menuItems = homeMenuItems;
       state.menuItems = [
         HomeMenuItem(
           key: 'XJDA',

+ 1 - 1
lib/pages/patient/list/controller.dart

@@ -41,7 +41,7 @@ class PatientListController extends FControllerBase {
     }
     final medicalController = Get.find<MedicalController>();
     await _patientDetailController.loadData(code: code);
-    _homeController.updateMenus();
+    // _homeController.updateMenus();
     _homeController.switchNavByName("/patient/detail");
     await medicalController.initData();
     //这里应该刷新病人诊断数据缓存

+ 22 - 14
lib/routes/routes.dart

@@ -3,6 +3,8 @@ import 'package:vitalapp/pages/admin/controller.dart';
 import 'package:vitalapp/pages/admin/view.dart';
 import 'package:vitalapp/pages/check/traditional_chinese_medicine_consitution_record/controller.dart';
 import 'package:vitalapp/pages/check/traditional_chinese_medicine_consitution_record/view.dart';
+import 'package:vitalapp/pages/consultation_record_view/controller.dart';
+import 'package:vitalapp/pages/consultation_record_view/view.dart';
 import 'package:vitalapp/pages/contract/package_list/widgets/capture_portrait.dart';
 import 'package:vitalapp/pages/contract/package_list/widgets/family_doctor_service_package.dart';
 import 'package:vitalapp/pages/contract/package_list/widgets/personal_information.dart';
@@ -17,6 +19,8 @@ import 'package:vitalapp/pages/check/follow_up_record/controller.dart';
 import 'package:vitalapp/pages/check/follow_up_record/view.dart';
 import 'package:vitalapp/pages/home/personal_center/controller.dart';
 import 'package:vitalapp/pages/home/personal_center/view.dart';
+import 'package:vitalapp/pages/measure_home/controller.dart';
+import 'package:vitalapp/pages/measure_home/view.dart';
 import 'package:vitalapp/pages/medical/controller.dart';
 import 'package:vitalapp/pages/medical/records/controller.dart';
 import 'package:vitalapp/pages/medical/records/view.dart';
@@ -245,6 +249,24 @@ class Routes {
         },
       ),
     ),
+    VRouteSetting(
+      "/remedicalRecordView",
+      () => const ConsultationRecordViewPage(),
+      binding: BindingsBuilder(
+        () {
+          Get.lazyPut(() => ConsultationRecordViewController());
+        },
+      ),
+    ),
+    VRouteSetting(
+      "/remedicalRecordView/measure",
+      () => MeasureHomePage(),
+      binding: BindingsBuilder(
+        () {
+          Get.lazyPut(() => MeasureHomeController());
+        },
+      ),
+    ),
     VRouteSetting(
       "/contract/package_info",
       () => const PackageInfoPage(),
@@ -441,20 +463,6 @@ class Routes {
         },
       ),
     ),
-    // VRouteSetting(
-    //   '/basicCheck',
-    //   () => JiChuJianCha(),
-    //   binding: BindingsBuilder(
-    //     () {
-    //       // Get.put(RegistrationListController());
-    //       if (!Get.isRegistered<MedicalController>()) {
-    //         Get.lazyPut(() => MedicalController());
-    //       }
-    //       Get.put(PatientDetailController());
-    //       Get.put(HealthCheckListController());
-    //     },
-    //   ),
-    // ),
     VRouteSetting(
       '/electrocardiogram',
       () => const HeartCheckNew(),