Fix Bug #464 : [目录管理-诊疗目录] 新增项目时"零售价"未与"诊疗子项"合计总价自动同步

根因：calculateTotalPrice中form.value.retailPrice赋值被nextTick包裹，在多调用方(watcher/selectRow/addItem)并发时产生竞态，导致零售价更新丢失修复：移除nextTick，改为同步赋值确保零售价实时同步总价 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
476 住院医生工作-检查申请单界面缺失核心临床字段（紧急程度、过敏史、检查目的等）
2026-05-14 13:03:25 +08:00 · 2026-05-14 12:56:04 +08:00 · 2026-05-14 12:23:13 +08:00 · 2026-05-14 12:15:47 +08:00 · 2026-05-14 12:01:33 +08:00 · 2026-05-14 12:00:18 +08:00
20 changed files with 1113 additions and 708 deletions
--- a/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysDictTypeServiceImpl.java
+++ b/openhis-server-new/core-system/src/main/java/com/core/system/service/impl/SysDictTypeServiceImpl.java
@@ -85,18 +85,13 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService {
            String trimmedKey = searchKey.trim();
            return dictDataMapper.selectDictDataByTypeWithSearch(dictType, trimmedKey);
        }
-        
-        // 否则使用原有方法（带缓存）
-        List<SysDictData> dictDatas = DictUtils.getDictCache(dictType);
-        if (StringUtils.isNotEmpty(dictDatas)) {
-            return dictDatas;
-        }
-        dictDatas = dictDataMapper.selectDictDataByType(dictType);
+
+        // 直接查询数据库，避免缓存中为空数据导致前端下拉框显示"无数据"
+        List<SysDictData> dictDatas = dictDataMapper.selectDictDataByType(dictType);
        if (StringUtils.isNotEmpty(dictDatas)) {
            DictUtils.setDictCache(dictType, dictDatas);
-            return dictDatas;
        }
-        return null;
+        return dictDatas;
    }

    /**
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgicalScheduleAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/appservice/impl/SurgicalScheduleAppServiceImpl.java
@@ -7,7 +7,6 @@ import com.core.common.core.domain.R;
 import com.core.common.core.domain.model.LoginUser;
 import com.core.common.utils.SecurityUtils;
 import com.openhis.administration.domain.Patient;
-import com.openhis.administration.service.IOrganizationService;
 import com.openhis.administration.service.IPatientService;
 import com.openhis.clinical.domain.Surgery;
 import com.openhis.clinical.service.ISurgeryService;
@@ -28,7 +27,6 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.net.URLEncoder;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
@@ -204,6 +202,8 @@ public class SurgicalScheduleAppServiceImpl implements ISurgicalScheduleAppServi
            return R.fail("新增手术安排失败");
        }

+        syncSurgeryIncisionLevel(opSchedule.getOperCode(), opCreateScheduleDto.getIncisionLevel());
+
        // Bug #247 修复：更新手术申请单状态为已排期 (1)
        if (opCreateScheduleDto.getApplyId() != null) {
            try {
@@ -300,6 +300,8 @@ public class SurgicalScheduleAppServiceImpl implements ISurgicalScheduleAppServi
            return R.fail("修改手术安排失败");
        }

+        syncSurgeryIncisionLevel(opScheduleDto.getOperCode(), opScheduleDto.getIncisionLevel());
+
        return R.ok("修改手术安排成功");
    }

@@ -433,6 +435,28 @@ public class SurgicalScheduleAppServiceImpl implements ISurgicalScheduleAppServi
        return scheduleDate.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"));
    }

+    /**
+     * 同步手术申请表中的切口类型
+     */
+    private void syncSurgeryIncisionLevel(String surgeryNo, Integer incisionLevel) {
+        if (surgeryNo == null || surgeryNo.isEmpty() || incisionLevel == null) {
+            return;
+        }
+
+        LambdaQueryWrapper<Surgery> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Surgery::getSurgeryNo, surgeryNo)
+                .eq(Surgery::getDeleteFlag, "0");
+        Surgery surgery = surgeryService.getOne(queryWrapper);
+        if (surgery == null) {
+            log.warn("未找到需要同步切口类型的手术申请记录 - surgeryNo: {}", surgeryNo);
+            return;
+        }
+
+        surgery.setIncisionLevel(incisionLevel);
+        surgery.setUpdateTime(new Date());
+        surgeryService.updateById(surgery);
+    }
+
    /**
     * 填充手术申请中缺失的名称字段
     * 在创建手术安排时调用，确保关联的cli_surgery表中的名称字段有值
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpCreateScheduleDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpCreateScheduleDto.java
@@ -4,7 +4,6 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;

 import java.math.BigDecimal;
-import java.time.LocalDate;
 import java.time.LocalDateTime;

@Data
@@ -85,6 +84,11 @@ public class OpCreateScheduleDto {
     */
    private String surgerySite;

+    /**
+     * 切口类型
+     */
+    private Integer incisionLevel;
+
    /**
     * 入院时间
     */
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpScheduleDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpScheduleDto.java
@@ -17,7 +17,6 @@ import java.time.LocalDate;
 * @date 2026-01-28
 */
@Data
-@Accessors(chain = true)
@EqualsAndHashCode(callSuper = true)
 public class OpScheduleDto extends OpSchedule {

@@ -95,6 +94,12 @@ public class OpScheduleDto extends OpSchedule {
     * 手术类型
     */
    private String surgeryType;
+
+    /**
+     * 切口类型
+     */
+    private Integer incisionLevel;
+
    /**
     * 申请科室
     */
@@ -109,8 +114,4 @@ public class OpScheduleDto extends OpSchedule {
     */
    private String createByName;

-    /**
-     * 费用类别
-     */
-    private String feeType;
 }
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
@@ -35,6 +35,7 @@ import com.openhis.medication.service.IMedicationDispenseService;
 import com.openhis.medication.service.IMedicationRequestService;
 import com.openhis.web.chargemanage.mapper.OutpatientRegistrationAppMapper;
 import com.openhis.web.doctorstation.appservice.IDoctorStationAdviceAppService;
+import com.openhis.web.doctorstation.appservice.IDoctorStationInspectionLabApplyService;
 import com.openhis.web.doctorstation.dto.*;
 import com.openhis.web.doctorstation.mapper.DoctorStationAdviceAppMapper;
 import com.openhis.web.doctorstation.utils.AdviceUtils;
@@ -47,12 +48,15 @@ import com.openhis.workflow.domain.InventoryItem;
 import com.openhis.workflow.domain.ServiceRequest;
 import com.openhis.workflow.service.*;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;

 /**
@@ -62,6 +66,9 @@ import java.util.stream.Collectors;
@Service
 public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAppService {

+    private static final Pattern INSPECTION_APPLY_NO_JSON =
+        Pattern.compile("\"applyNo\"\\s*:\\s*\"([^\"]+)\"");
+
    @Resource
    AssignSeqUtil assignSeqUtil;

@@ -118,6 +125,13 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
    @Resource
    IInventoryItemService inventoryItemService;

+    /**
+     * 与检验申请实现存在循环依赖，需延迟注入；删除诊疗医嘱时按 contentJson 级联作废检验申请单。
+     */
+    @Resource
+    @Lazy
+    private IDoctorStationInspectionLabApplyService iDoctorStationInspectionLabApplyService;
+
    // 缓存 key 前缀
    private static final String ADVICE_BASE_INFO_CACHE_PREFIX = "advice:base:info:";
    // 缓存过期时间（小时）
@@ -1529,6 +1543,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                deviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.DEVICE_RES_NO.getPrefix(), 4));
            }
            deviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+            deviceRequest.setPrescriptionNo(adviceSaveDto.getSourceBillNo()); // 来源业务单据号（手术单号）
            deviceRequest.setQuantity(adviceSaveDto.getQuantity()); // 请求数量
            deviceRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码
            deviceRequest.setLotNumber(adviceSaveDto.getLotNumber());// 产品批号
@@ -1706,6 +1721,21 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
        }
    }

+    /**
+     * 从诊疗医嘱 contentJson 中解析检验申请单号（检验保存时写入形如 {"applyNo":"..."}）。
+     */
+    private String extractInspectionApplyNoFromContentJson(String contentJson) {
+        if (StringUtils.isBlank(contentJson) || !contentJson.contains("applyNo")) {
+            return null;
+        }
+        Matcher m = INSPECTION_APPLY_NO_JSON.matcher(contentJson);
+        if (!m.find()) {
+            return null;
+        }
+        String applyNo = m.group(1).trim();
+        return StringUtils.isBlank(applyNo) ? null : applyNo;
+    }
+
    /**
     * 处理诊疗
     */
@@ -1754,6 +1784,8 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                }
            }
        }
+        // 检验申请单在医嘱 contentJson 中写入 applyNo；从医嘱删除时需先级联作废检验单，避免检验页签仍显示孤儿申请
+        Map<String, List<Long>> labApplyNoToRequestIds = new LinkedHashMap<>();
        for (AdviceSaveDto adviceSaveDto : deleteList) {
            Long requestId = adviceSaveDto.getRequestId();
            // 🔧 Bug #442: 跳过 requestId 为 null 的记录，避免删除不存在的诊疗请求
@@ -1762,6 +1794,35 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                continue;
            }
            iServiceRequestService.removeById(requestId);// 删除诊疗
+            ServiceRequest existing = iServiceRequestService.getById(adviceSaveDto.getRequestId());
+            if (existing == null) {
+                continue;
+            }
+            String applyNo = extractInspectionApplyNoFromContentJson(existing.getContentJson());
+            if (StringUtils.isNotBlank(applyNo)) {
+                labApplyNoToRequestIds.computeIfAbsent(applyNo, k -> new ArrayList<>())
+                    .add(adviceSaveDto.getRequestId());
+            }
+        }
+        Set<Long> labCascadeSkippedRequestIds = new HashSet<>();
+        for (Map.Entry<String, List<Long>> e : labApplyNoToRequestIds.entrySet()) {
+            R<?> delLab = iDoctorStationInspectionLabApplyService.deleteInspectionLabApply(e.getKey());
+            if (delLab != null && R.isSuccess(delLab)) {
+                labCascadeSkippedRequestIds.addAll(e.getValue());
+                log.info("handService - 级联作废检验申请单 applyNo={}，已跳过重复删除的医嘱 requestIds={}",
+                    e.getKey(), e.getValue());
+            } else {
+                String msg = delLab != null && StringUtils.isNotEmpty(delLab.getMsg()) ? delLab.getMsg() : "删除检验申请单失败";
+                log.warn("handService - 级联作废检验申请单未成功 applyNo={} msg={}，将回退为仅删除当前医嘱记录",
+                    e.getKey(), msg);
+            }
+        }
+        for (AdviceSaveDto adviceSaveDto : deleteList) {
+            if (labCascadeSkippedRequestIds.contains(adviceSaveDto.getRequestId())) {
+                continue;
+            }
+            Long requestId = adviceSaveDto.getRequestId();
+            iServiceRequestService.removeById(requestId);// 删除诊疗
            iServiceRequestService.remove(
                    new LambdaQueryWrapper<ServiceRequest>().eq(ServiceRequest::getParentId,
                            requestId));// 删除诊疗套餐对应的子项
@@ -1846,6 +1907,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                serviceRequest.setBusNo(assignSeqUtil.getSeqByDay(AssignSeqEnum.SERVICE_RES_NO.getPrefix(), 4));
            }
            serviceRequest.setGenerateSourceEnum(GenerateSource.DOCTOR_PRESCRIPTION.getValue()); // 生成来源
+            serviceRequest.setPrescriptionNo(adviceSaveDto.getSourceBillNo()); // 来源业务单据号（手术单号）
            serviceRequest.setQuantity(adviceSaveDto.getQuantity()); // 请求数量
            serviceRequest.setUnitCode(adviceSaveDto.getUnitCode()); // 请求单位编码

@@ -2041,10 +2103,10 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST,
                CommonConstants.TableName.WOR_SERVICE_REQUEST, practitionerId, Whether.NO.getCode(),
                sourceEnum, sourceBillNo);
-        // 手术计费场景：sourceBillNo 不为空时，只保留诊疗请求（3/6），过滤掉药品（1）和耗材（2）
+        // 手术计费场景：sourceBillNo 不为空时，过滤掉药品（1），保留耗材（2）和诊疗（3/6）
        if (sourceBillNo != null && !sourceBillNo.isEmpty()) {
            requestBaseInfo.removeIf(dto -> dto.getAdviceType() != null
-                    && (dto.getAdviceType() == 1 || dto.getAdviceType() == 2));
+                    && dto.getAdviceType() == 1);
        }
        for (RequestBaseDto requestBaseDto : requestBaseInfo) {
            // 请求状态
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/NursingRecordController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inpatientmanage/controller/NursingRecordController.java
@@ -31,6 +31,7 @@ public class NursingRecordController {
     * 获取住院患者信息 分页显示
     *
     * @param nursingSearchParam 查询参数
+     *
     * @param searchKey 模糊查询
     * @param pageNo 当前页码
     * @param pageSize 查询条数
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/chargemanage/OutpatientChargeAppMapper.xml
@@ -97,6 +97,10 @@
               CASE
                   WHEN T1.context_enum = #{activity} AND T1.product_table = 'cli_surgery' THEN T9.surgery_name
                   WHEN T1.context_enum = 6 AND T1.product_table = 'cli_surgery' THEN T9.surgery_name
+                   WHEN T1.context_enum = 6 AND T1.service_table = 'wor_service_request' THEN COALESCE(
+                       wsr.content_json::json->>'surgeryName',
+                       wsr.content_json::json->>'adviceName',
+                       T9sr.surgery_name)
                   WHEN T1.context_enum = 6 AND T1.product_id = 0 AND T1.service_table = 'wor_service_request' THEN COALESCE(wsr.content_json::json->>'adviceName', T2."name")
                   WHEN T1.context_enum = 6 THEN T2."name"
                   WHEN T1.context_enum = #{activity} AND T1.product_id = 0 AND T1.service_table = 'wor_service_request' THEN COALESCE(wsr.content_json::json->>'adviceName', T2."name")
@@ -108,6 +112,7 @@
               CASE
                   WHEN T1.context_enum = #{activity} AND T1.product_table = 'cli_surgery' THEN NULL
                   WHEN T1.context_enum = 6 AND T1.product_table = 'cli_surgery' THEN NULL
+                   WHEN T1.context_enum = 6 AND T1.service_table = 'wor_service_request' THEN NULL
                   WHEN T1.context_enum = 6 AND T1.product_id = 0 AND T1.service_table = 'wor_service_request' THEN NULL
                   WHEN T1.context_enum = 6 THEN T2.yb_no
                   WHEN T1.context_enum = #{activity} AND T1.product_id = 0 AND T1.service_table = 'wor_service_request' THEN NULL
@@ -118,6 +123,7 @@
               CASE
                   WHEN T1.context_enum = #{activity} AND T1.product_table = 'cli_surgery' THEN T9.id
                   WHEN T1.context_enum = 6 AND T1.product_table = 'cli_surgery' THEN T9.id
+                   WHEN T1.context_enum = 6 AND T1.service_table = 'wor_service_request' THEN COALESCE(T9sr.id, wsr.activity_id)
                   WHEN T1.context_enum = 6 AND T1.product_id = 0 AND T1.service_table = 'wor_service_request' THEN 0
                   WHEN T1.context_enum = 6 THEN T2.id
                   WHEN T1.context_enum = #{activity} AND T1.product_id = 0 AND T1.service_table = 'wor_service_request' THEN 0
@@ -159,6 +165,11 @@
                  LEFT JOIN med_medication_request AS mmr ON mmr.id = T1.service_id AND mmr.delete_flag = '0'
                  LEFT JOIN wor_device_request AS wdr ON wdr.id = T1.service_id AND wdr.delete_flag = '0'
                  LEFT JOIN wor_service_request AS wsr ON wsr.id = T1.service_id AND wsr.delete_flag = '0'
+                  LEFT JOIN cli_surgery AS T9sr ON T1.context_enum = 6
+                      AND T1.service_table = 'wor_service_request'
+                      AND wsr.activity_id IS NOT NULL
+                      AND wsr.activity_id = T9sr.id
+                      AND T9sr.delete_flag = '0'
                  LEFT JOIN wor_service_request AS wsrp ON wsrp.id = wsr.parent_id AND wsrp.delete_flag = '0'
         WHERE T1.encounter_id = #{encounterId}
          AND T1.status_enum IN (0
@@ -223,6 +234,10 @@
                      CASE
                          WHEN T1.context_enum = #{activity} AND T1.product_table = 'cli_surgery' THEN T9.surgery_name
                          WHEN T1.context_enum = 6 AND T1.product_table = 'cli_surgery' THEN T9.surgery_name
+                          WHEN T1.context_enum = 6 AND T1.service_table = 'wor_service_request' THEN COALESCE(
+                              wsr.content_json::json->>'surgeryName',
+                              wsr.content_json::json->>'adviceName',
+                              T9sr.surgery_name)
                          WHEN T1.context_enum = 6 AND T1.product_id = 0 AND T1.service_table = 'wor_service_request' THEN COALESCE(wsr.content_json::json->>'adviceName', T2."name")
                          WHEN T1.context_enum = 6 THEN T2."name"
                          WHEN T1.context_enum = #{activity} AND T1.product_id = 0 AND T1.service_table = 'wor_service_request' THEN COALESCE(wsr.content_json::json->>'adviceName', T2."name")
@@ -234,6 +249,7 @@
                      CASE
                          WHEN T1.context_enum = #{activity} AND T1.product_table = 'cli_surgery' THEN NULL
                          WHEN T1.context_enum = 6 AND T1.product_table = 'cli_surgery' THEN NULL
+                          WHEN T1.context_enum = 6 AND T1.service_table = 'wor_service_request' THEN NULL
                          WHEN T1.context_enum = 6 AND T1.product_id = 0 AND T1.service_table = 'wor_service_request' THEN NULL
                          WHEN T1.context_enum = 6 THEN T2.yb_no
                          WHEN T1.context_enum = #{activity} AND T1.product_id = 0 AND T1.service_table = 'wor_service_request' THEN NULL
@@ -244,6 +260,7 @@
                      CASE
                          WHEN T1.context_enum = #{activity} AND T1.product_table = 'cli_surgery' THEN T9.id
                          WHEN T1.context_enum = 6 AND T1.product_table = 'cli_surgery' THEN T9.id
+                          WHEN T1.context_enum = 6 AND T1.service_table = 'wor_service_request' THEN COALESCE(T9sr.id, wsr.activity_id)
                          WHEN T1.context_enum = 6 AND T1.product_id = 0 AND T1.service_table = 'wor_service_request' THEN 0
                          WHEN T1.context_enum = 6 THEN T2.id
                          WHEN T1.context_enum = #{activity} AND T1.product_id = 0 AND T1.service_table = 'wor_service_request' THEN 0
@@ -286,6 +303,11 @@
                        LEFT JOIN med_medication_request AS mmr ON mmr.id = T1.service_id AND mmr.delete_flag = '0'
                        LEFT JOIN wor_device_request AS wdr ON wdr.id = T1.service_id AND wdr.delete_flag = '0'
                        LEFT JOIN wor_service_request AS wsr ON wsr.id = T1.service_id AND wsr.delete_flag = '0'
+                        LEFT JOIN cli_surgery AS T9sr ON T1.context_enum = 6
+                            AND T1.service_table = 'wor_service_request'
+                            AND wsr.activity_id IS NOT NULL
+                            AND wsr.activity_id = T9sr.id
+                            AND T9sr.delete_flag = '0'
               WHERE T1.encounter_id = #{encounterId}
                AND T1.status_enum IN (0
                  , #{planned}
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgicalScheduleAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/clinicalmanage/SurgicalScheduleAppMapper.xml
@@ -71,7 +71,7 @@
        </if>
            AND os.delete_flag = '0'
        </where>
-        ORDER BY os.create_time DESC
+        ORDER BY os.create_time DESC, os.schedule_id DESC
    </select>
 <!--    根据ID查询手术安排详情-->
    <select id="getSurgeryScheduleDetail" resultType="com.openhis.web.clinicalmanage.dto.OpScheduleDto">
@@ -89,6 +89,8 @@
            cs.apply_doctor_name AS apply_doctor_name,
            drf.create_time AS apply_time,
            os.surgery_nature AS surgeryType,
+            cs.incision_level AS incisionLevel,
+            fc.contract_name AS feeType,
            os.fee_type AS feeType,
            COALESCE(pi.identifier_no, ap.bus_no, '') AS identifierNo
        FROM op_schedule os
@@ -183,7 +185,7 @@
            <if test="dto.applyDeptId != null and dto.applyDeptId != ''"> AND cs.apply_dept_id = #{dto.applyDeptId}</if>
            <if test="dto.patientName != null and dto.patientName != ''"> AND ap.name LIKE CONCAT('%', #{dto.patientName}, '%')</if>
        </where>
-        ORDER BY os.create_time DESC
+        ORDER BY os.create_time DESC, os.schedule_id DESC
    </select>
 <!--    查询时间段内该手术室是否被占用-->
    <select id="isScheduleConflict" resultType="java.lang.Boolean">
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml
@@ -539,7 +539,8 @@
        AND T1.refund_medicine_id IS NULL
        ORDER BY T1.status_enum,T1.sort_number)
        UNION ALL
-        -- 🔧 新增：查询门诊术中计费生成的耗材数据（这些数据存在于 adm_charge_item 和 wor_device_request）
+        -- 🔧 查询仅存在于 adm_charge_item 的"孤儿"耗材数据（DeviceRequest 缺失或 generate_source_enum 未设置）
+        -- 正常 DeviceRequest（generate_source_enum 已赋值）由下方 Part 3 统一负责，此处不做重复覆盖避免 UNION ALL 重复行
        (SELECT 2 AS advice_type,
        CI.service_id AS request_id,
        CI.service_id || '-ci-dev' AS unique_key,
@@ -584,7 +585,7 @@
        WHERE CI.delete_flag = '0'
          AND CI.service_table = 'wor_device_request'
          <if test="generateSourceEnum != null">
-              AND (DR.generate_source_enum IS NULL OR DR.generate_source_enum = #{generateSourceEnum})
+              AND DR.generate_source_enum IS NULL <!-- 仅匹配孤儿记录，normal DeviceRequest 由 Part 3 负责，避免 UNION ALL 重复 -->
          </if>
          <if test="historyFlag == '0'.toString()">
              AND CI.encounter_id = #{encounterId}
--- a/openhis-ui-vue3/src/utils/his.js
+++ b/openhis-ui-vue3/src/utils/his.js
@@ -1,3 +1,5 @@
+import useDictStore from '@/store/modules/dict';
+
 // 日期格式化
 export function parseTime(time, pattern) {
  if (arguments.length === 0 || !time) {
@@ -275,30 +277,13 @@ export function blobValidate(data) {

 // 按照频次天数计算总数量
 export function calculateQuantityByDays(frequency, days) {
-  // const dict = useDict('rate_code').rate_code.value
-  // const rate = dict.find(item => item.value === frequency).remark
-  // if(rate){
-  //   return Math.floor(Number(rate) * days)
-  // } else {
-  //   return undefined
-  // }
-  const frequencyMap = {
-    ST: 1,
-    QD: 1, // 每日一次
-    BID: 2, // 每日两次
-    TID: 3, // 每日三次
-    QID: 4, // 每日四次
-    QN: 1, // 每晚一次
-    QOD: 1 / 2, // 每隔一日一次
-    QW: 1 / 7, // 每周一次
-    BIW: 2 / 7, // 每周两次
-    TIW: 3 / 7, // 每周三次
-    QOW: 1 / 14, // 隔周一次
-  };
-  if (!frequencyMap[frequency]) {
-    return;
-  }
-  const quantity = frequencyMap[frequency] * days;
+  const dicts = useDictStore().getDict('rate_code');
+  if (!dicts) return;
+  const dict = dicts.find(item => item.value === frequency);
+  if (!dict?.remark) return;
+  const rate = Number(dict.remark);
+  if (isNaN(rate) || !rate) return;
+  const quantity = rate * days;
  return quantity < 1 ? 1 : Math.ceil(quantity);
 }

--- a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
@@ -473,15 +473,12 @@ function calculateTotalPrice() {
      }
    });
    totalPrice.value = sum.toFixed(2);
-    // Bug #464: 零售价与诊疗子项合计总价实时同步
+    // Bug #464: 零售价与诊疗子项合计总价实时同步，直接赋值不使用nextTick避免多调用方竞争
    const hasValidItem = treatmentItems.value.some(
      (item) => item.adviceDefinitionId && item.adviceDefinitionId !== ''
    );
    if (hasValidItem) {
-      // 使用 nextTick 确保总价更新后零售价才更新，避免 Vue 响应式时序问题
-      nextTick(() => {
-        form.value.retailPrice = parseFloat(totalPrice.value) || 0;
-      });
+      form.value.retailPrice = parseFloat(totalPrice.value) || 0;
    } else {
      form.value.retailPrice = undefined;
    }
@@ -763,10 +760,7 @@ function selectRow(row, index) {
  treatmentItems.value[index].adviceDefinitionId = row.id;
  treatmentItems.value[index].retailPrice = row.retailPrice || 0;
  medicineSearchKey.value = '';
-  // 使用 nextTick 确保 DOM 更新后再计算总价
-  nextTick(() => {
-    calculateTotalPrice();
-  });
+  calculateTotalPrice();
 }

 // 清空诊疗子项
--- a/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue
@@ -461,7 +461,7 @@ watch(
    console.log(prescriptionList.value,"prescriptionList.value")
    if(newValue&&newValue.length>0){
      let saveList = prescriptionList.value.filter((item) => {
-        return item.statusEnum == 1&&(Number(item.bizRequestFlag)==1||!item.bizRequestFlag)
+        return item.check && item.statusEnum == 1&&(Number(item.bizRequestFlag)==1||!item.bizRequestFlag)
      })
       console.log(saveList,"prescriptionList.value")
      if (saveList.length == 0) {
@@ -1015,7 +1015,7 @@ function handleSave() {
    return;
  }
  let saveList = prescriptionList.value.filter((item) => {
-    return item.statusEnum == 1&&(Number(item.bizRequestFlag)==1||!item.bizRequestFlag)
+    return item.check && item.statusEnum == 1&&(Number(item.bizRequestFlag)==1||!item.bizRequestFlag)
  });
  // let saveList = prescriptionList.value
  // .filter((item) => {
@@ -1080,42 +1080,44 @@ function handleSaveSign(row, index) {
    proxy.$modal.msgWarning('诊疗项目必须选择执行科室');
    return;
  }
+  isSaving.value = true; // #437 立即加锁，消除 TOCTOU 竞态
  proxy.$refs['formRef' + index].validate((valid) => {
-    if (valid) {
-      isSaving.value = true; // #437 加锁
-      row.isEdit = false;
-      isAdding.value = false;
-      expandOrder.value = [];
-      row.patientId = props.patientInfo.patientId;
-      row.encounterId = props.patientInfo.encounterId;
-      row.accountId = props.patientInfo.accountId;
-      const cleanRow = JSON.parse(JSON.stringify(row));
-      cleanRow.contentJson = JSON.stringify(cleanRow);
-      cleanRow.dbOpType = cleanRow.requestId ? '2' : '1';
-      cleanRow.minUnitQuantity = cleanRow.quantity * cleanRow.partPercent;
-      cleanRow.categoryEnum = cleanRow.adviceType
-      // 如果是手术计费，设置生成来源和来源业务单据号
-      if (props.patientInfo.sourceBillNo) {
-        cleanRow.generateSourceEnum = 6; // 手术计费
-        cleanRow.sourceBillNo = props.patientInfo.sourceBillNo;
-      }
-      console.log('cleanRow', cleanRow)
-      savePrescription({ adviceSaveList: [cleanRow] }).then((res) => {
-        if (res.code === 200) {
-          proxy.$modal.msgSuccess('保存成功');
-          getListInfo(false);
-          nextId.value = 1;
-          // 🔧 Bug Fix #238: 如果诊疗项目缺少执行科室，标记为需要修复的脏数据
-          if (row.adviceType === 3 && !row.orgId) {
-            console.warn('Bug #238: 检测到诊疗项目保存时缺少执行科室，请手动编辑修正:', cleanRow);
-            proxy.$modal.msgWarning('诊疗项目执行科室信息不完整，请编辑后重新保存');
-          }
-        }
-      }).finally(() => {
-        isSaving.value = false; // #437 释放锁
-      });
+    if (!valid) {
+      isSaving.value = false; // 验证失败释放锁
+      return;
    }
-  });
+    row.isEdit = false;
+    isAdding.value = false;
+    expandOrder.value = [];
+    row.patientId = props.patientInfo.patientId;
+    row.encounterId = props.patientInfo.encounterId;
+    row.accountId = props.patientInfo.accountId;
+    const cleanRow = JSON.parse(JSON.stringify(row));
+    cleanRow.contentJson = JSON.stringify(cleanRow);
+    cleanRow.dbOpType = cleanRow.requestId ? '2' : '1';
+    cleanRow.minUnitQuantity = cleanRow.quantity * cleanRow.partPercent;
+    cleanRow.categoryEnum = cleanRow.adviceType
+    // 如果是手术计费，设置生成来源和来源业务单据号
+    if (props.patientInfo.sourceBillNo) {
+      cleanRow.generateSourceEnum = 6; // 手术计费
+      cleanRow.sourceBillNo = props.patientInfo.sourceBillNo;
+    }
+    console.log('cleanRow', cleanRow)
+    savePrescription({ adviceSaveList: [cleanRow] }, '1').then((res) => {
+      if (res.code === 200) {
+        proxy.$modal.msgSuccess('保存成功');
+        getListInfo(false);
+        nextId.value = 1;
+        // 🔧 Bug Fix #238: 如果诊疗项目缺少执行科室，标记为需要修复的脏数据
+        if (row.adviceType === 3 && !row.orgId) {
+          console.warn('Bug #238: 检测到诊疗项目保存时缺少执行科室，请手动编辑修正:', cleanRow);
+          proxy.$modal.msgWarning('诊疗项目执行科室信息不完整，请编辑后重新保存');
+        }
+      }
+    }).finally(() => {
+      isSaving.value = false; // #437 释放锁
+    });
+  })
 }

 // 签退
--- a/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue
@@ -278,16 +278,33 @@
                  <el-input v-model="scope.row.applyPart" size="small" />
                </template>
              </el-table-column>
-              <el-table-column label="检查方法" min-width="120">
+              <el-table-column label="检查方法" min-width="160">
                <template #default="scope">
-                  <!-- Bug #384修复: 显示检查方法名称，不显示套餐名称 -->
-                  <span v-if="scope.row.selectedMethod">
-                    {{ scope.row.selectedMethod.name }}
-                  </span>
-                  <span v-else-if="scope.row.methods && scope.row.methods.length > 0" style="color: #909399;">
-                    未选择
-                  </span>
-                  <span v-else style="color: #c0c4cc;">-</span>
+                  <el-select
+                    v-if="scope.row.methods && scope.row.methods.length > 1"
+                    :model-value="scope.row.selectedMethod"
+                    value-key="id"
+                    size="small"
+                    style="width: 100%"
+                    placeholder="选择方法"
+                    @update:model-value="(val) => onDetailMethodChange(scope.row, val)"
+                  >
+                    <el-option
+                      v-for="meth in scope.row.methods"
+                      :key="meth.id"
+                      :label="`${meth.name}${meth.packagePrice != null ? ' ¥' + formatDetailAmount(meth.packagePrice) : ''}`"
+                      :value="meth"
+                    />
+                  </el-select>
+                  <template v-else>
+                    <span v-if="scope.row.selectedMethod">
+                      {{ scope.row.selectedMethod.name }}
+                    </span>
+                    <span v-else-if="scope.row.methods && scope.row.methods.length > 0" style="color: #909399;">
+                      未选择
+                    </span>
+                    <span v-else style="color: #c0c4cc;">-</span>
+                  </template>
                </template>
              </el-table-column>
              <el-table-column label="单位" prop="unit" width="55" align="center" />
@@ -412,58 +429,48 @@
                v-for="(item, idx) in selectedItems"
                :key="idx"
                class="selected-item-card"
+                :class="{ 'is-expanded': item.expanded }"
              >
                <!-- Bug #384修复 + #426修复: 项目卡片头部，可展开/收起 -->
                <div class="card-header" @click="toggleItemExpand(item)">
                  <el-tag v-if="item.isPackage || item.packageName" size="small" type="warning" style="margin-right: 4px; flex-shrink: 0;">套餐</el-tag>
-                  <span class="card-name">{{ item.name }}</span>
-                  <span class="card-price">¥{{ item.price }}</span>
-                  <!-- 展开/收起图标 -->
-                  <el-icon class="expand-icon" :class="{ expanded: item.expanded }">
-                    <ArrowRight />
+                  <el-tooltip :content="item.name" placement="top" :show-after="400">
+                    <span class="card-name">{{ item.name }}</span>
+                  </el-tooltip>
+                  <span class="card-price">¥{{ formatDetailAmount(item.price) }}</span>
+                  <el-icon :class="['expand-icon', { expanded: item.expanded }]">
+                    <ArrowDown v-if="!item.expanded" />
+                    <ArrowUp v-if="item.expanded" />
                  </el-icon>
                  <!-- 删除按钮 -->
                  <el-button link type="danger" size="small" @click.stop="handleRemoveItem(idx, item)">
                    <el-icon><Close /></el-icon>
                  </el-button>
                </div>
-                <!-- Bug #428修复 + #426修复: 展开后显示套餐明细或检查方法 -->
-                <div v-show="item.expanded" class="expanded-content">
-                  <!-- 显示套餐明细 -->
-                  <div v-if="(item.isPackage || item.packageName) && item.packageDetails && item.packageDetails.length > 0" class="package-details-list">
-                    <div class="detail-row" v-for="detail in item.packageDetails" :key="detail.id">
-                      <span class="detail-name">{{ detail.name }}</span>
-                      <span class="detail-info">数量: {{ detail.quantity }} 单价: ¥{{ detail.price }}</span>
+                <!-- Bug #428: 有套餐 ID 时默认展开；加载中/空/明细均在本区域展示 -->
+                <div v-if="item.expanded && shouldShowPackageBody(item)" class="selected-card-body">
+                  <div v-if="item.packageDetailsLoading" class="package-details-loading">加载中...</div>
+                  <template v-else>
+                    <div v-if="getPackageDetailsList(item).length === 0" class="package-details-empty">
+                      暂无套餐明细
                    </div>
-                  </div>
-                  <!-- 套餐明细加载中 -->
-                  <div v-else-if="(item.isPackage || item.packageName) && item.packageDetailsLoading" class="package-loading-hint">
-                    加载中...
-                  </div>
-                  <!-- 显示检查方法 -->
-                  <div v-else-if="item.methods && item.methods.length > 0" class="method-list">
-                    <div v-for="method in item.methods" :key="method.id" class="method-option">
-                      <el-checkbox :model-value="item.selectedMethod?.id === method.id" @change="(val) => selectMethodCheckbox(val, item, method)">
-                        <span class="method-name">{{ method.name }}</span>
-                        <span class="method-price">¥{{ method.packagePrice || item.price }}</span>
-                      </el-checkbox>
-                    </div>
-                    <!-- 选中方法后，显示对应的套餐明细 -->
-                    <div v-if="item.selectedMethod && item.methodPackageDetails && item.methodPackageDetails.length > 0" class="method-package-details">
-                      <div class="method-package-header">
-                        <span class="method-package-title">套餐明细 - {{ item.selectedMethod.name }}</span>
-                      </div>
-                      <div v-for="detail in item.methodPackageDetails" :key="detail.id" class="method-option">
-                        <el-checkbox v-model="detail.checked">
-                          <span class="method-name">{{ detail.name }}</span>
-                          <span class="method-price">数量: {{ detail.quantity }} ¥{{ detail.price }}</span>
-                        </el-checkbox>
+                    <div v-else class="package-details-list">
+                      <div class="package-details-head">套餐明细</div>
+                      <div
+                        v-for="(detail, dIdx) in getPackageDetailsList(item)"
+                        :key="detail.id ?? detail.itemCode ?? `d-${dIdx}`"
+                        class="detail-row"
+                      >
+                        <el-tooltip :content="detail.name" placement="top" :show-after="500">
+                          <span class="detail-name">{{ detail.name }}</span>
+                        </el-tooltip>
+                        <div class="detail-meta">
+                          <span class="detail-qty">×{{ detail.quantity || 1 }}</span>
+                          <span class="detail-price">¥{{ formatDetailAmount(detail.price) }}</span>
+                        </div>
                      </div>
                    </div>
-                    <div v-if="item.selectedMethod && item.methodPackageLoading" class="method-package-loading">
-                      加载套餐明细中...
-                    </div>
-                  </div>
+                  </template>
                </div>
              </div>
            </div>
@@ -477,7 +484,7 @@
 <script setup>
 import { ref, reactive, computed, watch, onMounted, nextTick } from 'vue';
 import { ElMessage, ElMessageBox } from 'element-plus';
-import { Printer, Delete, ArrowDown, ArrowUp, Close, ArrowRight } from '@element-plus/icons-vue';
+import { Printer, Delete, ArrowDown, ArrowUp, Close } from '@element-plus/icons-vue';
 import useUserStore from '@/store/modules/user';
 import request from '@/utils/request';
 import { listCheckMethod, searchCheckMethod, listCheckPackage } from '@/api/system/checkType';
@@ -568,21 +575,22 @@ handleResetSearch();

 // 🔧 BugFix#426: 懒加载套餐明细
 async function loadPackageDetails(row, treeNode, resolve) {
-  if (!row.isPackage || !row.packageId) {
+  if (!row.packageId) {
    resolve([]);
    return;
  }
  try {
    const res = await request({
-      url: `/system/package/${row.packageId}/details`,
+      url: `/system/check-type/package/${row.packageId}/details`,
      method: 'get'
    });
-    if (res.code === 200 && res.data) {
-      const children = res.data.map(item => ({
-        ...item,
-        name: item.name || item.itemName,
-        unit: item.unit || '次',
-        price: item.price || item.itemPrice || 0,
+    if (res.code === 200) {
+      const list = parsePackageDetailsPayload(res);
+      const children = list.map((child) => ({
+        ...child,
+        name: child.name || child.itemName,
+        unit: child.unit || '次',
+        price: child.price ?? child.unitPrice ?? child.itemPrice ?? 0,
        quantity: row.quantity || 1,
        isPackageDetail: true
      }));
@@ -597,16 +605,68 @@ async function loadPackageDetails(row, treeNode, resolve) {
 }

 // #428修复 + #426修复: 为已选择项目加载套餐明细（通过packageId或packageName查询）
+/** 套餐明细挂在「部位」或已选的「检查方法」上（方法可带 packageId） */
+function getPackageCarrier(item) {
+  return item?.selectedMethod?.packageId ? item.selectedMethod : item;
+}
+
+function getPackageDetailsList(item) {
+  // 明细挂在行对象上，避免仅写入 methods 内嵌对象时首帧不触发视图更新（体感需点两次才展开）
+  if (Array.isArray(item?.packageDetailsDisplay)) {
+    return item.packageDetailsDisplay;
+  }
+  const carrier = getPackageCarrier(item);
+  return Array.isArray(carrier?.packageDetails) ? carrier.packageDetails : [];
+}
+
+/** 有套餐 ID 的已选行才展示右侧套餐区（加载中 / 空 / 明细列表） */
+function shouldShowPackageBody(item) {
+  return !!getPackageCarrier(item)?.packageId;
+}
+
+/** 金额展示：统一两位小数 */
+function formatDetailAmount(value) {
+  const n = Number(value ?? 0);
+  return Number.isFinite(n) ? n.toFixed(2) : '0.00';
+}
+
+/** 默认检查方法：优先与部位 packageId 一致的方法，否则取首个带套餐的方法，否则取第一个 */
+function pickDefaultMethod(methods, partItem) {
+  if (!methods?.length) return null;
+  if (methods.length === 1) return methods[0];
+  const pid = partItem?.packageId ?? null;
+  if (pid != null && pid !== '') {
+    const matched = methods.find(
+      (x) => x.packageId != null && String(x.packageId) === String(pid)
+    );
+    if (matched) return matched;
+  }
+  const withPkg = methods.find((x) => x.packageId != null);
+  if (withPkg) return withPkg;
+  return methods[0];
+}
+
+function parsePackageDetailsPayload(res) {
+  const raw =
+    res?.data?.data ??
+    res?.data?.records ??
+    res?.data ??
+    res?.rows ??
+    res;
+  if (!Array.isArray(raw)) return [];
+  return raw;
+}
+
+// #428: 为已选择项目加载套餐明细（后端：CheckTypeController /system/check-type/package/{id}/details）
 async function loadPackageDetailsForItem(item) {
-  // 只要有 packageName 就认为是套餐，不强制要求 isPackage 或 packageId
-  if (!item.packageName && !item.packageId) {
+  const carrier = getPackageCarrier(item);
+  let packageId = item.packageId || carrier?.packageId;
+  if (!packageId && !item.packageName) {
    return;
  }
  item.packageDetailsLoading = true;
  try {
-    let packageId = item.packageId;
    if (!packageId && item.packageName) {
-      // CheckPart 没有 packageId 字段，需要通过 packageName 查询获取
      const pkgRes = await listCheckPackage({ packageName: item.packageName });
      let packages = pkgRes?.data || [];
      if (!Array.isArray(packages)) {
@@ -614,31 +674,48 @@ async function loadPackageDetailsForItem(item) {
      }
      if (packages.length === 0) {
        item.packageDetails = [];
+        item.packageDetailsDisplay = [];
        return;
      }
      packageId = packages[0].id;
+      item.packageId = packageId;
    }
    if (!packageId) {
      item.packageDetails = [];
+      item.packageDetailsDisplay = [];
      return;
    }
    const res = await request({
-      url: `/system/package/${packageId}/details`,
+      url: `/system/check-type/package/${packageId}/details`,
      method: 'get'
    });
+    const list = parsePackageDetailsPayload(res);
+    const mapped = list.map((detail) => ({
+      ...detail,
+      name: detail.name || detail.itemName,
+      unit: detail.unit || '次',
+      price: detail.price ?? detail.unitPrice ?? detail.itemPrice ?? 0,
+      quantity: detail.quantity || 1
+    }));
+    item.packageDetailsDisplay = mapped;
+    carrier.packageDetails = mapped;
    if (res.code === 200 && res.data) {
-      item.packageDetails = res.data.map(detail => ({
-        ...detail,
-        name: detail.name || detail.itemName,
-        unit: detail.unit || '次',
-        price: detail.price || detail.unitPrice || 0,
-        quantity: detail.quantity || 1
-      }));
+      item.packageDetails = Array.isArray(res.data)
+        ? res.data.map((detail) => ({
+            ...detail,
+            name: detail.name || detail.itemName,
+            unit: detail.unit || '次',
+            price: detail.price || detail.unitPrice || 0,
+            quantity: detail.quantity || 1
+          }))
+        : mapped;
    } else {
-      item.packageDetails = [];
+      item.packageDetails = mapped;
    }
  } catch (err) {
    console.error('加载套餐明细失败:', err);
+    item.packageDetailsDisplay = [];
+    carrier.packageDetails = [];
    item.packageDetails = [];
  } finally {
    item.packageDetailsLoading = false;
@@ -1174,7 +1251,10 @@ function handleRowClick(row) {
            nationalCode: '', checked: true,
            methods: [],
            selectedMethod: null,
-            expanded: false  // Bug #384修复: 添加展开状态
+            expanded: false,
+            packageDetailsLoading: false,
+            isPackage: false,
+            packageId: null
          };
          // 加载该项目的检查方法
          if (m.bodyPartCode) {
@@ -1205,6 +1285,13 @@ function handleRowClick(row) {
                    item.packageId = item.selectedMethod.packageId;
                  }
                }
+                if (!item.selectedMethod && item.methods.length) {
+                  item.selectedMethod = pickDefaultMethod(item.methods, { packageId: item.packageId });
+                }
+                if (item.selectedMethod?.packageId) {
+                  item.packageId = item.selectedMethod.packageId;
+                  item.isPackage = true;
+                }
              }
            } catch (err) {
              console.error('加载检查方法失败', err);
@@ -1214,6 +1301,12 @@ function handleRowClick(row) {
          return item;
        }));
        selectedItems.value = itemsWithMethods;
+        for (const it of selectedItems.value) {
+          if (getPackageCarrier(it)?.packageId) {
+            await loadPackageDetailsForItem(it);
+          }
+          it.expanded = !!getPackageCarrier(it)?.packageId;
+        }
        syncCategoryChecked();
        // Bug #384修复: 回充后更新检查方法显示
        updateMethodDisplay();
@@ -1375,7 +1468,7 @@ async function handleItemSelect(checked, item, cat) {
      }
    }

-    selectedItems.value.push({
+    const newRow = {
      id: item.id, name: item.name,
      price: item.price, quantity: 1,
      serviceFee: item.serviceFee || 0,
@@ -1386,11 +1479,27 @@ async function handleItemSelect(checked, item, cat) {
      checked: true,
      methods: methods,
      selectedMethod: null,
-      expanded: false,  // Bug #384修复: 新增展开状态，默认不展开
-      isPackage: !!item.packageName,  // Bug #428修复: 标记是否为套餐
-      packageName: item.packageName || null,  // Bug #426修复: 套餐名称，用于查找packageId
-      packageId: item.packageId || null  // Bug #428修复: 套餐ID
-    });
+      expanded: false,
+      isPackage: !!(item.packageId || item.packageName),
+      packageName: item.packageName || null,
+      packageDetailsLoading: false,
+      packageId: item.packageId || null
+    };
+    selectedItems.value.push(newRow);
+    // 必须用数组里的响应式行，不能继续改局部 newRow：push 后列表内是 proxy，改 raw 对象不会触发右侧卡片更新（会一直卡在「加载中」）
+    const row = selectedItems.value[selectedItems.value.length - 1];
+
+    // 右侧不再展示「检查方法」列表：自动选默认方法（保存、计价仍依赖 selectedMethod）
+    if (methods.length >= 1) {
+      row.selectedMethod = pickDefaultMethod(methods, item);
+    }
+    updateMethodDisplay();
+
+    // 有套餐 ID 时默认展开（先显示加载区，明细写入行对象 packageDetailsDisplay）
+    row.expanded = !!getPackageCarrier(row)?.packageId;
+    if (getPackageCarrier(row)?.packageId) {
+      await loadPackageDetailsForItem(row);
+    }

    // 自动回填执行科室：按检查项目类型 → 检查类型管理里配置的执行科室
    if (selectedItems.value.length === 1 && cat?.performDeptName) {
@@ -1414,16 +1523,23 @@ async function handleItemSelect(checked, item, cat) {
 // Bug #384修复 + #426修复: 展开/收起项目卡片
 async function toggleItemExpand(item) {
  item.expanded = !item.expanded;
-  // 如果是展开且该项目是套餐（通过 isPackage 或 packageName 判断），加载套餐明细
  if (item.expanded && (item.isPackage || item.packageName) && (!item.packageDetails || item.packageDetails.length === 0) && !item.packageDetailsLoading) {
    await loadPackageDetailsForItem(item);
  }
+  if (item.expanded && shouldShowPackageBody(item)) {
+    if (getPackageDetailsList(item).length === 0 && !item.packageDetailsLoading) {
+      await loadPackageDetailsForItem(item);
+    }
+  }
 }

 // Bug #384修复: 勾选框选择检查方法（单选逻辑）
 async function selectMethodCheckbox(checked, item, method) {
  if (checked) {
    item.selectedMethod = method;
+    if (item.expanded && method.packageId) {
+      loadPackageDetailsForItem(item);
+    }
    // 动态加载该方法对应的套餐明细
    await loadMethodPackageDetails(item, method);
  } else {
@@ -1483,6 +1599,28 @@ async function loadMethodPackageDetails(item, method) {
  }
 }

+/** 检查明细表格中切换检查方法 */
+async function onDetailMethodChange(row, val) {
+  row.selectedMethod = val || null;
+  if (val?.packageId) {
+    row.packageId = val.packageId;
+    row.isPackage = true;
+  }
+  row.packageDetailsDisplay = undefined;
+  const carrier = getPackageCarrier(row);
+  if (carrier) {
+    carrier.packageDetails = undefined;
+  }
+  updateMethodDisplay();
+  row.expanded = !!getPackageCarrier(row)?.packageId;
+  if (getPackageCarrier(row)?.packageId) {
+    await loadPackageDetailsForItem(row);
+  }
+  nextTick(() => {
+    form.totalAmount = totalAmountCalc.value;
+  });
+}
+
 // Bug #384修复: 更新检查方法显示字段（联动）
 function updateMethodDisplay() {
  // 找到第一个有选中检查方法的项目
@@ -1627,7 +1765,7 @@ defineExpose({ getList });

 /* 右：分类面板 */
 .category-panel {
-  width: 380px;
+  width: 420px;
  flex-shrink: 0;
  background: #fff;
  border-radius: 4px;
@@ -1763,8 +1901,11 @@ defineExpose({ getList });
 }

 /* 已选择 tags */
+/* 已选择：加宽，避免套餐明细挤成一团 */
 .selected-panel {
-  width: 140px;  /* Bug #384修复: 加宽以适应展开内容 */
+  width: 220px;
+  min-width: 200px;
+  max-width: 280px;
  flex-shrink: 0;
  display: flex;
  flex-direction: column;
@@ -1772,9 +1913,11 @@ defineExpose({ getList });
 .selected-tags {
  flex: 1;
  overflow-y: auto;
+  overflow-x: hidden;
  display: flex;
  flex-direction: column;
-  gap: 6px;
+  gap: 8px;
+  padding-right: 2px;
 }
 .selected-tag {
  max-width: 100%;
@@ -1787,30 +1930,40 @@ defineExpose({ getList });
  font-size: 12px;
 }

-/* Bug #384修复: 已选择项目卡片（可展开） */
+/* 已选择项目卡片 */
 .selected-item-card {
  display: flex;
  flex-direction: column;
-  background: #F5F5F5;
-  border-radius: 4px;
+  background: #fff;
+  border-radius: 6px;
  border: 1px solid #e4e7ed;
+  box-shadow: 0 1px 2px rgba(0, 0, 0, 0.04);
+  overflow: hidden;
 }

 .selected-item-card .card-header {
  display: flex;
  align-items: center;
-  padding: 8px 10px;
+  padding: 10px 10px;
  cursor: pointer;
-  gap: 4px;
+  gap: 8px;
+  background: linear-gradient(180deg, #f8fafc 0%, #f0f4f8 100%);
+  border-bottom: 1px solid transparent;
 }

 .selected-item-card .card-header:hover {
-  background: #E6F7FF;
+  background: linear-gradient(180deg, #ecf5ff 0%, #e3eef8 100%);
+}
+
+.selected-item-card.is-expanded .card-header {
+  border-bottom-color: #ebeef5;
 }

 .card-name {
  flex: 1;
-  font-size: 12px;
+  min-width: 0;
+  font-size: 13px;
+  font-weight: 500;
  color: #303133;
  overflow: hidden;
  text-overflow: ellipsis;
@@ -1818,14 +1971,17 @@ defineExpose({ getList });
 }

 .card-price {
-  font-size: 12px;
-  color: #1890FF;
-  font-weight: 500;
+  font-size: 13px;
+  color: #409eff;
+  font-weight: 600;
+  flex-shrink: 0;
 }

 .expand-icon {
-  font-size: 12px;
+  font-size: 14px;
  color: #909399;
+  transition: transform 0.2s ease;
+  flex-shrink: 0;
  transition: transform 0.2s;
  transform: rotate(0deg);
 }
@@ -1834,19 +1990,6 @@ defineExpose({ getList });
  transform: rotate(90deg);
 }

-/* Bug #426修复: 展开内容容器 */
-.expanded-content {
-  overflow: hidden;
-}
-
-/* Bug #426修复: 套餐明细加载提示 */
-.package-loading-hint {
-  padding: 8px 10px;
-  font-size: 11px;
-  color: #c0c4cc;
-  text-align: center;
-}
-
 /* Bug #428修复: 套餐明细列表样式 */
 .package-details-list {
  padding: 6px 10px;
@@ -1882,61 +2025,83 @@ defineExpose({ getList });
  white-space: nowrap;
 }

-/* Bug #384修复: 检查方法勾选框列表 */
-.method-list {
-  padding: 6px 10px;
-  background: #fff;
-  border-top: 1px solid #e4e7ed;
+/* 展开区域 */
+.selected-card-body {
+  background: #fafbfc;
+}
+
+.package-details-loading,
+.package-details-empty {
+  padding: 12px 10px;
+  font-size: 12px;
+  color: #909399;
+  text-align: center;
+}
+
+.package-details-empty {
+  color: #c0c4cc;
+}
+
+.package-details-list {
+  padding: 10px 10px 12px;
+}
+
+.package-details-head {
+  font-size: 11px;
+  font-weight: 600;
+  color: #909399;
+  letter-spacing: 0.02em;
+  margin-bottom: 8px;
+  padding-bottom: 6px;
+  border-bottom: 1px dashed #dcdfe6;
+}
+
+.detail-row {
+  display: grid;
+  grid-template-columns: minmax(0, 1fr) auto;
+  gap: 8px 12px;
+  align-items: start;
+  padding: 10px 0;
+  border-bottom: 1px solid #ebeef5;
+}
+
+.detail-row:last-of-type {
+  border-bottom: none;
+  padding-bottom: 2px;
+}
+
+.detail-name {
+  font-size: 12px;
+  color: #303133;
+  line-height: 1.5;
+  word-break: break-word;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  line-clamp: 2;
+  overflow: hidden;
+}
+
+.detail-meta {
  display: flex;
  flex-direction: column;
+  align-items: flex-end;
  gap: 4px;
+  flex-shrink: 0;
+  text-align: right;
 }

-.method-option {
-  display: flex;
-  align-items: center;
-}
-
-.method-option :deep(.el-checkbox__label) {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  width: 100%;
-}
-
-.method-option .method-name {
+.detail-qty {
  font-size: 11px;
-  color: #606266;
-}
-
-.method-option .method-price {
-  font-size: 11px;
-  color: #e6a23c;
-  font-weight: 500;
-  margin-left: 8px;
-}
-
-/* 选中方法后显示的套餐明细 */
-.method-package-details {
-  margin-top: 4px;
-  padding: 4px 0;
-  border-top: 1px dashed #dcdfe6;
-}
-
-.method-package-header {
-  padding: 2px 0 4px 24px;
-}
-
-.method-package-title {
-  font-size: 10px;
  color: #909399;
-  font-weight: 500;
+  font-variant-numeric: tabular-nums;
 }

-.method-package-loading {
-  padding: 4px 0 4px 24px;
-  font-size: 10px;
-  color: #c0c4cc;
+.detail-price {
+  font-size: 12px;
+  font-weight: 600;
+  color: #e6a23c;
+  font-variant-numeric: tabular-nums;
 }

 /* 折叠组件细节 */
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -315,6 +315,7 @@
                      data-prop="dispensePerDuration">
                      <el-input-number v-model="scope.row.dispensePerDuration" style="width: 80px" :min="1"
                        controls-position="right" :controls="false" :ref="(el) => (inputRefs.dispensePerDuration = el)"
+                        @input="calculateTotalAmount(scope.row, scope.$index)"
                        @change="calculateTotalAmount(scope.row, scope.$index)"
                        @keyup.enter.prevent="
                          handleEnter('dispensePerDuration', scope.row, scope.$index)
@@ -874,7 +875,7 @@ import { ArrowDown, Search, Memo, Minus, Plus, Edit, Delete } from '@element-plu
 import printUtils, { getPrinterList, PRINT_TEMPLATE, savePrinterToCache, } from '@/utils/printUtils';
 import Template from "@/views/inpatientDoctor/home/emr/components/template.vue";

-const emit = defineEmits(['selectDiagnosis']);
+const emit = defineEmits(['selectDiagnosis', 'inspectionListRefresh']);
 const total = ref(0);
 const queryParams = ref({});
 const prescriptionList = ref([]);
@@ -2083,6 +2084,21 @@ function getOrgList() {
  });
 }

+/** 诊疗医嘱关联检验申请时 contentJson 含 applyNo */
+function getInspectionApplyNoFromAdviceRow(row) {
+  if (!row || row.adviceType !== 3) {
+    return null;
+  }
+  try {
+    const raw = row.contentJson;
+    const j = raw ? (typeof raw === 'string' ? JSON.parse(raw) : raw) : {};
+    const no = j && j.applyNo != null ? String(j.applyNo).trim() : '';
+    return no || null;
+  } catch (e) {
+    return null;
+  }
+}
+
 function handleDelete() {
  let selectRows = prescriptionRef.value.getSelectionRows();
  console.log('BugFix#219: handleDelete called, selectRows=', selectRows);
@@ -2262,12 +2278,31 @@ function handleDelete() {
  }
  
  if (deleteList.length > 0) {
-    savePrescription({ adviceSaveList: deleteList }).then((res) => {
-      if (res.code == 200) {
-        proxy.$modal.msgSuccess('删除成功');
-        getListInfo(false);
-      }
+    const hasLabLinked = deleteList.some((d) => {
+      const row = normalRows.find((r) => r.requestId === d.requestId);
+      return row && getInspectionApplyNoFromAdviceRow(row);
    });
+    const runApiDelete = () => {
+      savePrescription({ adviceSaveList: deleteList }).then((res) => {
+        if (res.code == 200) {
+          proxy.$modal.msgSuccess('删除成功');
+          getListInfo(false);
+          emit('inspectionListRefresh');
+        }
+      });
+    };
+    if (hasLabLinked) {
+      proxy.$modal
+        .confirm(
+          '删除此医嘱将同时作废关联的检验申请单（检验页签中的同单申请及同单下相关医嘱）。是否继续？',
+          '删除确认',
+          { type: 'warning' }
+        )
+        .then(runApiDelete)
+        .catch(() => {});
+    } else {
+      runApiDelete();
+    }
  } else if (consultationRows.length == 0) {
    proxy.$modal.msgWarning('所选医嘱不可删除，请先撤回后再删除');
    return;
--- a/openhis-ui-vue3/src/views/doctorstation/index.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/index.vue
@@ -138,7 +138,8 @@
          </el-tab-pane>
          <el-tab-pane label="医嘱" name="prescription">
            <prescriptionlist :patientInfo="patientInfo" ref="prescriptionRef" :activeTab="activeTab"
-              :outpatientEmrSaved="outpatientEmrSaved" />
+              :outpatientEmrSaved="outpatientEmrSaved"
+              @inspectionListRefresh="refreshInspectionListFromAdvice" />
          </el-tab-pane>
          <el-tab-pane label="中医" name="tcm">
            <tcmAdvice :patientInfo="patientInfo" ref="tcmRef" />
@@ -312,6 +313,9 @@ const patientDrawerRef = ref();
 const prescriptionRef = ref();
 const tcmRef = ref();
 const inspectionRef = ref();
+function refreshInspectionListFromAdvice() {
+  inspectionRef.value?.getList?.();
+}
 const examinationRef = ref();
 const surgeryRef = ref();
 const emrRef = ref();
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue
@@ -6,9 +6,26 @@
 <template>
  <div class="LaboratoryTests-container">
    <div v-loading="loading" class="transfer-wrapper">
+      <!-- 远程搜索框 -->
+      <div class="search-bar">
+        <el-input
+          v-model="searchKey"
+          placeholder="输入项目代码/名称搜索"
+          clearable
+          @keyup.enter="handleSearch"
+          @clear="handleSearch"
+          style="width: 300px; margin-bottom: 10px"
+        >
+          <template #append>
+            <el-button @click="handleSearch">搜索</el-button>
+          </template>
+        </el-input>
+        <span v-if="!searchKey" class="total-count">共 {{ totalCount }} 项</span>
+        <span v-else class="total-count">搜索到 {{ filteredCount }} 项 / 共 {{ totalCount }} 项</span>
+      </div>
      <el-transfer
        v-model="transferValue"
-        :data="applicationList"
+        :data="transferData"
        filter-placeholder="项目代码/名称"
        filterable
        :titles="['未选择', '已选择']"
@@ -117,7 +134,7 @@
  </div>
 </template>
 <script setup name="LaboratoryTests">
-import {getCurrentInstance, onBeforeMount, onMounted, reactive, watch} from 'vue';
+import {getCurrentInstance, onMounted, reactive, ref, watch, computed} from 'vue';
 import {patientInfo} from '../../../store/patient.js';
 import {getApplicationList, saveInspection} from './api';
 import {getOrgList} from '@/views/doctorstation/components/api.js';
@@ -140,61 +157,85 @@ const findTreeItem = (list, id) => {
 const emits = defineEmits(['submitOk']);
 const props = defineProps({});
 const state = reactive({});
-const applicationListAll = ref();
-const applicationList = ref();
+const applicationListAll = ref([]);
 const loading = ref(false);
-const orgOptions = ref([]); // 科室选项
-const getList = async () => {
+const orgOptions = ref([]);
+const searchKey = ref('');
+const totalCount = ref(0);
+
+// 将已加载的全部数据转为 transfer 组件所需的格式
+const buildTransferData = (records) => {
+  return records.map((item) => {
+    const priceInfo = item.priceList?.[0] || {};
+    const price = priceInfo.price != null ? Number(priceInfo.price).toFixed(2) : '0.00';
+    const unit = item.unitCode_dictText || item.unitCode || '';
+    return {
+      adviceDefinitionId: item.adviceDefinitionId,
+      orgId: item.orgId,
+      label: item.adviceName + ' (￥' + price + '/' + unit + ')',
+      key: item.adviceDefinitionId,
+    };
+  });
+};
+
+// 加载全部数据（不分页，一次性拉取）
+const loadAllData = async () => {
  if (!patientInfo.value?.inHospitalOrgId) {
-    applicationList.value = [];
+    applicationListAll.value = [];
    return;
  }
  loading.value = true;
  try {
-    const allRecords = [];
-    let currentPage = 1;
-    const pageSize = 500;
-
-    // 分页拉取全部数据（后端单页最多500条）
-    while (true) {
-      const res = await getApplicationList({
-        pageSize,
-        pageNo: currentPage,
-        categoryCode: '22',
-        organizationId: patientInfo.value.inHospitalOrgId,
-        adviceTypes: [3], // 1 药品 2 耗材 3 诊疗
-      });
-      if (res.code !== 200) {
-        proxy.$message.error(res.message);
-        applicationList.value = [];
-        return;
-      }
-      const records = res.data?.records || [];
-      allRecords.push(...records);
-      // 当前页不足 pageSize 或已无数据，说明已全部拉取
-      if (records.length < pageSize) break;
-      currentPage++;
-    }
-
-    applicationListAll.value = allRecords;
-    applicationList.value = allRecords.map((item) => {
-      const priceInfo = item.priceList?.[0] || {};
-      const price = priceInfo.price != null ? Number(priceInfo.price).toFixed(2) : '0.00';
-      const unit = item.unitCode_dictText || item.unitCode || '';
-      return {
-        adviceDefinitionId: item.adviceDefinitionId,
-        orgId: item.orgId,
-        label: item.adviceName + ' (￥' + price + '/' + unit + ')',
-        key: item.adviceDefinitionId,
-      };
+    // 使用大 pageSize 一次性拉取所有启用状态的检验类诊疗项目
+    const res = await getApplicationList({
+      pageSize: 9999,
+      pageNo: 1,
+      categoryCode: '22',
+      organizationId: patientInfo.value.inHospitalOrgId,
+      adviceTypes: [3], // 1 药品 2 耗材 3 诊疗
    });
+    if (res.code !== 200) {
+      proxy.$message.error(res.message);
+      applicationListAll.value = [];
+      return;
+    }
+    applicationListAll.value = res.data?.records || [];
+    totalCount.value = res.data?.total || 0;
  } catch (e) {
    proxy.$message.error('获取检验项目列表失败');
-    applicationList.value = [];
+    applicationListAll.value = [];
  } finally {
    loading.value = false;
  }
 };
+
+// 根据搜索关键词过滤数据
+const filterData = (key) => {
+  if (!key || key.trim() === '') {
+    return applicationListAll.value;
+  }
+  const lowerKey = key.toLowerCase().trim();
+  return applicationListAll.value.filter((item) => {
+    return (
+      item.adviceName?.toLowerCase().includes(lowerKey) ||
+      item.pyStr?.toLowerCase().includes(lowerKey) ||
+      item.adviceBusNo?.toLowerCase().includes(lowerKey)
+    );
+  });
+};
+
+// transfer 组件实际显示的数据（受搜索词影响）
+const transferData = computed(() => buildTransferData(filterData(searchKey.value)));
+// 当前显示的条数
+const filteredCount = computed(() => filterData(searchKey.value).length);
+
+const getList = async () => {
+  await loadAllData();
+};
+
+const handleSearch = () => {
+  // 搜索时保持已选中的项目不受影响
+};
 const transferValue = ref([]);
 const form = reactive({
  // categoryType: '', // 项目类别
@@ -212,7 +253,6 @@ const form = reactive({
  otherDiagnosisList: [], //其他断目录
 });
 const rules = reactive({});
-onBeforeMount(() => {});
 onMounted(() => {
  getList();
 });
@@ -225,12 +265,22 @@ const projectWithDepartment = (selectProjectIds, type) => {
  let isRelease = true;
  // 选中项目的数组
  const arr = [];
-  // 根据选中的项目id查找对应的项目
+  // 根据选中的项目id查找对应的项目（从全部原始数据中查找）
  selectProjectIds.forEach((element) => {
-    const searchData = applicationList.value.find((item) => {
+    const searchData = applicationListAll.value.find((item) => {
      return element == item.adviceDefinitionId;
    });
-    arr.push(searchData);
+    if (searchData) {
+      const priceInfo = searchData.priceList?.[0] || {};
+      const price = priceInfo.price != null ? Number(priceInfo.price).toFixed(2) : '0.00';
+      const unit = searchData.unitCode_dictText || searchData.unitCode || '';
+      arr.push({
+        adviceDefinitionId: searchData.adviceDefinitionId,
+        orgId: searchData.orgId,
+        label: searchData.adviceName + ' (￥' + price + '/' + unit + ')',
+        key: searchData.adviceDefinitionId,
+      });
+    }
  });
  // 保存用户手动选择的发往科室（提交时需要保留）
  const manualDept = type === 2 ? form.targetDepartment : '';
@@ -321,7 +371,7 @@ const submit = () => {
  saveInspection(params).then((res) => {
    if (res.code === 200) {
      proxy.$message.success(res.msg);
-      applicationList.value = [];
+      transferValue.value = [];
      emits('submitOk');
    } else {
      proxy.$message.error(res.message);
@@ -378,6 +428,19 @@ defineExpose({ state, submit, getLocationInfo, getDiagnosisList, getList });
  .transfer-wrapper {
    position: relative;
    min-height: 300px;
+
+    .search-bar {
+      display: flex;
+      align-items: center;
+      gap: 12px;
+      margin-bottom: 8px;
+
+      .total-count {
+        font-size: 13px;
+        color: #909399;
+        white-space: nowrap;
+      }
+    }
  }

  .el-transfer {
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue
@@ -5,36 +5,25 @@
 -->
 <template>
  <div class="medicalExaminations-container">
-    <!-- 顶部标题栏 -->
-    <div class="form-header">
-      <div class="header-left">
-        <el-icon class="header-icon"><Files /></el-icon>
-        <span class="header-title">检查申请单</span>
-      </div>
-      <div class="header-right">
-        <span class="urgency-label">紧急程度</span>
-        <el-radio-group v-model="form.urgencyLevel" @change="handleUrgencyChange" class="urgency-radio-group">
+    <!-- 主体内容 -->
+    <div class="form-body">
+      <!-- 右上角：紧急程度 -->
+      <div class="urgency-bar">
+        <span class="urgency-bar-label">紧急程度：</span>
+        <el-radio-group v-model="form.urgencyLevel" @change="handleUrgencyChange" size="small">
          <el-radio-button label="routine">普通</el-radio-button>
          <el-radio-button label="emergency">急诊</el-radio-button>
        </el-radio-group>
        <transition name="el-fade-in-linear">
-          <span v-if="form.urgencyLevel === 'emergency'" class="emergency-tip">
+          <span v-if="form.urgencyLevel === 'emergency'" class="emergency-tip-inline">
            <el-icon><WarningFilled /></el-icon>
-            急诊单将进入绿色通道
+            绿色通道
          </span>
        </transition>
      </div>
-    </div>
-
-    <!-- 主体内容区 -->
-    <div class="form-body">
      <!-- 选择检查项目 -->
      <div class="section-card">
-        <div class="section-header">
-          <el-icon><Document /></el-icon>
-          <span>选择检查项目</span>
-        </div>
-        <div v-loading="loading" class="transfer-wrapper">
+        <div class="transfer-wrapper">
          <el-transfer
            v-model="transferValue"
            :data="applicationList"
@@ -45,165 +34,150 @@
        </div>
      </div>

-      <!-- 申请信息 -->
-      <div class="section-card">
-        <div class="section-header">
-          <el-icon><EditPen /></el-icon>
-          <span>申请信息</span>
-        </div>
+      <el-form :model="form" :rules="rules" ref="formRef" label-position="top" class="info-form">
+        <!-- 第一行：发往科室 + 紧急程度 + 期望检查时间 -->
+        <el-row :gutter="16">
+          <el-col :span="8">
+            <el-form-item label="发往科室" prop="targetDepartment">
+              <el-tree-select
+                clearable
+                style="width: 100%"
+                v-model="form.targetDepartment"
+                filterable
+                :data="orgOptions"
+                :props="{ value: 'id', label: 'name', children: 'children' }"
+                value-key="id"
+                check-strictly
+                placeholder="请选择执行科室"
+              />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="期望检查时间">
+              <el-date-picker
+                v-model="form.expectedExaminationTime"
+                type="datetime"
+                placeholder="默认当前时间"
+                style="width: 100%"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                format="YYYY-MM-DD HH:mm"
+                :disabled-date="disabledFutureDate"
+                :default-value="new Date()"
+              />
+            </el-form-item>
+          </el-col>
+        </el-row>

-          <el-form :model="form" :rules="rules" ref="formRef" label-position="top" class="info-form">
-            <!-- 第一行：发往科室 + 期望检查时间 -->
-            <el-row :gutter="16">
-              <el-col :span="12">
-                <el-form-item label="发往科室" prop="targetDepartment">
-                  <el-tree-select
-                    clearable
-                    style="width: 100%"
-                    v-model="form.targetDepartment"
-                    filterable
-                    :data="orgOptions"
-                    :props="{ value: 'id', label: 'name', children: 'children' }"
-                    value-key="id"
-                    check-strictly
-                    placeholder="请选择执行科室"
-                  />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="期望检查时间">
-                  <el-date-picker
-                    v-model="form.expectedExaminationTime"
-                    type="datetime"
-                    placeholder="默认当前时间"
-                    style="width: 100%"
-                    value-format="YYYY-MM-DD HH:mm:ss"
-                    format="YYYY-MM-DD HH:mm"
-                    :disabled-date="disabledFutureDate"
-                    :default-value="new Date()"
-                  />
-                </el-form-item>
-              </el-col>
-            </el-row>
+        <!-- 第二行：症状 + 体征 -->
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="症状">
+              <el-input v-model="form.symptom" autocomplete="off" type="textarea" :rows="2" placeholder="请输入患者症状" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="体征">
+              <el-input v-model="form.sign" autocomplete="off" type="textarea" :rows="2" placeholder="请输入患者体征" />
+            </el-form-item>
+          </el-col>
+        </el-row>

-            <!-- 第二行：症状 + 体征 -->
-            <el-row :gutter="16">
-              <el-col :span="12">
-                <el-form-item label="症状">
-                  <el-input v-model="form.symptom" autocomplete="off" type="textarea" :rows="2" placeholder="请输入患者症状" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="体征">
-                  <el-input v-model="form.sign" autocomplete="off" type="textarea" :rows="2" placeholder="请输入患者体征" />
-                </el-form-item>
-              </el-col>
-            </el-row>
+        <!-- 第三行：临床诊断 + 其他诊断 -->
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="临床诊断">
+              <el-input disabled v-model="form.clinicalDiagnosis" placeholder="自动带入主诊断" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="其他诊断">
+              <el-input disabled v-model="form.otherDiagnosis" placeholder="自动带入其他诊断" />
+            </el-form-item>
+          </el-col>
+        </el-row>

-            <!-- 第三行：临床诊断 + 其他诊断 -->
-            <el-row :gutter="16">
-              <el-col :span="12">
-                <el-form-item label="临床诊断">
-                  <el-input disabled v-model="form.clinicalDiagnosis" placeholder="自动带入主诊断" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="其他诊断">
-                  <el-input disabled v-model="form.otherDiagnosis" placeholder="自动带入其他诊断" />
-                </el-form-item>
-              </el-col>
-            </el-row>
+        <!-- 第四行：相关结果 + 注意事项 -->
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="相关结果">
+              <el-input v-model="form.relatedResult" autocomplete="off" type="textarea" :rows="2" placeholder="请输入相关检验结果" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="注意事项">
+              <el-input v-model="form.attention" autocomplete="off" type="textarea" :rows="2" placeholder="请输入检查注意事项" />
+            </el-form-item>
+          </el-col>
+        </el-row>

-            <!-- 第四行：相关结果 + 注意事项 -->
-            <el-row :gutter="16">
-              <el-col :span="12">
-                <el-form-item label="相关结果">
-                  <el-input v-model="form.relatedResult" autocomplete="off" type="textarea" :rows="2" placeholder="请输入相关检验结果" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="注意事项">
-                  <el-input v-model="form.attention" autocomplete="off" type="textarea" :rows="2" placeholder="请输入检查注意事项" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </el-form>
-
-        <!-- 过敏史卡片 -->
-        <div class="section-card allergy-card">
-          <div class="section-header">
-            <el-icon><Warning /></el-icon>
-            <span>过敏史</span>
-            <span v-if="form.allergyHistory" class="header-count">{{ form.allergyHistory.length }}字</span>
-          </div>
-          <div class="allergy-content">
-            <div class="allergy-input-row">
+        <!-- 第五行：检查目的 + 病史摘要 -->
+        <el-row :gutter="16">
+          <el-col :span="12">
+            <el-form-item label="检查目的" prop="examinationPurpose">
              <el-input
-                v-model="form.allergyHistory"
+                v-model="form.examinationPurpose"
                autocomplete="off"
                type="textarea"
                :rows="2"
-                :class="{ 'allergy-danger': isSevereAllergy }"
-                placeholder="如：造影剂过敏史等（系统将自动从患者档案带入）"
+                maxlength="200"
+                show-word-limit
+                placeholder="请输入检查目的，如：明确诊断、术后复查、疗效评估等"
              />
-              <span v-if="isSevereAllergy" class="allergy-severe-tag">
-                <el-icon><WarningFilled /></el-icon>
-                严重过敏
-              </span>
-            </div>
-            <div class="allergy-confirm">
-              <el-checkbox v-model="form.allergyConfirmed" size="small">
-                已通过口头询问确认无过敏史
-              </el-checkbox>
-            </div>
-          </div>
-        </div>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="病史摘要" prop="medicalHistorySummary">
+              <div class="history-field-wrapper">
+                <el-input
+                  v-model="form.medicalHistorySummary"
+                  autocomplete="off"
+                  type="textarea"
+                  :rows="2"
+                  placeholder="请简要描述患者病史摘要"
+                />
+                <el-button
+                  type="primary"
+                  plain
+                  size="small"
+                  class="history-sync-btn"
+                  @click="handleSyncHistory"
+                  :loading="syncingHistory"
+                >
+                  <el-icon><Refresh /></el-icon>
+                  同步
+                </el-button>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>

-        <!-- 检查目的卡片 -->
-        <div class="section-card purpose-card">
-          <div class="section-header">
-            <el-icon><Aim /></el-icon>
-            <span>检查目的</span>
-            <span class="required-mark">必填</span>
-          </div>
-          <el-input
-            v-model="form.examinationPurpose"
-            autocomplete="off"
-            type="textarea"
-            :rows="2"
-            maxlength="200"
-            show-word-limit
-            placeholder="请输入检查目的，如：明确诊断、术后复查、疗效评估等"
-          />
-        </div>
-
-        <!-- 病史摘要卡片 -->
-        <div class="section-card history-card">
-          <div class="section-header">
-            <el-icon><DocumentCopy /></el-icon>
-            <span>病史摘要</span>
-            <span class="required-mark">必填</span>
-            <el-button
-              type="primary"
-              plain
-              size="small"
-              class="sync-btn"
-              @click="handleSyncHistory"
-              :loading="syncingHistory"
-            >
-              <el-icon><Refresh /></el-icon>
-              同步现病史/体征
-            </el-button>
-          </div>
-          <el-input
-            v-model="form.medicalHistorySummary"
-            autocomplete="off"
-            type="textarea"
-            :rows="3"
-            placeholder="请简要描述患者病史摘要"
-          />
-        </div>
-      </div>
+        <!-- 第六行：过敏史 -->
+        <el-row :gutter="16">
+          <el-col :span="24">
+            <el-form-item label="过敏史">
+              <div class="allergy-wrapper">
+                <el-input
+                  v-model="form.allergyHistory"
+                  autocomplete="off"
+                  type="textarea"
+                  :rows="1"
+                  :class="{ 'allergy-danger': isSevereAllergy }"
+                  placeholder="如：造影剂过敏史等（系统将自动从患者档案带入）"
+                />
+                <div class="allergy-actions">
+                  <span v-if="isSevereAllergy" class="allergy-severe-tag-inline">
+                    <el-icon><WarningFilled /></el-icon>
+                    严重过敏
+                  </span>
+                  <el-checkbox v-model="form.allergyConfirmed" size="small">
+                    已通过口头询问确认无过敏史
+                  </el-checkbox>
+                </div>
+              </div>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
    </div>

    <!-- 急诊确认弹窗 -->
@@ -228,6 +202,7 @@

 <script setup name="MedicalExaminations">
 import {getCurrentInstance, onMounted, reactive, ref, watch, computed, nextTick} from 'vue';
+import dayjs from 'dayjs';
 import {patientInfo} from '../../../store/patient.js';
 import {getDepartmentList} from '@/api/public.js';
 import {getEncounterDiagnosis} from '../../api.js';
@@ -355,7 +330,7 @@ const form = reactive({
  allergyHistory: '',
  examinationPurpose: '',
  medicalHistorySummary: '',
-  expectedExaminationTime: '',
+  expectedExaminationTime: dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss'),
  symptom: '',
  sign: '',
  clinicalDiagnosis: '',
@@ -622,7 +597,7 @@ const resetForm = () => {
  form.allergyHistory = '';
  form.examinationPurpose = '';
  form.medicalHistorySummary = '';
-  form.expectedExaminationTime = '';
+  form.expectedExaminationTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
  form.symptom = '';
  form.sign = '';
  form.clinicalDiagnosis = '';
@@ -705,81 +680,13 @@ $bg-color: #f5f7fa;
  background: $bg-color;
  font-family: -apple-system, BlinkMacSystemFont, 'PingFang SC', 'Hiragino Sans GB', 'Microsoft YaHei', sans-serif;

-  // 顶部标题栏
-  .form-header {
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    padding: 14px 20px;
-    background: linear-gradient(135deg, #fff 0%, #f0f7ff 100%);
-    border-bottom: 1px solid $border-color;
-
-    .header-left {
-      display: flex;
-      align-items: center;
-      gap: 10px;
-
-      .header-icon {
-        font-size: 24px;
-        color: $primary-color;
-      }
-
-      .header-title {
-        font-size: 18px;
-        font-weight: 600;
-        color: $text-primary;
-        letter-spacing: 1px;
-      }
-    }
-
-    .header-right {
-      display: flex;
-      align-items: center;
-      gap: 12px;
-
-      .urgency-label {
-        font-size: 13px;
-        color: $text-secondary;
-        font-weight: 500;
-      }
-
-      .urgency-radio-group {
-        :deep(.el-radio-button__inner) {
-          border-radius: 4px;
-          margin: 0;
-        }
-
-        :deep(.el-radio-button:first-child .el-radio-button__inner) {
-          border-radius: 4px;
-        }
-
-        :deep(.el-radio-button:last-child .el-radio-button__inner) {
-          border-radius: 4px;
-        }
-      }
-
-      .emergency-tip {
-        display: flex;
-        align-items: center;
-        gap: 4px;
-        color: $danger-color;
-        font-size: 13px;
-        font-weight: 500;
-        background: #fef0f0;
-        padding: 4px 10px;
-        border-radius: 4px;
-        border: 1px solid #fde2e2;
-      }
-    }
-  }
-
-  // 主体内容区
+  // 主体内容区 - 紧凑布局
  .form-body {
    flex: 1;
    display: flex;
    flex-direction: column;
-    gap: 12px;
-    padding: 16px;
+    gap: 8px;
+    padding: 8px 12px;
    overflow-y: auto;

    &::-webkit-scrollbar {
@@ -796,47 +703,30 @@ $bg-color: #f5f7fa;
    }
  }

-  // 卡片通用样式
+  // 紧急程度栏 - 右上角
+  .urgency-bar {
+    display: flex;
+    align-items: center;
+    justify-content: flex-end;
+    gap: 8px;
+    padding: 4px 0;
+    margin-bottom: 4px;
+  }
+
+  .urgency-bar-label {
+    font-size: 13px;
+    font-weight: 500;
+    color: $text-regular;
+    white-space: nowrap;
+  }
+
+  // 卡片通用样式 - 紧凑
  .section-card {
    background: #fff;
-    border-radius: 8px;
-    padding: 16px;
-    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06);
-    border: 1px solid rgba(0, 0, 0, 0.04);
-
-    .section-header {
-      display: flex;
-      align-items: center;
-      gap: 8px;
-      padding-bottom: 12px;
-      margin-bottom: 12px;
-      border-bottom: 1px dashed $border-color;
-      font-size: 14px;
-      font-weight: 600;
-      color: $text-primary;
-
-      > i {
-        font-size: 16px;
-        color: $primary-color;
-      }
-
-      .header-count {
-        margin-left: auto;
-        font-size: 12px;
-        font-weight: 400;
-        color: $text-secondary;
-      }
-
-      .required-mark {
-        font-size: 12px;
-        font-weight: 500;
-        color: #fff;
-        background: $danger-color;
-        padding: 2px 8px;
-        border-radius: 10px;
-        margin-left: 4px;
-      }
-    }
+    border-radius: 6px;
+    padding: 8px;
+    border: 1px solid #e4e7ed;
+    margin-bottom: 4px;
  }

  .transfer-wrapper {
@@ -850,10 +740,23 @@ $bg-color: #f5f7fa;
    display: flex !important;
    flex-direction: row !important;
  }
-  // 信息表单
+
+  // 穿梭框按钮垂直居中
+  :deep(.el-transfer__buttons) {
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+    padding: 0 4px;
+  }
+
+  :deep(.el-transfer__button) {
+    margin: 4px 0;
+  }
+  // 信息表单 - 紧凑
  .info-form {
    :deep(.el-form-item) {
-      margin-bottom: 14px;
+      margin-bottom: 6px;

      .el-form-item__label {
        font-size: 13px;
@@ -883,53 +786,10 @@ $bg-color: #f5f7fa;
    }
  }

-  // 过敏史卡片
-  .allergy-card {
-    .allergy-content {
-      .allergy-input-row {
-        position: relative;
-
-        :deep(.el-textarea) {
-          .el-textarea__inner.allergy-danger {
-            border-color: $danger-color !important;
-            background-color: #fef0f0;
-          }
-        }
-      }
-
-      .allergy-severe-tag {
-        position: absolute;
-        right: 12px;
-        top: 8px;
-        display: flex;
-        align-items: center;
-        gap: 4px;
-        color: $danger-color;
-        font-size: 13px;
-        font-weight: 600;
-        background: #fef0f0;
-        padding: 3px 10px;
-        border-radius: 12px;
-        border: 1px solid #fde2e2;
-      }
-
-      .allergy-confirm {
-        margin-top: 10px;
-        padding-left: 4px;
-      }
-    }
-  }
-
-  // 病史摘要卡片
-  .history-card {
-    .section-header {
-      .sync-btn {
-        margin-left: auto;
-        font-size: 12px;
-        padding: 6px 12px;
-        border-radius: 16px;
-      }
-    }
+  // 过敏史危险输入样式
+  :deep(.el-textarea__inner.allergy-danger) {
+    border-color: $danger-color !important;
+    background-color: #fef0f0;
  }

  // 急诊确认弹窗
@@ -968,4 +828,64 @@ $bg-color: #f5f7fa;
 .fade-in-linear-leave-to {
  opacity: 0;
 }
+
+/* 紧急程度行内布局 */
+.urgency-inline {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+  width: 100%;
+}
+
+.emergency-tip-inline {
+  display: inline-flex;
+  align-items: center;
+  gap: 2px;
+  color: $danger-color;
+  font-size: 11px;
+  font-weight: 500;
+  background: #fef0f0;
+  padding: 2px 6px;
+  border-radius: 3px;
+  white-space: nowrap;
+}
+
+/* 过敏史包装 */
+.allergy-wrapper {
+  width: 100%;
+}
+
+.allergy-actions {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  margin-top: 4px;
+}
+
+.allergy-severe-tag-inline {
+  display: inline-flex;
+  align-items: center;
+  gap: 2px;
+  color: $danger-color;
+  font-size: 11px;
+  font-weight: 600;
+  background: #fef0f0;
+  padding: 2px 8px;
+  border-radius: 3px;
+}
+
+/* 病史摘要同步按钮 */
+.history-field-wrapper {
+  position: relative;
+  width: 100%;
+}
+
+.history-sync-btn {
+  position: absolute;
+  right: 4px;
+  top: -28px;
+  font-size: 11px;
+  padding: 2px 8px;
+  height: 24px;
+}
 </style>
--- a/openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/components/list.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/components/list.vue
@@ -61,7 +61,11 @@ const props = defineProps({
    type: String,
    default: '',
  },
-
+  /** 表头所选出库仓库：传入后药品列表只含该仓有库存的行，避免选到别仓批号导致 inventory-item-info 一直为 0 */
+  orgLocationId: {
+    type: [String, Number],
+    default: undefined,
+  },
 });
 const emit = defineEmits(['selectRow']);
 const queryParams = ref({
@@ -89,11 +93,14 @@ watch(
    queryParams.value.searchKey = newValue.searchKey;
    queryParams.value.itemType = newValue.itemType;
    queryParams.value.purchaseFlag = 0;
-    // queryParams.value.sourceLocationId = newValue.sourceLocationId;
-    // queryParams.value.purposeLocationId = newValue.purposeLocationId;
+    if (newValue.orgLocationId != null && newValue.orgLocationId !== '') {
+      queryParams.value.orgLocationId = newValue.orgLocationId;
+    } else {
+      delete queryParams.value.orgLocationId;
+    }
    throttledGetList();
  },
-  { immdiate: true, deep: true }
+  { immediate: true, deep: true }
 );

 getList();
--- a/openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagement/index.vue
+++ b/openhis-ui-vue3/src/views/medicationmanagement/requisitionManagement/requisitionManagement/index.vue
@@ -133,6 +133,7 @@
          filterable
          style="width: 200px"
          :disabled="data.isEdit"
+          @change="onHeaderWarehouseChange"
        >
          <el-option
            v-for="item in purposeTypeListOptions"
@@ -222,6 +223,7 @@
                        @selectRow="(row) => selectRow(row, scope.$index)"
                        :searchKey="medicineSearchKey"
                        :itemType="itemType"
+                        :orgLocationId="receiptHeaderForm.headerLocationId"
                      />
                    </template>
                  </PopoverList>
@@ -483,6 +485,46 @@ import {useStore} from '@/store/store';
 import useTagsViewStore from '@/store/modules/tagsView';
 import TraceNoDialog from '@/components/OpenHis/TraceNoDialog/index.vue'

+/** 领用保存 IssueDto：后端 Jackson 只认 yyyy-MM-dd HH:mm:ss；库存接口可能回传 2025/4/2 00:00:00 等 */
+function toIssueDateTimeStr(val) {
+  if (val == null || val === '') return undefined;
+  if (typeof val === 'string') {
+    const s = val.trim();
+    if (/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/.test(s)) return s;
+    if (/^\d{4}-\d{2}-\d{2}$/.test(s)) return `${s} 00:00:00`;
+  }
+  const d = val instanceof Date ? val : new Date(val);
+  if (Number.isNaN(d.getTime())) return undefined;
+  return formatDate(d);
+}
+
+/** 总库存 totalQuantity 为最小单位；领用数量按当前计量单位折算成最小单位后再比较 */
+function getRequisitionQtyInMinUnit(r) {
+  const q = Number(r.itemQuantity ?? 0);
+  if (!Number.isFinite(q) || q < 0) return NaN;
+  const minCode = r.unitList?.minUnitCode;
+  if (!minCode || r.unitCode === minCode) return q;
+  const part = Number(r.partPercent ?? 1);
+  return q * part;
+}
+
+function validateRequisitionQtyVsStock(r, lineNo) {
+  const cap = Number(r.totalQuantity ?? 0);
+  const reqMin = getRequisitionQtyInMinUnit(r);
+  if (!Number.isFinite(reqMin)) {
+    return `第${lineNo}行：领用数量请输入有效数字`;
+  }
+  if (cap > 0 && reqMin > cap + 1e-9) {
+    const name = r.name || `第${lineNo}行`;
+    return `${name}：领用数量（折合最小单位）不能超过当前仓库可领库存 ${cap}，请修改后再保存。`;
+  }
+  if (cap <= 0 && reqMin > 0) {
+    const name = r.name || `第${lineNo}行`;
+    return `${name}：当前仓库可领库存为 0，不能填写正数领用数量。`;
+  }
+  return null;
+}
+
 const tagsViewStore = useTagsViewStore();
 const store = useStore();

@@ -568,6 +610,8 @@ const data = reactive({
    medicationType: [{ required: true, message: '请选择药品类型', trigger: 'change' }],
    locationId: [{ required: true, message: '请选择领用部门', trigger: 'change' }],
    practitionerId: [{ required: true, message: '请选择部门经手人', trigger: 'change' }],
+    // 领用出库按「表头仓库」查 /app-common/inventory-item-info，未选仓库会查不到库存并误报「仓库数量为0」
+    headerLocationId: [{ required: true, message: '请先选择仓库（按仓库查询可领用库存）', trigger: 'change' }],
  },
  tableRules: {
    name: [{ required: true, message: '项目不能为空', trigger: 'change' }],
@@ -988,10 +1032,9 @@ function selectRow(rowValue, index) {
  form.purchaseinventoryList[index].unitList = rowValue.unitList[0];
  form.purchaseinventoryList[index].lotNumber = rowValue.lotNumber;
  form.purchaseinventoryList[index].ybNo = rowValue.ybNo;
-  // #439 fix: 不清空sourceLocationId，保留handleAddRow设置的仓库ID
-  if (!form.purchaseinventoryList[index].sourceLocationId) {
-    form.purchaseinventoryList[index].sourceLocationId = receiptHeaderForm.headerLocationId || '';
-  }
+  // 出库仓库：优先表头当前所选仓库（避免先选药后选仓时行上一直为空）
+  form.purchaseinventoryList[index].sourceLocationId =
+    receiptHeaderForm.headerLocationId || form.purchaseinventoryList[index].sourceLocationId || '';
  getPharmacyCabinetList().then((res) => {
    purposeTypeListOptions.value = res.data;
    handleLocationClick(1, rowValue, index)
@@ -1004,7 +1047,30 @@ function selectRow(rowValue, index) {
  });
 }

-// 选择仓库
+/** 多条库存记录时取可领数量最大的一条（避免仅取 res.data[0] 恰好为 0） */
+function pickBestOrgQuantityRow(list) {
+  if (!Array.isArray(list) || list.length === 0) return null;
+  return list.reduce((best, cur) => {
+    const cq = Number(cur?.orgQuantity ?? 0);
+    const bq = Number(best?.orgQuantity ?? 0);
+    return cq > bq ? cur : best;
+  });
+}
+
+/** 表头「仓库」变化：同步每行 sourceLocationId 并重新拉库存（修复先选药品后选仓库行上仍无仓库 ID） */
+function onHeaderWarehouseChange() {
+  const hid = receiptHeaderForm.headerLocationId;
+  form.purchaseinventoryList.forEach((r) => {
+    r.sourceLocationId = hid || '';
+  });
+  form.purchaseinventoryList.forEach((r, idx) => {
+    if (hid && r.itemId) {
+      handleLocationClick(1, {}, idx);
+    }
+  });
+}
+
+// 选择仓库 / 选药品后拉取该仓库存
 function handleLocationClick(item, row, index) {
  getCount({
    itemId: form.purchaseinventoryList[index].itemId,
@@ -1013,67 +1079,100 @@ function handleLocationClick(item, row, index) {
    if (res.data && res.data.length > 0) {
      form.purchaseinventoryList[index].itemTable = res.data[0].itemTable || '';
      form.purchaseinventoryList[index].totalQuantity = res.data[0].orgQuantity || 0;
+  const r = form.purchaseinventoryList[index];
+  let orgLocationId = r.sourceLocationId || receiptHeaderForm.headerLocationId || '';
+  if (!orgLocationId) {
+    proxy.$message.warning('请先在表头选择「仓库」。库存按仓库维度查询，未选仓库无法匹配您看到的总库存。');
+    r.totalQuantity = 0;
+    r.price = 0;
+    return;
+  }
+  if (!r.sourceLocationId) {
+    r.sourceLocationId = orgLocationId;
+  }

-      if (res.data[0].price) {
-        form.purchaseinventoryList[index].price = res.data[0].price.toFixed(4);
-      } else {
-        form.purchaseinventoryList[index].price = 0;
-      }
-      // 获取供应商id
-      form.purchaseinventoryList[index].supplierId = res.data[0].supplierId || '';
-      // 生产日期
-      form.purchaseinventoryList[index].startTime = res.data[0].productionDate;
-      // 有效期
-      form.purchaseinventoryList[index].endTime = res.data[0].expirationDate;
-      form.purchaseinventoryList[index].unitCode =
-        form.purchaseinventoryList[index].unitList.minUnitCode;
-      form.purchaseinventoryList[index].unitCode_dictText =
-        form.purchaseinventoryList[index].unitList.minUnitCode_dictText;
-      // 单价   大单位单价
-      console.log(
-        form.purchaseinventoryList[index].unitCode ==
-          form.purchaseinventoryList[index].unitList.minUnitCode,
-        1212121
-      );
-      if (
-        form.purchaseinventoryList[index].unitCode ==
-        form.purchaseinventoryList[index].unitList.minUnitCode
-      ) {
-        form.purchaseinventoryList[index].price =
-          res.data[0].price / form.purchaseinventoryList[index].partPercent || '';
-        form.purchaseinventoryList[index].price =
-          form.purchaseinventoryList[index].price.toFixed(4);
-        // parseFloat(form.purchaseinventoryList[index].price.toFixed(4))
-      } else {
-        console.log(
-          form.purchaseinventoryList[index].price > 1,
-          1212,
-          form.purchaseinventoryList[index].price
-        );
-        if (form.purchaseinventoryList[index].price > 1) {
-          form.purchaseinventoryList[index].price =
-            form.purchaseinventoryList[index].price.toFixed(4);
+  const lotTrimmed =
+    r.lotNumber != null && String(r.lotNumber).trim() !== '' ? String(r.lotNumber).trim() : null;
+
+  const runGet = (withLot) => {
+    const params = { itemId: r.itemId, orgLocationId };
+    if (withLot && lotTrimmed) {
+      params.lotNumber = lotTrimmed;
+    }
+    return getCount(params);
+  };
+
+  const applyFromDto = (d, syncLotFromPick) => {
+    if (syncLotFromPick && d.lotNumber != null && d.lotNumber !== '') {
+      r.lotNumber = d.lotNumber;
+    }
+    r.itemTable = d.itemTable || '';
+    r.totalQuantity = d.orgQuantity || 0;
+    if (d.price) {
+      r.price = d.price.toFixed(4);
+    } else {
+      r.price = 0;
+    }
+    r.supplierId = d.supplierId || '';
+    r.startTime = toIssueDateTimeStr(d.productionDate) || '';
+    r.endTime = toIssueDateTimeStr(d.expirationDate) || '';
+    r.unitCode = r.unitList.minUnitCode;
+    r.unitCode_dictText = r.unitList.minUnitCode_dictText;
+    if (r.unitCode == r.unitList.minUnitCode) {
+      r.price = d.price / r.partPercent || '';
+      r.price = r.price.toFixed(4);
+    } else if (r.price > 1) {
+      r.price = r.price.toFixed(4);
+    }
+  };
+
+  const persistStore = () => {
+    store.setCurrentDataLYCK({
+      purchaseinventoryList: form.purchaseinventoryList,
+      receiptHeaderForm: receiptHeaderForm,
+    });
+  };
+
+  runGet(true)
+    .then((res) => {
+      const list = res.data || [];
+      const d = pickBestOrgQuantityRow(list);
+      const strictOk = d && Number(d.orgQuantity ?? 0) > 0;
+      if (strictOk) {
+        applyFromDto(d, false);
+        if (Number(r.totalQuantity) <= 0) {
+          proxy.$message.warning('仓库数量为0，无法调用！');
        }
-      }
-      if (form.purchaseinventoryList[index].totalQuantity == 0) {
-        proxy.$message.warning('仓库数量为0，无法调用！');
+        persistStore();
        return;
      }
-    } else {
-      form.purchaseinventoryList[index].totalQuantity = 0;
-      form.purchaseinventoryList[index].price = 0;
-      // if(form.purchaseinventoryList[index].totalQuantity==0){
+      if (lotTrimmed) {
+        return runGet(false).then((res2) => {
+          const list2 = res2.data || [];
+          const d2 = pickBestOrgQuantityRow(list2);
+          if (d2 && Number(d2.orgQuantity ?? 0) > 0) {
+            applyFromDto(d2, true);
+            proxy.$message.info(
+              '所选批号在本仓库无对应库存或批号不一致，已按仓库实物回显批号与可领数量，请核对。'
+            );
+          } else {
+            r.totalQuantity = 0;
+            r.price = 0;
+            proxy.$message.warning('仓库数量为0，无法调用！');
+          }
+          persistStore();
+        });
+      }
+      r.totalQuantity = 0;
+      r.price = 0;
      proxy.$message.warning('仓库数量为0，无法调用！');
-      // }
-    }
-  }).catch(() => {
-    form.purchaseinventoryList[index].totalQuantity = 0;
-    form.purchaseinventoryList[index].price = 0;
-  });
-  store.setCurrentDataLYCK({
-    purchaseinventoryList: form.purchaseinventoryList,
-    receiptHeaderForm: receiptHeaderForm,
-  });
+      persistStore();
+    })
+    .catch(() => {
+      r.totalQuantity = 0;
+      r.price = 0;
+      persistStore();
+    });
 }
 // 切换仓库类型获取药房/药库列表
 // function handleChangeLocationType(value) {
@@ -1230,20 +1329,19 @@ function getMaxCounts(row, index, counts) {
 }
 // 计算总价
 function handleTotalPrice(index) {
-  form.purchaseinventoryList[index].olditemQuantity =
-    form.purchaseinventoryList[index].itemQuantity * row.partPercent;
-  form.purchaseinventoryList[index].itemMaxQuantity =
-    form.purchaseinventoryList[index].itemQuantity;
-  let purchaseItem = form.purchaseinventoryList[index];
+  const r = form.purchaseinventoryList[index];
+  r.olditemQuantity = r.itemQuantity * (r.partPercent ?? 1);
+  r.itemMaxQuantity = r.itemQuantity;
+  let purchaseItem = r;
  if (purchaseItem.price > 0 && purchaseItem.itemQuantity > 0) {
-    form.purchaseinventoryList[index].totalPrice = purchaseItem.price * purchaseItem.itemQuantity;
-    form.purchaseinventoryList[index].totalPrice =
-      form.purchaseinventoryList[index].totalPrice.toFixed(4);
-    //  parseFloat(form.purchaseinventoryList[index].totalPrice.toFixed(4))
+    r.totalPrice = purchaseItem.price * purchaseItem.itemQuantity;
+    r.totalPrice = r.totalPrice.toFixed(4);
  }
-  if (form.purchaseinventoryList[index].itemQuantity == 0) {
-    form.purchaseinventoryList[index].totalPrice = 0;
+  if (r.itemQuantity == 0) {
+    r.totalPrice = 0;
  }
+  const qtyErr = validateRequisitionQtyVsStock(r, index + 1);
+  r.error = !!qtyErr;
  store.setCurrentDataLYCK({
    purchaseinventoryList: form.purchaseinventoryList,
    receiptHeaderForm: receiptHeaderForm,
@@ -1252,6 +1350,15 @@ function handleTotalPrice(index) {
 // 保存
 function handleSave(row, index) {
  rowList.value = [];
+  for (let i = 0; i < form.purchaseinventoryList.length; i++) {
+    const line = form.purchaseinventoryList[i];
+    if (!line) continue;
+    const err = validateRequisitionQtyVsStock(line, i + 1);
+    if (err) {
+      proxy.$message.warning(err);
+      return;
+    }
+  }
  form.purchaseinventoryList.map((row, index) => {
    if (row) {
      // 触发校验
@@ -1299,7 +1406,13 @@ function handleSave(row, index) {
  });
 }
 function addTransferProducts(rowList) {
-  addTransferProduct(JSON.parse(JSON.stringify(rowList))).then((res) => {
+  const payload = (Array.isArray(rowList) ? rowList : []).map((item) => ({
+    ...item,
+    startTime: toIssueDateTimeStr(item.startTime),
+    endTime: toIssueDateTimeStr(item.endTime),
+    occurrenceTime: toIssueDateTimeStr(item.occurrenceTime) ?? item.occurrenceTime,
+  }));
+  addTransferProduct(JSON.parse(JSON.stringify(payload))).then((res) => {
    // 当前行没有id视为首次新增
    // if (!row.id) {
    //   data.isAdding = false; // 允许新增下一行
--- a/openhis-ui-vue3/src/views/surgicalschedule/index.vue
+++ b/openhis-ui-vue3/src/views/surgicalschedule/index.vue
@@ -966,7 +966,7 @@ const form = reactive({
  allergyRemark: undefined,
  surgeryNature: undefined,
  surgerySite: undefined,
-  incisionLevel: undefined,
+  incisionType: undefined,
  surgeryLevel: undefined,

  admissionTime: undefined,
@@ -2050,7 +2050,12 @@ function resetForm() {
 function submitForm() {
  proxy.$refs['surgeryRef'].validate((valid) => {
    if (valid) {
-      const submitData = { ...form, orgId: userStore.orgId }
+      const submitData = {
+        ...form,
+        orgId: userStore.orgId,
+        incisionLevel: form.incisionType
+      }
+      delete submitData.incisionType
      if (!form.scheduleId) {
        // 新增手术安排
        addSurgerySchedule(submitData).then((res) => {
Author	SHA1	Message	Date
赵云	4c083cc698	Fix Bug #464 : [目录管理-诊疗目录] 新增项目时"零售价"未与"诊疗子项"合计总价自动同步根因：calculateTotalPrice中form.value.retailPrice赋值被nextTick包裹，在多调用方(watcher/selectRow/addItem)并发时产生竞态，导致零售价更新丢失修复：移除nextTick，改为同步赋值确保零售价实时同步总价 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-14 13:03:25 +08:00
Ranyunqiao	6367654ada	476 住院医生工作-检查申请单界面缺失核心临床字段（紧急程度、过敏史、检查目的等）	2026-05-14 12:56:04 +08:00
关羽	360256e589	Fix Bug #465 : [住院医生工作站-检验申请] 检验项目选择列表被限制为500项，导致医生无法检索并开立其余800多项问题根因: - 前端使用 pageSize=500 分页拉取数据，el-transfer 组件客户端过滤在 1400+ 条数据下存在渲染和搜索性能问题 - 数据库实际有 1400 项已启用的检验类诊疗项目，但仅加载了 500 项修复方案: 1. 改用 pageSize=9999 一次性拉取全部数据，消除分页导致的 500 项截断 2. 新增顶部搜索框，支持按项目名称/拼音首拼/业务编号实时过滤 3. 使用 computed 属性动态生成 transfer 组件数据，搜索时自动过滤 4. 显示总数统计（未搜索时显示总数，搜索时显示匹配数/总数） 5. 移除不再需要的 applicationList 变量引用和 onBeforeMount 空调用 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-14 12:23:13 +08:00
荀彧	feb033b857	Fix Bug #462 : [目录管理-诊疗目录] 编辑弹窗中"所需标本"下拉框数据加载失败，显示为"无数据" Fix: selectDictDataByType方法移除Redis缓存读取逻辑，直接查询数据库避免缓存为空数据导致前端下拉框无数据	2026-05-14 12:15:47 +08:00
wangjian963	79cce458ee	Merge remote-tracking branch 'origin/develop' into develop # Conflicts: # openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/dto/OpScheduleDto.java	2026-05-14 12:01:33 +08:00
wangjian963	1140912f3a	Fix Bug #437 : 【门诊手术计费】保存签章TOCTOU竞态致重复提交，且耗材计费项目缺失/重复、手术单号未关联 Fix: 频次总量计算改用字典store动态读取，el-input-number新增@input实时计算	2026-05-14 12:00:18 +08:00
yangkexiang	250f9ce258	Merge remote-tracking branch 'origin/develop' into develop	2026-05-14 11:48:42 +08:00
yangkexiang	0d6f891b47	fix bug434:门诊手术安排：编辑弹窗中“切口类型”字段未正确回显数据 bug426:门诊医生站-检查开立：已选择列表应支持树形展开，显示套餐明细 bug439:领用出库：选择领用药品后“总库存数量”列数据未显示 bug457:门诊收费：已签发的手术类医嘱在门诊收费列表中不显示项目名称	2026-05-14 11:48:22 +08:00