Merge branch 'master' of http://git.ius.plus/Project-VNOTE/VNoteApp

lib/pages/check/follow_up/controller.dart

@@ -30,7 +30,7 @@ class FollowUpController extends GetxController {
     // MenuItem(label: "脑卒中", value: 'NCZ'),
     // MenuItem(label: "严重精神障碍随访服务", value: 'YZJSZASFFW'),
     // MenuItem(label: "严重精神障碍个人信息补充", value: 'YZJSZAGRXXBC'),
-    MenuItem(label: "糖尿病", value: 'TNB'),
+    MenuItem(label: "2 型糖尿病", value: 'TNB'),
     MenuItem(label: "高血压", value: 'GXY'),
     MenuItem(label: "老年人中医药健康管理服务记录表", value: 'LNRZYYJKGLFWJL'),
     // MenuItem(label: "老年人生活自理能力评估表", value: 'LNRSHZLNLPGB'),

lib/pages/patient/info/controller.dart

@@ -111,6 +111,7 @@ class PatientInfoController extends FControllerBase {
       career: state.career,
       maritalStatus: state.maritalStatus,
       providerPayments: state.providerPayments,
+      providerPaymentsOther: state.providerPaymentsOther,
     ).toJson();
     if (state.healthCode.isNotEmpty) {
       var request = UpdatePatientExtensionRequest(
@@ -204,6 +205,7 @@ class PatientInfoController extends FControllerBase {
       state.career = healthModel.career ?? '';
       state.maritalStatus = healthModel.maritalStatus ?? '';
       state.providerPayments = healthModel.providerPayments ?? '';
+      state.providerPaymentsOther = healthModel.providerPaymentsOther ?? '';
     }
   }
 

lib/pages/patient/info/state.dart

@@ -61,6 +61,7 @@ class HealthModel {
   final String? career; //职业
   final String? maritalStatus; //婚姻状况
   final String? providerPayments; //医疗费用支付方式
+  final String? providerPaymentsOther; //医疗费用支付方式
 
   HealthModel({
     required this.historyDrugAllergies,
@@ -109,6 +110,7 @@ class HealthModel {
     required this.career,
     required this.maritalStatus,
     required this.providerPayments,
+    required this.providerPaymentsOther,
   });
   factory HealthModel.fromJson(Map<String, dynamic> jsonMap) {
     return HealthModel(
@@ -181,6 +183,7 @@ class HealthModel {
       career: jsonMap["career"],
       maritalStatus: jsonMap["maritalStatus"],
       providerPayments: jsonMap["providerPayments"],
+      providerPaymentsOther: jsonMap["providerPaymentsOther"],
     );
   }
 
@@ -324,6 +327,10 @@ class HealthModel {
         jsonMap["providerPayments"] = providerPayments;
       }
 
+      if (providerPaymentsOther != null) {
+        jsonMap["providerPaymentsOther"] = providerPaymentsOther;
+      }
+
       return jsonMap;
     }
   }
@@ -401,6 +408,11 @@ class PatientInfoState {
   final RxString _career = RxString(''); //职业
   final RxString _maritalStatus = RxString(''); //婚姻状况
   final RxString _providerPayments = RxString(''); //医疗费用支付方式
+  final RxString _providerPaymentsOther = RxString(''); //医疗费用支付方式
+
+  ///其他支付方式
+  String get providerPaymentsOther => _providerPaymentsOther.value;
+  set providerPaymentsOther(String val) => _providerPaymentsOther.value = val;
 
   ///医疗费用支付方式
   String get providerPayments => _providerPayments.value;

lib/pages/patient/info/widgets/detail.dart

@@ -226,6 +226,22 @@ class PatientInfoDetailView extends GetView<PatientInfoController> {
                           }
                         },
                       ),
+                      if (controller.state.providerPayments.contains('8'))
+                        VListFormCell(
+                          label: "其他支付方式",
+                          content: controller.state.providerPaymentsOther,
+                          onTap: () async {
+                            final result = await VDialogInput(
+                                    title: "其他支付方式",
+                                    initialValue:
+                                        controller.state.providerPaymentsOther,
+                                    placeholder: '请输入')
+                                .show();
+                            if (result != null) {
+                              controller.state.providerPaymentsOther = result;
+                            }
+                          },
+                        ),
                     ],
                   ),
                 ),