Fix Bug #408 : 门诊医生站检查明细标签页显示暂无数据 - 修复handleRowClick中resp.items被d.data覆盖后丢失的问题

根因：后端 getInfo 返回 { data: ExamApply, items: ExamApplyItem[] }，前端先将 resp 赋值给 d，随后又执行 d = resp.data，导致 d 变成 ExamApply 对象，后续 d.items 永远为 undefined，明细列表无法加载。修复：提前保存 resp.items 到 rawItems 变量，后续使用 rawItems 而非 d.items。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
bug 362 428 436
2026-05-13 13:23:53 +08:00 · 2026-05-13 13:23:53 +08:00 · 2026-05-13 13:23:53 +08:00 · 2026-05-13 13:23:53 +08:00 · 2026-05-13 13:23:53 +08:00 · 2026-05-13 13:23:53 +08:00
27 changed files with 419 additions and 81 deletions
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/basedatamanage/appservice/impl/OrganizationLocationAppServiceImpl.java
@@ -7,6 +7,7 @@ import com.core.common.utils.MessageUtils;
 import com.openhis.administration.domain.Location;
 import com.openhis.administration.domain.Organization;
 import com.openhis.administration.domain.OrganizationLocation;
+import com.openhis.workflow.domain.ActivityDefinition;
 import com.openhis.administration.mapper.OrganizationLocationMapper;
 import com.openhis.administration.service.ILocationService;
 import com.openhis.administration.service.IOrganizationLocationService;
@@ -70,6 +71,7 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation
        // 获取科室下拉选列表
        List<Organization> organizationList = organizationService.getList(OrganizationType.DEPARTMENT.getValue(), null);
        List<OrgLocInitDto.departmentOption> organizationOptions = organizationList.stream()
+            .filter(organization -> organization != null && organization.getName() != null)
            .map(organization -> new OrgLocInitDto.departmentOption(organization.getId(), organization.getName()))
            .collect(Collectors.toList());
        initDto.setLocationFormOptions(chargeItemStatusOptions).setDepartmentOptions(organizationOptions);
@@ -131,12 +133,18 @@ public class OrganizationLocationAppServiceImpl implements IOrganizationLocation
    @Override
    public R<?> addOrEditOrgLoc(OrgLocQueryDto orgLocQueryDto) {

+        // Validate required fields before processing
+        if (orgLocQueryDto.getOrganizationId() == null) {
+            return R.fail("请选择执行科室");
+        }
+
        OrganizationLocation orgLoc = new OrganizationLocation();
        BeanUtils.copyProperties(orgLocQueryDto, orgLoc);

        Long activityDefinitionId = orgLoc.getActivityDefinitionId();
-        String activityName = activityDefinitionId != null
-            ? activityDefinitionMapper.selectById(activityDefinitionId).getName() : "";
+        ActivityDefinition activityDef = activityDefinitionId != null
+            ? activityDefinitionMapper.selectById(activityDefinitionId) : null;
+        String activityName = activityDef != null ? activityDef.getName() : "";

        List<OrganizationLocation> organizationLocationList =
            organizationLocationService.getOrgLocListByOrgIdAndActivityDefinitionId(orgLoc.getActivityDefinitionId());
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/controller/SurgicalScheduleController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/controller/SurgicalScheduleController.java
@@ -2,9 +2,13 @@ package com.openhis.web.clinicalmanage.controller;

 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
+import com.openhis.common.enums.ActivityDefCategory;
 import com.openhis.web.clinicalmanage.appservice.ISurgicalScheduleAppService;
 import com.openhis.web.clinicalmanage.dto.OpCreateScheduleDto;
 import com.openhis.web.clinicalmanage.dto.OpScheduleDto;
+import com.openhis.web.regdoctorstation.appservice.IRequestFormManageAppService;
+import com.openhis.web.regdoctorstation.dto.RequestFormDto;
+import com.openhis.web.regdoctorstation.dto.RequestFormPageDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -26,6 +30,7 @@ import java.util.Map;
 public class SurgicalScheduleController {

    private final ISurgicalScheduleAppService surgicalScheduleAppService;
+    private final IRequestFormManageAppService requestFormManageAppService;

    /**
     * 分页查询手术安排列表
@@ -87,6 +92,27 @@ public class SurgicalScheduleController {
        return surgicalScheduleAppService.deleteSurgerySchedule(scheduleId);
    }

+    /**
+     * 分页查询待排期手术申请列表
+     *
+     * @param requestFormDto 查询条件
+     * @return 手术申请列表
+     */
+    @PostMapping(value = "/apply-list")
+    public R<IPage<RequestFormPageDto>> getSurgeryApplyList(@RequestBody RequestFormDto requestFormDto) {
+        if (requestFormDto.getPageNo() == null) {
+            requestFormDto.setPageNo(1);
+        }
+        if (requestFormDto.getPageSize() == null) {
+            requestFormDto.setPageSize(10);
+        }
+        //虽然很想这么写，但是库里的手术申请单的type_code都是直接写的SURGERY
+//        requestFormDto.setTypeCode(ActivityDefCategory.PROCEDURE.getCode());
+        //只查询手术申请单
+        requestFormDto.setTypeCode("SURGERY");
+        return R.ok(requestFormManageAppService.getRequestFormPage(requestFormDto));
+    }
+
    /**
     * 导出手术安排列表
     *
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java
@@ -59,6 +59,16 @@ public interface IDoctorStationAdviceAppService {
     */
    R<?> getRequestBaseInfo(Long encounterId);

+    /**
+     * 查询医嘱请求数据（支持按生成来源和来源单据号过滤）
+     *
+     * @param encounterId 就诊id
+     * @param generateSourceEnum 生成来源（可选，如手术计费=6）
+     * @param sourceBillNo 来源业务单据号（可选）
+     * @return 医嘱请求数据
+     */
+    R<?> getRequestBaseInfo(Long encounterId, Integer generateSourceEnum, String sourceBillNo);
+
    /**
     * 门诊签退医嘱
     *
--- 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
@@ -1987,13 +1987,25 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
     */
    @Override
    public R<?> getRequestBaseInfo(Long encounterId) {
+        return this.getRequestBaseInfo(encounterId, null, null);
+    }
+
+    @Override
+    public R<?> getRequestBaseInfo(Long encounterId, Integer generateSourceEnum, String sourceBillNo) {
        // 当前账号的参与者id
        Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        // 未指定generateSourceEnum时，默认只查询医生开立的医嘱
+        int sourceEnum = (generateSourceEnum != null) ? generateSourceEnum : GenerateSource.DOCTOR_PRESCRIPTION.getValue();
        // 医嘱请求数据
        List<RequestBaseDto> requestBaseInfo = doctorStationAdviceAppMapper.getRequestBaseInfo(encounterId, null,
                CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST,
                CommonConstants.TableName.WOR_SERVICE_REQUEST, practitionerId, Whether.NO.getCode(),
-                GenerateSource.DOCTOR_PRESCRIPTION.getValue());
+                sourceEnum, sourceBillNo);
+        // 手术计费场景：sourceBillNo 不为空时，只保留诊疗请求（3/6），过滤掉药品（1）和耗材（2）
+        if (sourceBillNo != null && !sourceBillNo.isEmpty()) {
+            requestBaseInfo.removeIf(dto -> dto.getAdviceType() != null
+                    && (dto.getAdviceType() == 1 || dto.getAdviceType() == 2));
+        }
        for (RequestBaseDto requestBaseDto : requestBaseInfo) {
            // 请求状态
            requestBaseDto
@@ -2114,7 +2126,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
        List<RequestBaseDto> requestBaseInfo = doctorStationAdviceAppMapper.getRequestBaseInfo(encounterId, patientId,
                CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST,
                CommonConstants.TableName.WOR_SERVICE_REQUEST, practitionerId, Whether.YES.getCode(),
-                GenerateSource.DOCTOR_PRESCRIPTION.getValue());
+                GenerateSource.DOCTOR_PRESCRIPTION.getValue(), null);
        for (RequestBaseDto requestBaseDto : requestBaseInfo) {
            // 请求状态
            requestBaseDto
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java
@@ -274,27 +274,8 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
            return R.fail("非就诊中患者不能完诊");
        }

-        // 2. 获取 pool_id 和 slot_id：从 encounter → order_main → adm_schedule_slot 链路获取
-        //    确保 div_log 中的值与排班主表一致，不依赖 triage_queue_item（队列项可能不存在或值错误）
+        // 2. 查找队列项（限定当天，避免复诊患者匹配到历史队列记录）
        Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
-        Long divPoolId = null;
-        Long divSlotId = null;
-        if (encounter.getOrderId() != null) {
-            try {
-                Order order = iOrderService.getById(encounter.getOrderId());
-                if (order != null && order.getSlotId() != null) {
-                    divSlotId = order.getSlotId();
-                    ScheduleSlot slot = scheduleSlotMapper.selectById(divSlotId);
-                    if (slot != null) {
-                        divPoolId = slot.getPoolId();
-                    }
-                }
-            } catch (Exception e) {
-                log.warn("获取完诊div_log的pool_id/slot_id失败，encounterId={}", encounterId, e);
-            }
-        }
-
-        // 3. 查找队列项（限定当天，避免复诊患者匹配到历史队列记录）
        TriageQueueItem queueItem = triageQueueItemService.getOne(
            new LambdaQueryWrapper<TriageQueueItem>()
                .eq(TriageQueueItem::getTenantId, tenantId)
@@ -319,14 +300,41 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
            }
        }

+        // 3. 获取 pool_id 和 slot_id：优先使用 triage_queue_item（挂号时录入的号源信息，为权威来源）
+        //    队列项不存在或值缺失时，回退使用 encounter → order_main → adm_schedule_slot 链路
+        Long divPoolId = null;
+        Long divSlotId = null;
+        if (queueItem != null && queueItem.getPoolId() != null && queueItem.getSlotId() != null) {
+            divPoolId = queueItem.getPoolId();
+            divSlotId = queueItem.getSlotId();
+        } else if (encounter.getOrderId() != null) {
+            try {
+                Order order = iOrderService.getById(encounter.getOrderId());
+                if (order != null && order.getSlotId() != null) {
+                    divSlotId = order.getSlotId();
+                    ScheduleSlot slot = scheduleSlotMapper.selectById(divSlotId);
+                    if (slot != null) {
+                        divPoolId = slot.getPoolId();
+                    }
+                }
+            } catch (Exception e) {
+                log.warn("回退获取完诊div_log的pool_id/slot_id失败，encounterId={}", encounterId, e);
+            }
+        }
+
        // 如果队列项存在且未完成，更新队列状态为已完成
        // 使用排除法而非白名单：只要不是"已完成"就可以完诊，覆盖跳过、等待等非标准流转状态
        if (queueItem != null &&
            !TriageQueueStatus.COMPLETED.getValue().equals(queueItem.getStatus())) {
            java.time.LocalDateTime nowLocal = java.time.LocalDateTime.now().truncatedTo(ChronoUnit.SECONDS);
-            queueItem.setStatus(TriageQueueStatus.COMPLETED.getValue());
-            queueItem.setUpdateTime(nowLocal);
-            triageQueueItemService.updateById(queueItem);
+            // 使用 LambdaUpdateWrapper 直接更新，确保 status 字段必定写入数据库
+            boolean queueUpdate = triageQueueItemService.update(new LambdaUpdateWrapper<TriageQueueItem>()
+                .eq(TriageQueueItem::getId, queueItem.getId())
+                .set(TriageQueueItem::getStatus, TriageQueueStatus.COMPLETED.getValue())
+                .set(TriageQueueItem::getUpdateTime, nowLocal));
+            if (!queueUpdate) {
+                log.error("完诊：triage_queue_item 状态更新失败，queueItemId={}", queueItem.getId());
+            }
        } else if (queueItem == null) {
            log.error("完诊：未找到任何 triage_queue_item 记录，encounterId={}, tenantId={}",
                encounterId, tenantId);
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java
@@ -112,11 +112,16 @@ public class DoctorStationAdviceController {
     * 查询医嘱请求数据
     *
     * @param encounterId 就诊id
+     * @param generateSourceEnum 生成来源（可选，用于按来源过滤，如手术计费=6）
+     * @param sourceBillNo 来源业务单据号（可选，用于按来源单据过滤）
     * @return 医嘱请求数据
     */
    @GetMapping(value = "/request-base-info")
-    public R<?> getRequestBaseInfo(@RequestParam(required = false) Long encounterId) {
-        return iDoctorStationAdviceAppService.getRequestBaseInfo(encounterId);
+    public R<?> getRequestBaseInfo(
+            @RequestParam(required = false) Long encounterId,
+            @RequestParam(required = false) Integer generateSourceEnum,
+            @RequestParam(required = false) String sourceBillNo) {
+        return iDoctorStationAdviceAppService.getRequestBaseInfo(encounterId, generateSourceEnum, sourceBillNo);
    }

    /**
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java
@@ -122,7 +122,8 @@ public interface DoctorStationAdviceAppMapper {
            @Param("MED_MEDICATION_REQUEST") String MED_MEDICATION_REQUEST,
            @Param("WOR_DEVICE_REQUEST") String WOR_DEVICE_REQUEST,
            @Param("WOR_SERVICE_REQUEST") String WOR_SERVICE_REQUEST, @Param("practitionerId") Long practitionerId,
-            @Param("historyFlag") String historyFlag, @Param("generateSourceEnum") Integer generateSourceEnum);
+            @Param("historyFlag") String historyFlag, @Param("generateSourceEnum") Integer generateSourceEnum,
+            @Param("sourceBillNo") String sourceBillNo);

    /**
     * 查询就诊费用性质
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/AdviceManageAppServiceImpl.java
@@ -341,6 +341,28 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                && (DbOpType.INSERT.getCode().equals(e.getDbOpType()) || DbOpType.UPDATE.getCode().equals(e.getDbOpType())))
                .collect(Collectors.toList());

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

 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -91,8 +92,10 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
                return R.fail("无待签发的医嘱,该申请单不可编辑");
            }
        } else {
-            // 诊疗处方号
-            prescriptionNo = assignSeqUtil.getSeq(AssignSeqEnum.ACTIVITY_PSYCHOTROPIC_NO.getPrefix(), 8);
+            // 检查申请单号：JC（检查）+ Z（住院标识）+ yyMMdd（日期）+ 5位顺序号
+            String dateStr = new java.text.SimpleDateFormat("yyMMdd").format(new Date());
+            int seq = assignSeqUtil.getSeqNoByDay(AssignSeqEnum.CHECK_APPLY_NO.getPrefix());
+            prescriptionNo = "JCZ" + dateStr + String.format("%05d", seq);
        }

        // 当前时间
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java
@@ -16,6 +16,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

+import java.time.LocalDate;
 import java.util.List;

 /**
@@ -142,6 +143,32 @@ public class RequestFormManageController {
        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.PROCEDURE.getCode()));
    }
 /**
+     * 分页查询手术申请单（全局，不需要encounterId，用于门诊手术安排查找弹窗）
+     *
+     * @param surgeryNo     手术单号（模糊查询，可选）
+     * @param applyTimeStart 申请时间起始（可选）
+     * @param applyTimeEnd   申请时间截止（可选）
+     * @param mainDoctorId   主刀医生ID（可选）
+     * @param applyDeptId    申请科室ID（可选）
+     * @param pageNo   页码，默认1
+     * @param pageSize 每页数量，默认10
+     * @return 分页手术申请单列表
+     */
+    @GetMapping(value = "/get-surgery-page")
+    public R<IPage<RequestFormPageDto>> getSurgeryRequestFormPage(
+            @RequestParam(required = false) String surgeryNo,
+            @RequestParam(required = false) LocalDate applyTimeStart,
+            @RequestParam(required = false) LocalDate applyTimeEnd,
+            @RequestParam(required = false) Long mainDoctorId,
+            @RequestParam(required = false) Long applyDeptId,
+            @RequestParam(defaultValue = "1") Integer pageNo,
+            @RequestParam(defaultValue = "10") Integer pageSize) {
+        RequestFormDto dto = new RequestFormDto(surgeryNo, null, applyTimeStart, applyTimeEnd,
+                mainDoctorId, applyDeptId, pageNo, pageSize);
+        return R.ok(iRequestFormManageAppService.getRequestFormPage(dto));
+    }
+
+    /**
     * 分页查询申请单
     * @return 申请单
     */
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDto.java
@@ -14,6 +14,10 @@ public class RequestFormDto {
     * 手术单号
     */
    private String surgeryNo;
+    /**
+     * 申请单类型编码
+     */
+    private String typeCode;
    /**
     * 申请时间开始
     */
--- 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
@@ -527,6 +527,9 @@
        LEFT JOIN cli_condition AS cc ON cc.id = T1.condition_id AND cc.delete_flag = '0'
        LEFT JOIN cli_condition_definition AS ccd ON ccd.id = cc.definition_id
        WHERE T1.delete_flag = '0' AND T1.tcm_flag = 0
+        <if test="generateSourceEnum != null">
+            AND T1.generate_source_enum = #{generateSourceEnum}
+        </if>
        <if test="historyFlag == '0'.toString()">
            AND T1.encounter_id = #{encounterId}
        </if>
@@ -695,6 +698,9 @@
        -- based_on_table='med_medication_request' → 输液/皮试执行记录，应排除
        -- based_on_table='exam_apply'/'lab_apply' → 申请单原始医嘱，应保留
        AND (T1.based_on_id IS NULL OR T1.based_on_table IS NULL OR T1.based_on_table NOT IN ('med_medication_request', 'med_medication_dispense'))
+        <if test="sourceBillNo != null and sourceBillNo != ''">
+            AND T1.prescription_no = #{sourceBillNo}
+        </if>
        <if test="historyFlag == '0'.toString()">
            AND T1.encounter_id = #{encounterId}
        </if>
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml
@@ -231,7 +231,7 @@
               ae.priority_enum,
               ae.organization_id,
               ae.start_time                     AS in_hos_time,
-               bed.start_time,
+               COALESCE(bed.start_time, ae.start_time) AS start_time,
               bed.location_id                   AS bed_id,
               bed.location_name                 AS bed_name,
               house.location_id                 AS house_id,
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
@@ -161,6 +161,9 @@
                <if test="requestFormDto.surgeryNo != null and requestFormDto.surgeryNo != ''">
                    AND drf.prescription_no LIKE CONCAT('%', #{requestFormDto.surgeryNo}, '%')
                </if>
+                <if test="requestFormDto.typeCode != null and requestFormDto.typeCode != ''">
+                    AND drf.type_code = #{requestFormDto.typeCode}
+                </if>
                <if test="requestFormDto.applyTimeStart != null">
                    AND drf.create_time >= #{requestFormDto.applyTimeStart}
                </if>
--- a/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java
+++ b/openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java
@@ -270,6 +270,10 @@ public enum AssignSeqEnum {
     * 诊疗处方号
     */
    ACTIVITY_PSYCHOTROPIC_NO("62", "诊疗处方号", "PAR"),
+    /**
+     * 检查申请单号（住院）
+     */
+    CHECK_APPLY_NO("72", "检查申请单号", "JCZ"),
    /**
     * b 病历文书
     */
--- a/openhis-ui-vue3/src/api/system/checkType.js
+++ b/openhis-ui-vue3/src/api/system/checkType.js
@@ -163,7 +163,7 @@ export function updateCheckPart(data) {
 // 查询检查套餐列表
 export function listCheckPackage(query) {
  return request({
-    url: '/system/check-package/list',
+    url: '/system/package/list',
    method: 'get',
    params: query
  })
--- a/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/api.js
+++ b/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/api.js
@@ -58,10 +58,17 @@ export function singOut(data) {
 /**
 * 获取患者本次就诊处方
 */
-export function getPrescriptionList(encounterId) {
-  // Add timestamp to bypass browser caching and ensure fresh data is loaded
+export function getPrescriptionList(encounterId, generateSourceEnum, sourceBillNo) {
+  let url = '/doctor-station/advice/request-base-info?encounterId=' + encounterId
+  if (generateSourceEnum != null) {
+    url += '&generateSourceEnum=' + generateSourceEnum
+  }
+  if (sourceBillNo != null) {
+    url += '&sourceBillNo=' + encodeURIComponent(sourceBillNo)
+  }
+  url += '&t=' + Date.now()
  return request({
-    url: '/doctor-station/advice/request-base-info?encounterId=' + encounterId + '&t=' + Date.now(),
+    url: url,
    method: 'get',
  })
 }
--- a/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue
@@ -381,6 +381,14 @@ const props = defineProps({
  activeTab: {
    type: String,
  },
+  generateSourceEnum: {
+    type: Number,
+    default: null,
+  },
+  sourceBillNo: {
+    type: String,
+    default: null,
+  },
 });
 const isAdding = ref(false);
 const isSaving = ref(false); // #437 防重复提交锁
@@ -468,7 +476,11 @@ watch(

 function getListInfo(addNewRow) {
  isAdding.value = false;
-  getPrescriptionList(props.patientInfo.encounterId).then((res) => {
+  getPrescriptionList(
+    props.patientInfo.encounterId,
+    props.generateSourceEnum ?? undefined,
+    props.sourceBillNo ?? undefined,
+  ).then((res) => {
    // 为每行数据添加 adviceTypeValue 字段，用于类型下拉框显示
    prescriptionList.value = (res.data || []).map(item => {
      // 根据 adviceType 和 categoryCode 找到对应的 adviceTypeValue
--- a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue
@@ -1318,7 +1318,11 @@ async function show(diagnosisData) {
    // 系统关联信息
    encounterId: patientInfo.encounterId || '', // 就诊ID
    patientId: patientInfo.patientId || '', // 患者ID
-    diagnosisId: diagnosisData?.conditionId || diagnosisData?.definitionId || '', // 诊断ID
+    diagnosisId: (diagnosisData?.conditionId != null && diagnosisData?.conditionId !== '')
+      ? diagnosisData.conditionId
+      : (diagnosisData?.definitionId != null && diagnosisData?.definitionId !== '')
+        ? diagnosisData.definitionId
+        : '', // 诊断ID
  };

  // 更新selectedDiseases数组
@@ -1373,7 +1377,7 @@ async function buildSubmitData() {
  const submitData = {
    cardNo: formData.cardNo,
    visitId: props.patientInfo?.encounterId || formData.encounterId || null,
-    diagId: formData.diagnosisId || null,
+    diagId: formData.diagnosisId ? Number(formData.diagnosisId) : null,
    patId: formData.patientId || null,
    idType: 1, // 默认身份证
    idNo: formData.idNo,
@@ -1539,6 +1543,12 @@ async function handleSubmit() {
      return;
    }

+    // 检查诊断ID是否有效（后端 @NotNull 校验要求）
+    if (!form.value.diagnosisId) {
+      proxy.$modal.msgError('诊断信息不完整，请重新选择诊断后重试');
+      return;
+    }
+
    // 开始加载状态，防止重复提交
    submitLoading.value = true;

--- a/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue
@@ -402,6 +402,21 @@
                        <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>
+                    </div>
+                    <div v-if="item.selectedMethod && item.methodPackageLoading" class="method-package-loading">
+                      加载套餐明细中...
+                    </div>
                  </div>
                </div>
              </div>
@@ -419,7 +434,7 @@ import { ElMessage, ElMessageBox } from 'element-plus';
 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 } from '@/api/system/checkType';
+import { listCheckMethod, searchCheckMethod, listCheckPackage } from '@/api/system/checkType';
 import { getEncounterDiagnosis } from '../api.js';

 const props = defineProps({
@@ -445,7 +460,7 @@ async function loadPackageDetails(row, treeNode, resolve) {
  }
  try {
    const res = await request({
-      url: `/exam/package/${row.packageId}/details`,
+      url: `/system/package/${row.packageId}/details`,
      method: 'get'
    });
    if (res.code === 200 && res.data) {
@@ -474,7 +489,7 @@ async function loadPackageDetailsForItem(item) {
  }
  try {
    const res = await request({
-      url: `/exam/package/${item.packageId}/details`,
+      url: `/system/package/${item.packageId}/details`,
      method: 'get'
    });
    if (res.code === 200 && res.data) {
@@ -682,6 +697,7 @@ async function handleCategoryExpand(cat) {
        code: m.code,
        price: m.price || 0,
        packageName: m.packageName || '',
+        packageId: m.packageId || null,
        packagePrice: m.packagePrice || null,
        serviceFee: m.serviceFee || null
      }));
@@ -992,12 +1008,15 @@ function handleRowClick(row) {
  selectedItems.value = [];
  activeDetailTab.value = 'applyForm';
  request({ url: `/exam/apply/${row.applyNo}`, method: 'get' }).then(async res => {
-    const d = res.data || res;
-    if (d.data) Object.assign(form, d.data);
-    if (d.items && Array.isArray(d.items)) {
+    const resp = res.data || res;
+    // 保存 items 在顶层响应中，避免后面 d.data 赋值后丢失
+    const rawItems = resp.items;
+    const d = resp.data || resp;
+    if (d) Object.assign(form, d);
+    if (rawItems && Array.isArray(rawItems)) {
      try {
        // 为每个项目加载检查方法
-        const itemsWithMethods = await Promise.all(d.items.map(async m => {
+        const itemsWithMethods = await Promise.all(rawItems.map(async m => {
          const item = {
            id: m.itemCode, name: m.itemName,
            price: m.itemFee || 0, quantity: 1,
@@ -1025,12 +1044,18 @@ function handleRowClick(row) {
                  code: md.code,
                  price: m.itemFee || 0,  // fallback 到已保存的价格
                  packageName: md.packageName || '',
+                  packageId: md.packageId || null,
                  packagePrice: md.packagePrice || null,  // Bug #384修复: 套餐价格
                  serviceFee: md.serviceFee || null
                }));
                // 如果有已保存的检查方法信息，尝试匹配
                if (m.checkMethodId) {
                  item.selectedMethod = item.methods.find(md => md.id === m.checkMethodId) || null;
+                  // 从已保存的方法中获取套餐信息
+                  if (item.selectedMethod?.packageId) {
+                    item.isPackage = true;
+                    item.packageId = item.selectedMethod.packageId;
+                  }
                }
              }
            } catch (err) {
@@ -1091,6 +1116,13 @@ async function handleMethodSelect(checked, method, cat) {
    const existingItem = selectedItems.value.find(s => s.id === targetItem.id);
    if (existingItem) {
      existingItem.selectedMethod = method;
+      // 从方法中获取套餐信息
+      if (method.packageId) {
+        existingItem.isPackage = true;
+        existingItem.packageId = method.packageId;
+        // 预加载套餐明细
+        loadPackageDetailsForItem(existingItem);
+      }
      updateMethodDisplay();
      return;
    }
@@ -1105,7 +1137,7 @@ async function handleMethodSelect(checked, method, cat) {
      }
    }

-    selectedItems.value.push({
+    const newItem = {
      id: targetItem.id, name: targetItem.name,
      price: targetItem.price, quantity: 1,
      serviceFee: targetItem.serviceFee || 0,
@@ -1117,9 +1149,16 @@ async function handleMethodSelect(checked, method, cat) {
      methods: [method],
      selectedMethod: method,
      expanded: false,
-      isPackage: !!targetItem.packageName,
-      packageId: targetItem.packageId || null
-    });
+      // 从方法中获取套餐信息（优先级高于项目本身的 packageName）
+      isPackage: !!method.packageId || !!targetItem.packageName,
+      packageId: method.packageId || targetItem.packageId || null
+    };
+    selectedItems.value.push(newItem);
+
+    // 如果是套餐，预加载套餐明细
+    if (newItem.isPackage && newItem.packageId) {
+      loadPackageDetailsForItem(newItem);
+    }

    // 自动回填执行科室
    if (selectedItems.value.length === 1 && cat?.performDeptName) {
@@ -1164,6 +1203,7 @@ async function handleItemSelect(checked, item, cat) {
            code: m.code,
            price: m.price || item.price,  // fallback 到项目价格
            packageName: m.packageName || '',
+            packageId: m.packageId || null,
            packagePrice: m.packagePrice || null,  // Bug #384修复: 套餐价格
            serviceFee: m.serviceFee || null      // Bug #384修复: 服务费
          }));
@@ -1228,21 +1268,68 @@ async function toggleItemExpand(item) {
 }

 // Bug #384修复: 勾选框选择检查方法（单选逻辑）
-function selectMethodCheckbox(checked, item, method) {
+async function selectMethodCheckbox(checked, item, method) {
  if (checked) {
    item.selectedMethod = method;
+    // 动态加载该方法对应的套餐明细
+    await loadMethodPackageDetails(item, method);
  } else {
    item.selectedMethod = null;
+    item.methodPackageDetails = [];
  }
  // 联动更新表单检查方法显示字段
  updateMethodDisplay();
-  
+
  // #430: 套餐金额实时同步到申请单
  nextTick(() => {
    form.totalAmount = totalAmountCalc.value;
  });
 }

+// 根据检查方法的packageName加载对应的套餐明细
+async function loadMethodPackageDetails(item, method) {
+  item.methodPackageLoading = true;
+  item.methodPackageDetails = [];
+  try {
+    if (!method.packageName) {
+      item.methodPackageLoading = false;
+      return;
+    }
+    // 通过packageName查询套餐获取packageId
+    const pkgRes = await listCheckPackage({ packageName: method.packageName });
+    let packages = pkgRes?.data || [];
+    if (!Array.isArray(packages)) {
+      packages = packages.records || packages.data || [];
+    }
+    if (packages.length === 0) {
+      item.methodPackageLoading = false;
+      return;
+    }
+    const packageId = packages[0].id;
+    // 查询套餐明细
+    const detailRes = await request({
+      url: `/system/package/${packageId}/details`,
+      method: 'get'
+    });
+    if (detailRes.code === 200 && detailRes.data) {
+      item.methodPackageDetails = detailRes.data.map(d => ({
+        id: d.id,
+        name: d.itemName || d.name,
+        quantity: d.quantity || 1,
+        unit: d.unit || '次',
+        price: d.unitPrice || d.price || 0,
+        amount: d.amount || d.total || 0,
+        checked: true  // 默认勾选
+      }));
+    }
+  } catch (err) {
+    console.error('加载方法套餐明细失败:', err);
+    item.methodPackageDetails = [];
+  } finally {
+    item.methodPackageLoading = false;
+  }
+}
+
 // Bug #384修复: 更新检查方法显示字段（联动）
 function updateMethodDisplay() {
  // 找到第一个有选中检查方法的项目
@@ -1648,6 +1735,29 @@ defineExpose({ getList });
  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;
+}
+
+.method-package-loading {
+  padding: 4px 0 4px 24px;
+  font-size: 10px;
+  color: #c0c4cc;
+}
+
 /* 折叠组件细节 */
 :deep(.el-collapse) {
  border: none;
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/api.js
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/api.js
@@ -44,6 +44,17 @@ export function getSurgery(queryParams) {
  });
 }

+/**
+ * 分页查询手术申请单（全局，不需要encounterId，用于门诊手术安排查找弹窗）
+ */
+export function getSurgeryPage(queryParams) {
+  return request({
+    url: '/reg-doctorstation/request-form/get-surgery-page',
+    method: 'get',
+    params: queryParams,
+  });
+}
+
 /**
 * 查询护理医嘱信息
 */
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue
@@ -79,7 +79,7 @@
          <el-table-column prop="patientName" label="患者姓名" width="120" />
          <el-table-column prop="name" label="申请单名称" width="140" />
          <el-table-column prop="createTime" label="创建时间" width="160" />
-          <el-table-column prop="prescriptionNo" label="处方号" width="140" />
+          <el-table-column prop="prescriptionNo" label="申请单号" width="140" />
          <el-table-column prop="requesterId_dictText" label="申请者" width="120" />
          <el-table-column label="申请单状态" width="120" align="center">
            <template #default="scope">
@@ -118,7 +118,7 @@
            <el-descriptions-item label="创建时间">{{
              currentDetail.createTime || '-'
            }}</el-descriptions-item>
-            <el-descriptions-item label="处方号">{{
+            <el-descriptions-item label="申请单号">{{
              currentDetail.prescriptionNo || '-'
            }}</el-descriptions-item>
            <el-descriptions-item label="申请者">{{
@@ -168,7 +168,7 @@ import {computed, getCurrentInstance, ref, watch} from 'vue';
 import {Refresh, Search} from '@element-plus/icons-vue';
 import {patientInfo} from '../../store/patient.js';
 import {getCheck} from './api';
-import {getOrgList} from '@/views/doctorstation/components/api.js';
+import {getDepartmentList} from '@/api/public.js';

 const { proxy } = getCurrentInstance();

@@ -293,8 +293,8 @@ const hasMatchedFields = computed(() => {

 /** 查询科室 */
 const getLocationInfo = () => {
-  getOrgList().then((res) => {
-    orgOptions.value = res.data.records;
+  getDepartmentList().then((res) => {
+    orgOptions.value = res.data || [];
  });
 };

@@ -306,17 +306,19 @@ const recursionFun = (targetDepartment) => {
      name = obj.name;
    }
    const subObjArray = obj['children'];
-    for (let index = 0; index < subObjArray.length; index++) {
-      const item = subObjArray[index];
-      if (item.id == targetDepartment) {
-        name = item.name;
+    if (subObjArray && subObjArray.length > 0) {
+      for (let index = 0; index < subObjArray.length; index++) {
+        const item = subObjArray[index];
+        if (item.id == targetDepartment) {
+          name = item.name;
+        }
      }
    }
  }
  return name;
 };

-const handleViewDetail = (row) => {
+const handleViewDetail = async (row) => {
  console.log('targetDepartment========>', JSON.stringify(row));

  currentDetail.value = row;
@@ -324,6 +326,15 @@ const handleViewDetail = (row) => {
  if (row.descJson) {
    try {
      const obj = JSON.parse(row.descJson);
+      // 确保科室数据已加载
+      if (!orgOptions.value || orgOptions.value.length === 0) {
+        await new Promise((resolve) => {
+          getDepartmentList().then((res) => {
+            orgOptions.value = res.data || [];
+            resolve();
+          });
+        });
+      }
      obj.targetDepartment = recursionFun(obj.targetDepartment);
      descJsonData.value = obj;
    } catch (e) {
--- 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
@@ -164,7 +164,7 @@ onMounted(() => {
 * type(1：watch监听类型 2:点击保存类型)
 * selectProjectIds(选中项目的id数组)
 * */
-const projectWithDepartment = (selectProjectIds) => {
+const projectWithDepartment = (selectProjectIds, type) => {
  //1.获取选中的项目 2.判断项目的执行科室是否相同 3.判断执行科室是否配置 4.将项目的执行科室复值到执行科室下拉选位置
  let isRelease = true;
  // 选中项目的数组
--- 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
@@ -483,7 +483,7 @@ const submit = () => {
    encounterId: patientInfo.value.encounterId,
    organizationId: patientInfo.value.inHospitalOrgId,
    requestFormId: '',
-    name: '检查申请单',
+    name: applicationListAllFilter.map(item => item.adviceName).join('、'),
    descJson: JSON.stringify(submitForm),
    categoryEnum: '2',
  }).then((res) => {
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
@@ -801,8 +801,8 @@ function clickRowDb(row, column, event) {
    return;
  }
  row.showPopover = false;
-  // “待签发(已保存 requestId存在)”不允许再编辑；仅“待保存(无requestId)”允许编辑
-  if (row.statusEnum == 1 && !row.requestId) {
+  // 仅”待签发(statusEnum==1)”允许编辑；”已签发(statusEnum==2)”及之后状态不允许编辑
+  if (row.statusEnum == 1) {
    // 确保治疗类型为字符串，方便与单选框 label 对齐，默认为长期医嘱('1')
    row.therapyEnum = String(row.therapyEnum ?? '1');
    row.isEdit = true;
--- a/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/transferInDialog.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/transferInDialog.vue
@@ -453,6 +453,10 @@ const loadPatientInfo = () => {
      interventionForm.value.startTime = dayjs(res.data.startTime).format(
        'YYYY-MM-DD HH:mm:ss'
      );
+    } else if (res.data.inHosTime) {
+      interventionForm.value.startTime = dayjs(res.data.inHosTime).format(
+        'YYYY-MM-DD HH:mm:ss'
+      );
    } else {
      interventionForm.value.startTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
    }
--- a/openhis-ui-vue3/src/views/surgicalschedule/index.vue
+++ b/openhis-ui-vue3/src/views/surgicalschedule/index.vue
@@ -829,7 +829,9 @@
            </el-descriptions>
          </div>
          <div style="padding: 10px">
-            <prescriptionlist v-if="showChargeDialog" :patientInfo="chargePatientInfo" ref="prescriptionRef" />
+            <prescriptionlist v-if="showChargeDialog" :patientInfo="chargePatientInfo" ref="prescriptionRef"
+              :generateSourceEnum="1"
+              :sourceBillNo="chargePatientInfo.sourceBillNo" />
            <div class="overlay" v-if="disabled"></div>
          </div>
        </div>
@@ -872,11 +874,17 @@ import { Loading } from '@element-plus/icons-vue' // 🔧 新增：导入 Loadin
 import { getPrescriptionList } from '@/views/clinicmanagement/bargain/component/api'

 // API 导入
-import { getSurgerySchedulePage, addSurgerySchedule, updateSurgerySchedule, deleteSurgerySchedule, getSurgeryScheduleDetail } from '@/api/surgicalschedule'
+import {
+  getSurgerySchedulePage,
+  addSurgerySchedule,
+  updateSurgerySchedule,
+  deleteSurgerySchedule,
+  getSurgeryScheduleDetail
+} from '@/api/surgicalschedule'
 import { listUser } from '@/api/system/user'
 import { deptTreeSelect } from '@/api/system/user'
 import { listOperatingRoom } from '@/api/operatingroom'
-import { getSurgery} from '@/views/inpatientDoctor/home/components/applicationShow/api.js'
+import { getSurgeryPage} from '@/views/inpatientDoctor/home/components/applicationShow/api.js'
 import { getTenantPage } from '@/api/system/tenant'
 import { getContract } from '@/views/inpatientDoctor/home/components/api.js'
 import SurgeryCharge from '../charge/surgerycharge/index.vue'
@@ -1388,8 +1396,8 @@ async function handleChargeCharge(row) {
    orgId: userStore.organizationId || userStore.orgId || userStore.tenantId || 1,
    // 添加账户ID
    accountId: accountId,
-    // 添加手术申请单号用于追溯
-    sourceBillNo: row.applyId,
+    // 添加手术单号用于关联对应的手术医嘱
+    sourceBillNo: row.operCode,
    //添加计费标志手术计费
    generateSourceEnum: 6
  }
@@ -1416,9 +1424,12 @@ function closeChargeDialog() {
  if (prescriptionRef.value && prescriptionRef.value.closeAllPopovers) {
    prescriptionRef.value.closeAllPopovers()
  }
-  showChargeDialog.value = false
-  chargePatientInfo.value = {}
-  chargeSurgeryInfo.value = {}
+  // 等 Vue 完成 DOM 更新后再关闭弹窗，确保 popover 先消失
+  nextTick(() => {
+    showChargeDialog.value = false
+    chargePatientInfo.value = {}
+    chargeSurgeryInfo.value = {}
+  })
 }

 // 🔧 新增：标志位，用于区分是"打开"还是"刷新"
@@ -1447,7 +1458,8 @@ function handleMedicalAdvice(row) {
    role: userStore.roles[0],
    effectiveOrgId : row.effectiveOrgId,
    orgId: userStore.orgId,
-    positionId: userStore.orgId
+    positionId: userStore.orgId,
+    applyId: row.applyId  // 手术申请单ID，用于过滤关联医嘱
  }

  // 🔧 关键修复：如果已有提交的医嘱数据，并且是同一个患者的就诊，则使用保存的数据
@@ -1745,7 +1757,7 @@ function handleQuoteBilling() {
  // 重新拉取计费药品数据
  if (temporaryPatientInfo.value.visitId) {
    temporaryMedicalLoading.value = true // 🔧 新增：开始加载
-    getPrescriptionList(temporaryPatientInfo.value.visitId).then((res) => {
+    getPrescriptionList(temporaryPatientInfo.value.visitId, 6, temporaryPatientInfo.value.operCode).then((res) => {
            if (res.code === 200 && res.data) {
              // 🔧 修复：先清空旧数据，避免数据累积
              temporaryBillingMedicines.value = []
@@ -2020,7 +2032,7 @@ function handleFindApply() {
  getSurgicalScheduleList()
 }

-// 获取手术申请列表（用于“查找”弹窗）
+// 获取手术申请列表（用于”查找”弹窗）
 function getSurgicalScheduleList() {
  applyLoading.value = true
  const params = { ...applyQueryParams }
@@ -2029,8 +2041,7 @@ function getSurgicalScheduleList() {
    params.applyTimeEnd = params.applyTimeRange[1]
    delete params.applyTimeRange
  }
-  getSurgery(params).then((res) => {
-    // Check if data is nested under data.data or directly under data
+  getSurgeryPage(params).then((res) => {
    const responseData = res.data.data || res.data
    applyList.value = responseData.records || []
    applyTotal.value = responseData.total || 0
@@ -2279,4 +2290,4 @@ function getRowClassName({ row, rowIndex }) {
  border-bottom: 1px solid #d9ecff !important;
 }

-</style>
+</style>
Author	SHA1	Message	Date
赵云	1f985004d9	Fix Bug #408 : 门诊医生站检查明细标签页显示暂无数据 - 修复handleRowClick中resp.items被d.data覆盖后丢失的问题根因：后端 getInfo 返回 { data: ExamApply, items: ExamApplyItem[] }，前端先将 resp 赋值给 d，随后又执行 d = resp.data，导致 d 变成 ExamApply 对象，后续 d.items 永远为 undefined，明细列表无法加载。修复：提前保存 resp.items 到 rawItems 变量，后续使用 rawItems 而非 d.items。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 13:23:53 +08:00
Ranyunqiao	a1ed8eafb3	bug 362 428 436	2026-05-13 13:23:53 +08:00
陈琳	03b84bcc40	Fix Bug #496 : 【住院医生工作站-检查申请】检查申请列表字段命名不规范及单号生成规则不符合医疗行业标准 1. 前端列标题：处方号 → 申请单号（表格列 + 详情弹窗） 2. 后端单号生成：原用 PAR 处方号前缀 → 改为 JCZ + yyMMdd + 5位顺序号 3. 新增 AssignSeqEnum.CHECK_APPLY_NO 枚举项（JCZ 前缀） Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 13:23:53 +08:00
关羽	1759036d5c	Fix Bug #496 : 【住院医生工作站-检查申请】检查申请列表字段命名不规范及单号生成规则不符合医疗行业标准 1. 前端 examineApplication.vue：列表表头和详情弹窗中"处方号"改为"申请单号" 2. 后端 RequestFormManageAppServiceImpl：检查申请单单号生成规则由 PAR+流水号改为 JCZ+yyMMdd+5位顺序号（如：JCZ26051300001），其他类型申请单保持原有PAR规则不变 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 13:23:53 +08:00
关羽	ae8c7ffe5e	Fix Bug #400 : 门诊医生站点击【完诊】后，triage_queue_item 表 status 字段未按规范更新为 30 根因：完诊时使用 triageQueueItemService.updateById(queueItem) 更新队列状态，依赖 MyBatis Plus 的实体级更新策略，可能因字段级更新策略导致 status 字段未实际写入数据库。修复策略：改用 LambdaUpdateWrapper 直接生成 UPDATE SQL，明确指定 SET status=30，绕过实体级更新策略，确保 status 字段必定写入数据库。同时增加更新失败日志。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 13:23:53 +08:00
荀彧	138f8ba5ca	Fix Bug #401 : 门诊完诊审计日志错误：div_log 表中 pool_id 与 slot_id 存值与设计规范不符调整完诊时 div_log 的 pool_id/slot_id 获取优先级：优先使用 triage_queue_item （挂号时录入的号源信息，为权威来源），队列项不存在或值缺失时回退使用 encounter → order → slot → pool 链路 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 13:23:53 +08:00
xiaoming	fe44e6efac	bug471 手术管理-门诊手术安排：手术申请查询结果中混入住院检验申请单数据（脏数据）	2026-05-13 13:23:52 +08:00
赵云	cb939fdf87	Fix Bug #412 : 门诊医生站：传染病报告卡保存失败，提示报错根因分析： - 前端在 buildSubmitData() 中使用 formData.diagnosisId \|\| null 将空字符串转为 null - 后端 InfectiousDiseaseReportDto.diagId 有 @NotNull 校验，导致 null 值被拒绝 - diagnosisId 来源于 show() 中 diagnosisData?.conditionId \|\| diagnosisData?.definitionId 使用 \|\| 运算符会将 0 等假值跳过，可能导致 ID 丢失修复内容： 1. show() 函数：使用显式 null/空字符串检查替代 \|\| 运算符，确保 conditionId/definitionId 正确映射 2. handleSubmit()：提交前增加 diagnosisId 非空校验，提前拦截并给出友好提示 3. buildSubmitData()：diagId 使用 Number() 显式转换，确保发送正确的 Long 值 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 13:23:52 +08:00
赵云	2123d222eb	Fix Bug #428 : 门诊医生站-检查申请：未实现分类联动检查方法及套餐明细展示与勾选逻辑根本原因： 1. 分类联动加载检查方法时，未提取后端返回的 packageId 字段 2. 勾选检查方法后，未从方法中获取套餐信息（isPackage/packageId） 3. 选中带套餐的检查方法后，未调用 loadPackageDetailsForItem 预加载套餐明细修复内容（4处手术式修改）： - handleCategoryExpand：方法映射增加 packageId 字段 - handleRowClick：回充已有申请单时，从匹配的方法中获取套餐信息 - handleMethodSelect：从方法获取套餐信息并预加载套餐明细 - handleItemSelect：方法映射增加 packageId 字段 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 01:11:25 +08:00
张飞	4f6ad79527	Fix Bug #362 : 住院护士站：入出转管理双击查看详情时，"入科时间"字段显示当前系统时间而非实际入科时间在 selectAdmissionPatientInfo SQL 中，startTime 原取自 bed.start_time（床位级别的位置记录），当该 LEFT JOIN 无匹配记录时返回 NULL，前端 fallback 到当前系统时间。改为 COALESCE(bed.start_time, ae.start_time)，无床位记录时回退到 encounter 的入院时间。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 01:03:05 +08:00
关羽	1b6f52907d	Fix Bug #492 : 【门诊手术安排】关闭"手术计费"主弹窗后，项目字典选择列表依然残留悬浮在界面上根因：el-popover 使用 :visible 受控模式，closeAllPopovers() 将 showPopover 设为 false 后，Vue 尚未完成 DOM 更新时 showChargeDialog 已被设为 false，导致弹窗组件被销毁而 popover 的 visible 状态变更未传播到 DOM，弹窗消失但 popover 残留。修复：在 closeChargeDialog 中使用 nextTick 等待 Vue 完成 popover 关闭的 DOM 更新后，再设置 showChargeDialog = false 关闭主弹窗。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 01:03:05 +08:00
赵云	13d3d7a98d	Fix Bug #493 : 【住院医生工作站-临床医嘱-检验申请】项目未维护执行科室时，医生手动选择发往科室后仍报错且数据被清空根因：projectWithDepartment 函数定义时遗漏了 type 参数，导致函数体内引用 type 变量时报 ReferenceError（未定义），type === 2 的判断永远无法正确执行。用户在提交时手动选择的发往科室被清空且无法提交。修复：在函数签名中添加 type 参数，与 working 版本 medicalExaminations.vue 保持一致。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 01:03:05 +08:00
刘备	852a2a83b0	Fix Bug #489 : 【医嘱闭环】医生站签发单条长期药品医嘱，护士校对界面生成重复（两条）待校对记录在住院医生站签发流程的 handMedication() 方法中增加去重逻辑，与门诊医生站保持一致，使用 patientId+encounterId+adviceDefinitionId+dose+methodCode+rateCode 作为唯一键，防止前端重复提交导致数据库产生重复医嘱记录。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 01:03:05 +08:00
诸葛亮	b127fd93e4	Fix Bug #494 : 住院医生工作站-检查申请："申请单名称"字段显示为通用名称，未展示具体检查项目名称根因：medicalExaminations.vue 保存检查申请单时，name 字段硬编码为 "检查申请单"，导致列表页所有记录的申请单名称均显示为固定字符串，无法区分具体检查项目。修复：将 name 从硬编码改为从已选项目集合中提取 adviceName 并用顿号连接，如选择 CT、超声两项则显示为 "CT、超声"。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 00:15:09 +08:00
刘备	4a6f0e61d4	Fix Bug #491 : 【执行科室配置】保存配置时系统报错 - 修复Organization.getName()空指针异常根因分析： 1. organizationLocationInit() 中 Organization.getName() 未做空值过滤，若数据库存在name为null的科室记录会NPE 2. addOrEditOrgLoc() 中 activityDefinitionMapper.selectById().getName() 未对selectById返回null做防护 3. addOrEditOrgLoc() 缺少organizationId前置校验，空值传入可能导致后续流程异常修复内容： - 第74行：stream中增加 .filter(organization -> organization != null && organization.getName() != null) - 第136-138行：增加organizationId为null时的校验，返回友好错误提示 - 第145-147行：将activityDefinitionMapper.selectById结果先赋值再判空，避免NPE Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 00:12:31 +08:00
赵云	5f3370ef7f	Fix Bug #488 : 【临床医嘱】双击编辑待签发医嘱，医嘱类型回显为数字且点击确认报接口错误修复 clickRowDb 函数中编辑条件过于严格的问题：原条件 `row.statusEnum == 1 && !row.requestId` 只允许"待保存"(无requestId)的医嘱进入编辑，导致"待签发"(有requestId)的医嘱无法编辑。改为 `row.statusEnum == 1`，允许所有待签发状态的医嘱编辑。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 00:11:36 +08:00
张飞	4092abfce9	Fix Bug #477 : 住院医生工作站-住院检查申请详情弹窗中"发往科室"字段显示为短横线（-），未正常获取数据根因分析： 1. 前端组件使用了错误的API获取科室列表：表单使用getDepartmentList(/app-common/department-list) 保存的targetDepartment ID，但详情弹窗使用getOrgList(/base-data-manage/organization/organization) 查询，两个接口返回的数据结构和ID不同，导致recursionFun无法匹配到科室名称 2. recursionFun中obj.children可能为null/undefined，直接遍历会抛TypeError 3. getLocationInfo是异步调用，handleViewDetail可能在科室数据加载完成前被调用修复： - 统一使用getDepartmentList(@/api/public.js)获取科室数据，与表单组件保持一致 - recursionFun增加children空值保护 - handleViewDetail改为async，打开详情前确保科室数据已加载	2026-05-13 00:05:17 +08:00