5.17号部分bug修复

lib/pages/check/prescription/examination_prescription.dart

@@ -82,13 +82,13 @@ class _ExaminationPrescriptionState extends State<ExaminationPrescription> {
     final scale = width / designWidth; // 计算缩放比例
     return VAlertDialog(
       // title: "新增处方",
-      width: width * 0.8 / scale,
+      width: width * 0.70 / scale,
       content: Column(
         mainAxisAlignment: MainAxisAlignment.center,
         children: [
           if (widget.prescriptionTitle.isEmpty)
             Container(
-              //height: Get.height,
+              height: Get.height * 0.80 / scale,
               child: ListView(
                 shrinkWrap: true,
                 children: [
@@ -123,7 +123,7 @@ class _ExaminationPrescriptionState extends State<ExaminationPrescription> {
                                 child: Text(
                                   e.value,
                                   style: TextStyle(
-                                    fontSize: 20,
+                                    fontSize: 18,
                                     color: widget.prescription == e.key
                                         ? Colors.white
                                         : Colors.black54,

lib/pages/check/widgets/exam_table/homecare_bed_history_from.dart

@@ -57,7 +57,7 @@ class _HomecareBedHistoryFromState extends State<HomecareBedHistoryFrom> {
                   title: '建床日期',
                   initialValue: bedConstruction.bedConstructionDate,
                   maxDateTime: bedConstruction.dischargeDate == null
-                      ? null
+                      ? DateTime.now()
                       : DateTime.parse(bedConstruction.dischargeDate!),
                 );
                 if (result != null) {
@@ -73,12 +73,12 @@ class _HomecareBedHistoryFromState extends State<HomecareBedHistoryFrom> {
               content: bedConstruction.dischargeDate,
               onTap: () async {
                 final result = await _showDateDialog(
-                  title: '撤床日期',
-                  initialValue: bedConstruction.dischargeDate,
-                  minDateTime: bedConstruction.bedConstructionDate == null
-                      ? null
-                      : DateTime.parse(bedConstruction.bedConstructionDate!),
-                );
+                    title: '撤床日期',
+                    initialValue: bedConstruction.dischargeDate,
+                    minDateTime: bedConstruction.bedConstructionDate == null
+                        ? null
+                        : DateTime.parse(bedConstruction.bedConstructionDate!),
+                    maxDateTime: DateTime.now());
                 if (result != null) {
                   bedConstruction.dischargeDate =
                       DateFormat("yyyy-MM-dd").format(result);
@@ -160,8 +160,8 @@ class _HomecareBedHistoryFromState extends State<HomecareBedHistoryFrom> {
       result = await showDatePicker(
         context: Get.context!,
         initialDate: initValue,
-        firstDate: maxDateTime ?? DateTime(1900),
-        lastDate: minDateTime ?? DateTime(2100),
+        firstDate: minDateTime ?? DateTime(1900),
+        lastDate: maxDateTime ?? DateTime(2100),
       );
     } else {
       result = await VDialogDate(

lib/pages/check/widgets/exam_table/hospitalization_history_from.dart

@@ -59,7 +59,7 @@ class _HospitalizationHistoryFormState
                   title: '入院日期',
                   initialValue: admission.admissionDate,
                   maxDateTime: admission.dischargeDate == null
-                      ? null
+                      ? DateTime.now()
                       : DateTime.parse(admission.dischargeDate!),
                 );
                 if (result != null) {
@@ -80,6 +80,7 @@ class _HospitalizationHistoryFormState
                   minDateTime: admission.admissionDate == null
                       ? null
                       : DateTime.parse(admission.admissionDate!),
+                  maxDateTime: DateTime.now(),
                 );
                 if (result != null) {
                   admission.dischargeDate =

lib/pages/check/widgets/new_configurable_card.dart

@@ -1550,7 +1550,15 @@ class NewConfigurableFormState extends State<NewConfigurableCard> {
 
     return FittedBox(
       child: ExamTable(
-        tableThList: const ['序号', '药物名称', '用法', '用量', '用药时间', '服药依从性', '操作'],
+        tableThList: const [
+          '序号',
+          '药物名称',
+          '用法',
+          '用量',
+          '用药时间',
+          '服药依从性（1规律 2间断 3不服药）',
+          '操作'
+        ],
         currentFormObject: currentFormObject,
         currentValue: currentValue,
         addTableData: addTableData,

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

@@ -461,7 +461,7 @@ class RegistrationListController {
                       ),
                       Container(
                         padding: EdgeInsets.only(left: 30),
-                        width: 130,
+                        width: 280,
                         height: 54,
                         alignment: Alignment.centerRight,
                         child: VButton(
@@ -480,7 +480,7 @@ class RegistrationListController {
                                 ) ??
                                 [];
                           },
-                          label: '开处方',
+                          label: '开具健康教育处方',
                         ),
                       ),
                       SizedBox(