诊疗记录修改与老年人中医体质部分代码提交

lib/managers/diagnosis.dart

@@ -14,13 +14,13 @@ class DiagnosisManager implements IDiagnosisManager {
   }
 
   @override
-  Future<List<DiagnosisAggregationRecord>?>
-      getDiagnosisAggregationPageAsync() async {
+  Future<List<DiagnosisAggregationRecord>?> getDiagnosisAggregationPageAsync(
+      String patientCode) async {
     var request = DiagnosisPageRequest(
-      token: Store.user.token,
-      pageIndex: 1,
-      pageSize: 20,
-    );
+        token: Store.user.token,
+        pageIndex: 1,
+        pageSize: 20,
+        patientCode: patientCode);
     var result = await rpc.diagnosis.getDiagnosisAggregationPageAsync(request);
     return result.pageData?.toList();
   }

lib/managers/interfaces/diagnosis.dart

@@ -7,5 +7,6 @@ abstract class IDiagnosisManager implements IManager {
   Future<String> createDiagnosisAsync(CreateDiagnosisRequest createDiagnosis);
 
   ///获取诊疗记录
-  Future<List<DiagnosisAggregationRecord>?> getDiagnosisAggregationPageAsync();
+  Future<List<DiagnosisAggregationRecord>?> getDiagnosisAggregationPageAsync(
+      String patientCode);
 }

lib/pages/check/follow_up/controller.dart

@@ -31,7 +31,7 @@ class FollowUpController extends GetxController {
     // MenuItem(label: "严重精神障碍个人信息补充", value: 'YZJSZAGRXXBC'),
     MenuItem(label: "糖尿病", value: 'TNB'),
     MenuItem(label: "高血压", value: 'GXY'),
-    // MenuItem(label: "老年人中医药健康管理服务记录表", value: 'LNRZYYJKGLFWJL'),
+    MenuItem(label: "老年人中医药健康管理服务记录表", value: 'LNRZYYJKGLFWJL'),
     // MenuItem(label: "老年人生活自理能力评估表", value: 'LNRSHZLNLPGB'),
     // MenuItem(label: "产后42天健康检查列表", value: 'YCF_CH42TJKJCLB'),
     // MenuItem(label: "产后访视列表", value: 'YCF_CHFSLB'),

lib/pages/check/widgets/configurable_card.dart

@@ -320,10 +320,20 @@ class _ConfigurableFormState extends State<ConfigurableCard> {
     if (currentTemplate.isNotEmpty) {
       itemCount = currentTemplate[currentTitleIndex].children?.length ?? 0;
     }
+    bool currentTemplateOptionsIsNotEmpty =
+        currentTemplate[currentTitleIndex].options?.isNotEmpty ?? false;
     List<Widget> items = List.generate(itemCount, (index) {
       FormObject? currentFormObject =
           currentTemplate[currentTitleIndex].children?[index];
       int span = currentFormObject?.span ?? 12;
+      //父结构的options不等于空或null
+      if (true) {
+        //子结构的options若是无值则取父类的options值
+        if (currentTemplateOptionsIsNotEmpty) {
+          currentFormObject!.options =
+              currentTemplate[currentTitleIndex].options;
+        }
+      }
       return buildSingleItem(buildWidget(currentFormObject), span);
     });
 

lib/pages/medical/records/controller.dart

@@ -12,15 +12,19 @@ class MedicalRecordsController extends FControllerBase {
   final _diagnosisManager = Get.find<IDiagnosisManager>();
   final _dictionaryManager = Get.find<IDictionaryManager>();
 
+  late String patientCode;
   @override
   void onReady() {
     super.onReady();
+    final p = Get.parameters;
+    patientCode = p['patientCode'] ?? "";
     _loadData();
   }
 
   _loadData() async {
     try {
-      var result = await _diagnosisManager.getDiagnosisAggregationPageAsync();
+      var result =
+          await _diagnosisManager.getDiagnosisAggregationPageAsync(patientCode);
       if (result != null) {
         state.updateDto(result);
       }

pubspec.lock

@@ -183,7 +183,7 @@ packages:
     description:
       path: "."
       ref: HEAD
-      resolved-ref: "876b06096f654a37b1130a35d812d2df5a25966d"
+      resolved-ref: e3006a7bc8898970c94528482a7c17973338f72f
       url: "http://git.ius.plus:88/Project-VNOTE/FlutterJsonRPC.git"
     source: git
     version: "0.0.1"
@@ -683,8 +683,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: "249157a4b"
-      resolved-ref: "249157a4b990628b8bdecac45085400aac4cec89"
+      ref: "42b7886"
+      resolved-ref: "42b7886662cba425bdbae8c50c611f3f72e18732"
       url: "http://git.ius.plus:88/Project-VNOTE/FlutterDevicePlugin.git"
     source: git
     version: "0.0.1"

pubspec.yaml

@@ -74,7 +74,7 @@ dependencies_overrides:
   fis_jsonrpc:
     git:
       url: http://git.ius.plus:88/Project-VNOTE/FlutterJsonRPC.git
-      ref: "876b060"
+      ref: "e3006a7"
   # fis_ui:
   #   git:
   #     url: http://git.ius.plus:88/Project-Wing/fis_lib_ui.git