Merge branch 'master' of http://git.ius.plus/Project-Vital/VitalApp

lib/managers/follow_up.dart

@@ -146,7 +146,7 @@ class FollowUpManager implements IFollowUpManager {
       case FollowUpModeEnum.Phone:
         return "电话";
       case FollowUpModeEnum.Visit:
-        return "家庭";
+        return "上门";
       default:
         return "";
     }

lib/pages/check/children_follow_up_record/controller.dart

@@ -253,6 +253,12 @@ class ChildrenFollowUpRecordController extends FControllerBase {
     _followUpController.state.followUpTime = dataDTO.followUpTime;
     _followUpController.state.nextFollowUpTime = dataDTO.nextFollowUpTime;
     _followUpController.state.followUpMode = dataDTO.followUpMode;
+    if (dataDTO.followUpPhotos?.isNotEmpty ?? false) {
+      _followUpController.state.followUpPhoto = dataDTO.followUpPhotos?.first;
+    } else {
+      _followUpController.state.followUpPhoto = "";
+    }
+
     await Get.to(
       ConfigurableCard(
         cardKey: dataDTO.key!,

lib/pages/check/children_follow_up_record/view.dart

@@ -126,7 +126,7 @@ class ChildrenFollowUpRecordPage
       child: Padding(
         padding: const EdgeInsets.all(16.0).copyWith(right: 0),
         child: Container(
-          padding: const EdgeInsets.all(16),
+          padding: const EdgeInsets.all(10),
           decoration: BoxDecoration(
             color: Colors.white,
             border: Border.all(

lib/pages/check/children_follow_up_record/widgets/children_tree.dart

@@ -197,6 +197,7 @@ class MyTreeTile extends StatelessWidget {
                   Text(
                     entry.node.title,
                     style: TextStyle(
+                      fontSize: 20,
                       color: currentSelectNode == entry.node.title
                           ? Colors.blue
                           : Colors.black,

lib/pages/check/follow_up_record/controller.dart

@@ -287,6 +287,11 @@ class FollowUpRecordController extends FControllerBase {
     _followUpController.state.followUpTime = dataDTO.followUpTime;
     _followUpController.state.nextFollowUpTime = dataDTO.nextFollowUpTime;
     _followUpController.state.followUpMode = dataDTO.followUpMode;
+    if (dataDTO.followUpPhotos?.isNotEmpty ?? false) {
+      _followUpController.state.followUpPhoto = dataDTO.followUpPhotos?.first;
+    } else {
+      _followUpController.state.followUpPhoto = "";
+    }
     PrescriptionDTO? prescription =
         await getPrescriptionDetailByFollowAnPatient(dataDTO.code!);
     if (prescription != null && prescription.prescriptionData!.isNotEmpty) {

lib/pages/check/maternal_health_management/controller.dart

@@ -71,7 +71,7 @@ class MaternalHealthManagementController extends GetxController {
     }
     DateTime? nextFollowUpTime;
     if (FormInfo.instance.formValue.containsKey("Next_Follow_Up_Date")) {
-      followUpTime =
+      nextFollowUpTime =
           DateTime.parse(FormInfo.instance.formValue["Next_Follow_Up_Date"]);
     }
     String patientCode = Store.user.currentSelectPatientInfo?.code ?? '';

lib/pages/check/maternal_health_management/forms/checkup_42_days.dart

@@ -46,7 +46,7 @@ class PostpartumHealthCheckup42DaysFormState
     return Scaffold(
       backgroundColor: const Color.fromRGBO(238, 238, 238, 1),
       appBar: VAppBar(
-        titleWidget: Text("产后 42 天健康检查"),
+        titleWidget: Text("产后 42 天健康检查记录表"),
         actions: [
           ElevatedButton(
             onPressed: () async {

lib/pages/check/maternal_health_management/forms/postpartum_follow_up.dart

@@ -48,7 +48,7 @@ class PostpartumFormViewState extends State<PostpartumFormView> {
     return Scaffold(
       backgroundColor: const Color.fromRGBO(238, 238, 238, 1),
       appBar: VAppBar(
-        titleWidget: Text("产后访视"),
+        titleWidget: Text("产后访视记录表"),
         actions: [
           ElevatedButton(
             onPressed: () async {

lib/pages/check/widgets/exam_configurable/exam_date.dart

@@ -4,6 +4,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 import 'package:intl/intl.dart';
+import 'package:vitalapp/components/dialog_date.dart';
 import 'package:vitalapp/components/dialog_time.dart';
 import 'package:vitalapp/pages/check/models/form.dart';
 import 'package:vitalapp/pages/form/form_info.dart';
@@ -88,10 +89,9 @@ class ExamDateState extends State<ExamDate> {
         lastDate: DateTime(2100),
       );
     } else {
-      result = await VDialogDateTime(
+      result = await VDialogDate(
         minimumDate: DateTime(1900),
         initialValue: initialDate,
-        mode: CupertinoDatePickerMode.date,
       ).show();
     }
     if (result != null) {

lib/pages/check/widgets/exam_configurable/exam_signature.dart

@@ -65,7 +65,7 @@ class SignatureState extends State<Signature> {
       content: Row(
         children: [
           Text(
-            "签名",
+            "随访医生签名",
             style: TextStyle(fontSize: 26),
           ),
           Container(

lib/pages/form/maternal_health_form.dart

@@ -87,6 +87,9 @@ class MaternalHealthFormValue extends BaseFormValueChange {
       case "Last_Period_Date":
         onLastPeriodDateChange(e);
         break;
+      case "Health_History":
+        onHealthHistoryChange(e);
+        break;
     }
   }
 
@@ -268,8 +271,6 @@ class MaternalHealthFormValue extends BaseFormValueChange {
     );
   }
 
-
-
   void onLastPeriodDateChange(UpdateFormArgs e) {
     var targetValue = calculateDueDateString(e.sourceValue);
     FormInfo.instance.formValue["EstimatedDeliveryDate"] = targetValue;
@@ -314,4 +315,59 @@ class MaternalHealthFormValue extends BaseFormValueChange {
 
     return dueDateString;
   }
+
+  void onHealthHistoryChange(UpdateFormArgs e) {
+    UpdateFormType type = e.type;
+    bool isDisabledValue = false;
+    if (type == UpdateFormType.Add && e.sourceValue == "Health_History_1") {
+      ///选中了无，则禁用其他选项
+      isDisabledValue = true;
+    } else if (type == UpdateFormType.Remove &&
+        e.sourceValue == "Health_History_1") {
+      ///取消选中无，则取消禁用其他选项
+      isDisabledValue = false;
+    }
+    FormInfo.instance.onChangeTargetValue.emit(
+      this,
+      TargetFormArgs(
+        "Health_History_2",
+        isDisabledValue: isDisabledValue,
+      ),
+    );
+    FormInfo.instance.onChangeTargetValue.emit(
+      this,
+      TargetFormArgs(
+        "Health_History_3",
+        isDisabledValue: isDisabledValue,
+      ),
+    );
+    FormInfo.instance.onChangeTargetValue.emit(
+      this,
+      TargetFormArgs(
+        "Health_History_4",
+        isDisabledValue: isDisabledValue,
+      ),
+    );
+    FormInfo.instance.onChangeTargetValue.emit(
+      this,
+      TargetFormArgs(
+        "Health_History_5",
+        isDisabledValue: isDisabledValue,
+      ),
+    );
+    FormInfo.instance.onChangeTargetValue.emit(
+      this,
+      TargetFormArgs(
+        "Health_History_6",
+        isDisabledValue: isDisabledValue,
+      ),
+    );
+    FormInfo.instance.onChangeTargetValue.emit(
+      this,
+      TargetFormArgs(
+        "Health_History_7",
+        isDisabledValue: isDisabledValue,
+      ),
+    );
+  }
 }