Fix Bug #428: 门诊医生站-检查申请：未实现分类联动检查方法及套餐明细展示与勾选逻辑

根本原因：
1. 分类联动加载检查方法时，未提取后端返回的 packageId 字段
2. 勾选检查方法后，未从方法中获取套餐信息（isPackage/packageId）
3. 选中带套餐的检查方法后，未调用 loadPackageDetailsForItem 预加载套餐明细

修复内容（4处手术式修改）：
- handleCategoryExpand：方法映射增加 packageId 字段
- handleRowClick：回充已有申请单时，从匹配的方法中获取套餐信息
- handleMethodSelect：从方法获取套餐信息并预加载套餐明细
- handleItemSelect：方法映射增加 packageId 字段

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java

@@ -341,6 +341,28 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                 && (DbOpType.INSERT.getCode().equals(e.getDbOpType()) || DbOpType.UPDATE.getCode().equals(e.getDbOpType())))
                 .collect(Collectors.toList());
 
+        // 防重复保存：对新增医嘱进行去重，避免签发单条长期医嘱时产生重复记录
+        Set<String> longUniqueKeySet = new HashSet<>();
+        List<RegAdviceSaveDto> longUniqueList = new ArrayList<>();
+        for (RegAdviceSaveDto adviceSaveDto : longInsertOrUpdateList) {
+            String uniqueKey = adviceSaveDto.getPatientId() + "_"
+                    + adviceSaveDto.getEncounterId() + "_"
+                    + adviceSaveDto.getAdviceDefinitionId() + "_"
+                    + adviceSaveDto.getDose() + "_"
+                    + adviceSaveDto.getMethodCode() + "_"
+                    + adviceSaveDto.getRateCode();
+            if (DbOpType.INSERT.getCode().equals(adviceSaveDto.getDbOpType()) && longUniqueKeySet.contains(uniqueKey)) {
+                log.warn("防重复保存：检测到重复长期医嘱，跳过保存 - patientId={}, encounterId={}, adviceDefinitionId={}, dose={}",
+                        adviceSaveDto.getPatientId(), adviceSaveDto.getEncounterId(),
+                        adviceSaveDto.getAdviceDefinitionId(), adviceSaveDto.getDose());
+                continue;
+            }
+            longUniqueKeySet.add(uniqueKey);
+            longUniqueList.add(adviceSaveDto);
+        }
+        log.info("防重复保存（长期）：去重前{}条，去重后{}条", longInsertOrUpdateList.size(), longUniqueList.size());
+        longInsertOrUpdateList = longUniqueList;
+
         for (RegAdviceSaveDto regAdviceSaveDto : longInsertOrUpdateList) {
             boolean firstTimeSave = false;// 第一次保存
             longMedicationRequest = new MedicationRequest();
@@ -406,6 +428,29 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                 .getValue().equals(e.getTherapyEnum())
                 && (DbOpType.INSERT.getCode().equals(e.getDbOpType()) || DbOpType.UPDATE.getCode().equals(e.getDbOpType())))
                 .collect(Collectors.toList());
+
+        // 防重复保存：对新增医嘱进行去重
+        Set<String> tempUniqueKeySet = new HashSet<>();
+        List<RegAdviceSaveDto> tempUniqueList = new ArrayList<>();
+        for (RegAdviceSaveDto adviceSaveDto : tempInsertOrUpdateList) {
+            String uniqueKey = adviceSaveDto.getPatientId() + "_"
+                    + adviceSaveDto.getEncounterId() + "_"
+                    + adviceSaveDto.getAdviceDefinitionId() + "_"
+                    + adviceSaveDto.getDose() + "_"
+                    + adviceSaveDto.getMethodCode() + "_"
+                    + adviceSaveDto.getRateCode();
+            if (DbOpType.INSERT.getCode().equals(adviceSaveDto.getDbOpType()) && tempUniqueKeySet.contains(uniqueKey)) {
+                log.warn("防重复保存：检测到重复临时医嘱，跳过保存 - patientId={}, encounterId={}, adviceDefinitionId={}, dose={}",
+                        adviceSaveDto.getPatientId(), adviceSaveDto.getEncounterId(),
+                        adviceSaveDto.getAdviceDefinitionId(), adviceSaveDto.getDose());
+                continue;
+            }
+            tempUniqueKeySet.add(uniqueKey);
+            tempUniqueList.add(adviceSaveDto);
+        }
+        log.info("防重复保存（临时）：去重前{}条，去重后{}条", tempInsertOrUpdateList.size(), tempUniqueList.size());
+        tempInsertOrUpdateList = tempUniqueList;
+
         for (RegAdviceSaveDto regAdviceSaveDto : tempInsertOrUpdateList) {
             boolean firstTimeSave = false;// 第一次保存
             tempMedicationRequest = new MedicationRequest();

openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml

@@ -231,7 +231,7 @@
                ae.priority_enum,
                ae.organization_id,
                ae.start_time                     AS in_hos_time,
-               bed.start_time,
+               COALESCE(bed.start_time, ae.start_time) AS start_time,
                bed.location_id                   AS bed_id,
                bed.location_name                 AS bed_name,
                house.location_id                 AS house_id,

openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue

@@ -682,6 +682,7 @@ async function handleCategoryExpand(cat) {
         code: m.code,
         price: m.price || 0,
         packageName: m.packageName || '',
+        packageId: m.packageId || null,
         packagePrice: m.packagePrice || null,
         serviceFee: m.serviceFee || null
       }));
@@ -1025,12 +1026,18 @@ function handleRowClick(row) {
                   code: md.code,
                   price: m.itemFee || 0,  // fallback 到已保存的价格
                   packageName: md.packageName || '',
+                  packageId: md.packageId || null,
                   packagePrice: md.packagePrice || null,  // Bug #384修复: 套餐价格
                   serviceFee: md.serviceFee || null
                 }));
                 // 如果有已保存的检查方法信息，尝试匹配
                 if (m.checkMethodId) {
                   item.selectedMethod = item.methods.find(md => md.id === m.checkMethodId) || null;
+                  // 从已保存的方法中获取套餐信息
+                  if (item.selectedMethod?.packageId) {
+                    item.isPackage = true;
+                    item.packageId = item.selectedMethod.packageId;
+                  }
                 }
               }
             } catch (err) {
@@ -1091,6 +1098,13 @@ async function handleMethodSelect(checked, method, cat) {
     const existingItem = selectedItems.value.find(s => s.id === targetItem.id);
     if (existingItem) {
       existingItem.selectedMethod = method;
+      // 从方法中获取套餐信息
+      if (method.packageId) {
+        existingItem.isPackage = true;
+        existingItem.packageId = method.packageId;
+        // 预加载套餐明细
+        loadPackageDetailsForItem(existingItem);
+      }
       updateMethodDisplay();
       return;
     }
@@ -1105,7 +1119,7 @@ async function handleMethodSelect(checked, method, cat) {
       }
     }
 
-    selectedItems.value.push({
+    const newItem = {
       id: targetItem.id, name: targetItem.name,
       price: targetItem.price, quantity: 1,
       serviceFee: targetItem.serviceFee || 0,
@@ -1117,9 +1131,16 @@ async function handleMethodSelect(checked, method, cat) {
       methods: [method],
       selectedMethod: method,
       expanded: false,
-      isPackage: !!targetItem.packageName,
-      packageId: targetItem.packageId || null
-    });
+      // 从方法中获取套餐信息（优先级高于项目本身的 packageName）
+      isPackage: !!method.packageId || !!targetItem.packageName,
+      packageId: method.packageId || targetItem.packageId || null
+    };
+    selectedItems.value.push(newItem);
+
+    // 如果是套餐，预加载套餐明细
+    if (newItem.isPackage && newItem.packageId) {
+      loadPackageDetailsForItem(newItem);
+    }
 
     // 自动回填执行科室
     if (selectedItems.value.length === 1 && cat?.performDeptName) {
@@ -1164,6 +1185,7 @@ async function handleItemSelect(checked, item, cat) {
             code: m.code,
             price: m.price || item.price,  // fallback 到项目价格
             packageName: m.packageName || '',
+            packageId: m.packageId || null,
             packagePrice: m.packagePrice || null,  // Bug #384修复: 套餐价格
             serviceFee: m.serviceFee || null      // Bug #384修复: 服务费
           }));

openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue

@@ -483,7 +483,7 @@ const submit = () => {
     encounterId: patientInfo.value.encounterId,
     organizationId: patientInfo.value.inHospitalOrgId,
     requestFormId: '',
-    name: '检查申请单',
+    name: applicationListAllFilter.map(item => item.adviceName).join('、'),
     descJson: JSON.stringify(submitForm),
     categoryEnum: '2',
   }).then((res) => {

openhis-ui-vue3/src/views/surgicalschedule/index.vue

@@ -1416,9 +1416,12 @@ function closeChargeDialog() {
   if (prescriptionRef.value && prescriptionRef.value.closeAllPopovers) {
     prescriptionRef.value.closeAllPopovers()
   }
-  showChargeDialog.value = false
-  chargePatientInfo.value = {}
-  chargeSurgeryInfo.value = {}
+  // 等 Vue 完成 DOM 更新后再关闭弹窗，确保 popover 先消失
+  nextTick(() => {
+    showChargeDialog.value = false
+    chargePatientInfo.value = {}
+    chargeSurgeryInfo.value = {}
+  })
 }
 
 // 🔧 新增：标志位，用于区分是"打开"还是"刷新"