Fix Bug #446 : 【手术管理-门诊手术安排】临时医嘱生成后界面非法关闭且按钮名称/功能显示不一致

根因: handleMedicalAdvice 中盲目重置 temporarySigned.value = false，导致重新打开医嘱弹窗时按钮状态错误。修复: 1. index.vue: 根据已有医嘱数据是否有 requestId 来决定 temporarySigned 状态，而非盲目重置 2. temporaryMedical.vue: 新增 allItemsSubmitted 计算属性，当所有计费药品已提交(requestId)时显示"已签发"按钮并禁用 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Fix Bug #402 : 住院医生站诊断录入：点击保存诊断后，列表出现重复记录且部分条目元数据缺失
2026-05-14 09:21:31 +08:00 · 2026-05-14 09:21:31 +08:00 · 2026-05-14 09:17:32 +08:00 · 2026-05-14 09:17:32 +08:00 · 2026-05-14 08:58:21 +08:00 · 2026-05-14 08:52:04 +08:00
56 changed files with 1643 additions and 430 deletions
--- 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
@@ -228,8 +228,10 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
        // 医嘱定义ID集合
        List<Long> adviceDefinitionIdList = adviceBaseDtoList.stream().map(AdviceBaseDto::getAdviceDefinitionId)
                .collect(Collectors.toList());
-        // 费用定价主表ID集合
-        List<Long> chargeItemDefinitionIdList = adviceBaseDtoList.stream().map(AdviceBaseDto::getChargeItemDefinitionId)
+        // 费用定价主表ID集合（过滤null值，手术项目无定价定义）
+        List<Long> chargeItemDefinitionIdList = adviceBaseDtoList.stream()
+                .map(AdviceBaseDto::getChargeItemDefinitionId)
+                .filter(Objects::nonNull)
                .collect(Collectors.toList());

        // 判断是否包含药品或耗材类型（只有这些类型才需要库存相关查询）
@@ -275,9 +277,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
            medLocationConfig = Collections.emptyList();
            allowedLocByCategory = Collections.emptyMap();
        }
-        // 费用定价子表信息 - 使用分批处理避免大量参数问题
+        // 费用定价子表信息 - 仅药品/耗材需要批次定价查询，手术/诊疗无库存概念不需要
        List<AdvicePriceDto> childCharge = new ArrayList<>();
-        if (chargeItemDefinitionIdList != null && !chargeItemDefinitionIdList.isEmpty()) {
+        if (hasMedOrDevice && chargeItemDefinitionIdList != null && !chargeItemDefinitionIdList.isEmpty()) {
            // 分批处理，每批最多1000个ID，增加批次大小以减少查询次数
            int batchSize = 1000;
            for (int i = 0; i < chargeItemDefinitionIdList.size(); i += batchSize) {
@@ -957,11 +959,16 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
            }
        }
        for (AdviceSaveDto adviceSaveDto : deleteList) {
-            iMedicationRequestService.removeById(adviceSaveDto.getRequestId());
+            Long requestId = adviceSaveDto.getRequestId();
+            // 🔧 Bug #442: 跳过 requestId 为 null 的记录，避免删除不存在的药品请求
+            if (requestId == null) {
+                log.warn("BugFix#442: handMedication - 跳过 requestId 为 null 的删除请求");
+                continue;
+            }
+            iMedicationRequestService.removeById(requestId);
            // 删除已经产生的药品发放信息
            iMedicationDispenseService.deleteMedicationDispense(adviceSaveDto.getRequestId());
            // 🔧 Bug Fix #219: 删除费用项
-            Long requestId = adviceSaveDto.getRequestId();
            String serviceTable = CommonConstants.TableName.MED_MEDICATION_REQUEST;
            // 直接删除费用项
            iChargeItemService.deleteByServiceTableAndId(serviceTable, requestId);
@@ -1417,6 +1424,11 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
        log.info("BugFix#219: handDevice - 开始删除循环, deleteList.size={}", deleteList.size());
        for (AdviceSaveDto adviceSaveDto : deleteList) {
            Long requestId = adviceSaveDto.getRequestId();
+            // 🔧 Bug #442: 跳过 requestId 为 null 的记录，避免删除不存在的耗材请求
+            if (requestId == null) {
+                log.warn("BugFix#442: handDevice - 跳过 requestId 为 null 的删除请求");
+                continue;
+            }
            log.info("BugFix#219: handDevice - 删除开始: requestId={}", requestId);
            
            // 1. 删除耗材请求
@@ -1527,11 +1539,22 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
            deviceRequest.setRequesterId(adviceSaveDto.getPractitionerId()); // 开方医生
            deviceRequest.setOrgId(adviceSaveDto.getFounderOrgId());// 开方人科室
            deviceRequest.setReqAuthoredTime(curDate); // 请求开始时间
-            // 发放耗材房（若前端未传locationId，使用登录用户的科室作为默认值）
+            // 发放耗材房（若前端未传locationId，优先沿用已有DeviceRequest的performLocation，否则使用登录用户科室）
            Long locId = adviceSaveDto.getLocationId();
            if (locId == null) {
-                locId = SecurityUtils.getLoginUser().getOrgId();
-                log.info("耗材locationId为空，使用登录用户科室作为默认值: locationId={}", locId);
+                // 尝试从已有DeviceRequest获取原始的performLocation
+                if (adviceSaveDto.getRequestId() != null) {
+                    DeviceRequest existingDevice = iDeviceRequestService.getById(adviceSaveDto.getRequestId());
+                    if (existingDevice != null && existingDevice.getPerformLocation() != null) {
+                        locId = existingDevice.getPerformLocation();
+                        log.info("耗材locationId为空，使用已有DeviceRequest的performLocation: locationId={}", locId);
+                    }
+                }
+                // 如果已有记录也没有performLocation，则使用登录用户科室作为兜底
+                if (locId == null) {
+                    locId = SecurityUtils.getLoginUser().getOrgId();
+                    log.info("耗材locationId为空且无已有记录，使用登录用户科室作为默认值: locationId={}", locId);
+                }
            }
            deviceRequest.setPerformLocation(locId);
            deviceRequest.setEncounterId(adviceSaveDto.getEncounterId()); // 就诊id
@@ -1721,12 +1744,17 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
            }
        }
        for (AdviceSaveDto adviceSaveDto : deleteList) {
-            iServiceRequestService.removeById(adviceSaveDto.getRequestId());// 删除诊疗
+            Long requestId = adviceSaveDto.getRequestId();
+            // 🔧 Bug #442: 跳过 requestId 为 null 的记录，避免删除不存在的诊疗请求
+            if (requestId == null) {
+                log.warn("BugFix#442: handService - 跳过 requestId 为 null 的删除请求");
+                continue;
+            }
+            iServiceRequestService.removeById(requestId);// 删除诊疗
            iServiceRequestService.remove(
                    new LambdaQueryWrapper<ServiceRequest>().eq(ServiceRequest::getParentId,
-                            adviceSaveDto.getRequestId()));// 删除诊疗套餐对应的子项
+                            requestId));// 删除诊疗套餐对应的子项
            // 🔧 Bug Fix #219: 删除费用项
-            Long requestId = adviceSaveDto.getRequestId();
            String serviceTable = CommonConstants.TableName.WOR_SERVICE_REQUEST;
            // 直接删除费用项
            iChargeItemService.deleteByServiceTableAndId(serviceTable, requestId);
@@ -1783,8 +1811,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                log.info("handService - 自动补全founderOrgId: founderOrgId={}", adviceSaveDto.getFounderOrgId());
            }
            
-            // 🔧 Bug Fix #238: 诊疗项目执行科室非空校验
-            if (adviceSaveDto.getAdviceType() != null && adviceSaveDto.getAdviceType() == 3) {
+            // 🔧 Bug Fix #238/#454: 诊疗项目执行科室非空校验（删除操作跳过校验）
+            if (adviceSaveDto.getAdviceType() != null && adviceSaveDto.getAdviceType() == 3
+                    && !DbOpType.DELETE.getCode().equals(adviceSaveDto.getDbOpType())) {
                Long effectiveOrgId = adviceSaveDto.getEffectiveOrgId();
                if (effectiveOrgId == null) {
                    throw new ServiceException("诊疗项目必须选择执行科室");
@@ -1987,13 +2016,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 +2155,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/DoctorStationDiagnosisAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java
@@ -261,8 +261,10 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
            // 设置创建时间，避免数据库约束错误
            encounterDiagnosis.setCreateTime(new Date());
            iEncounterDiagnosisService.saveOrUpdate(encounterDiagnosis);
+            // 回写就诊诊断ID，供前端后续更新使用
+            saveDiagnosisChildParam.setEncounterDiagnosisId(encounterDiagnosis.getId());
        }
-        return R.ok(null, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"诊断"}));
+        return R.ok(saveDiagnosisParam, MessageUtils.createMessage(PromptMsgConstant.Common.M00002, new Object[] {"诊断"}));
    }


@@ -580,7 +582,11 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
    @Override
    public R<?> saveInfectiousDiseaseReport(InfectiousDiseaseReportDto infectiousDiseaseReportDto) {
        // 检查卡片编号唯一性（新增时检查，编辑时排除当前记录）
-        String cardNo = infectiousDiseaseReportDto.getCardNo().trim();
+        String cardNo = infectiousDiseaseReportDto.getCardNo();
+        if (cardNo == null || cardNo.trim().isEmpty()) {
+            return R.fail("卡片编号不能为空");
+        }
+        cardNo = cardNo.trim();
        LambdaQueryWrapper<InfectiousDiseaseReport> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.eq(InfectiousDiseaseReport::getCardNo, cardNo);
        long count = iInfectiousDiseaseReportService.count(queryWrapper);
--- 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,33 +300,68 @@ 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();
+        }
+        // 队列项 poolId/slotId 缺失时，通过 encounter.orderId → order_main.slot_id → adm_schedule_slot.pool_id 回退获取
+        if ((divPoolId == null || divSlotId == null) && encounter.getOrderId() != null) {
+            try {
+                Order order = iOrderService.getById(encounter.getOrderId());
+                if (order != null && order.getSlotId() != null) {
+                    ScheduleSlot slot = scheduleSlotMapper.selectById(order.getSlotId());
+                    if (slot != null) {
+                        divSlotId = slot.getId();
+                        divPoolId = slot.getPoolId();
+                    }
+                }
+            } catch (Exception e) {
+                log.warn("回退获取完诊div_log的pool_id/slot_id失败，encounterId={}", encounterId, e);
+            }
+        }
+
        // 如果队列项存在且未完成，更新队列状态为已完成
        // 使用排除法而非白名单：只要不是"已完成"就可以完诊，覆盖跳过、等待等非标准流转状态
+        // Bug #401：在更新前记录队列原始完成状态，用于判断是否需要写入 div_log
+        boolean queueWasAlreadyCompleted = queueItem != null
+            && TriageQueueStatus.COMPLETED.getValue().equals(queueItem.getStatus());
        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);
        }

        // 写入 div_log 审计日志（独立于队列项，确保每次完诊都生成记录）
-        try {
-            LoginUser loginUser = SecurityUtils.getLoginUser();
-            DivLog divLog = new DivLog()
-                .setPoolId(divPoolId)
-                .setSlotId(divSlotId)
-                .setOpUserId(loginUser != null ? loginUser.getUserId() : null)
-                .setAction("COMPLETE")
-                .setCreateTime(LocalDateTime.now())
-                .setUpdateAt(LocalDateTime.now())
-                .setCreatedAt(LocalDateTime.now());
-            divLogService.save(divLog);
-        } catch (Exception e) {
-            log.error("写入div_log审计日志失败", e);
+        // Bug #401：使用更新前记录的原始状态判断，避免自身更新后将状态改为 COMPLETED 导致误判为"已完成"
+        if (!queueWasAlreadyCompleted) {
+            try {
+                LoginUser loginUser = SecurityUtils.getLoginUser();
+                DivLog divLog = new DivLog()
+                    .setPoolId(divPoolId)
+                    .setSlotId(divSlotId)
+                    .setOpUserId(loginUser != null ? loginUser.getUserId() : null)
+                    .setAction("COMPLETE")
+                    .setCreateTime(LocalDateTime.now())
+                    .setUpdateAt(LocalDateTime.now())
+                    .setCreatedAt(LocalDateTime.now());
+                divLogService.save(divLog);
+            } catch (Exception e) {
+                log.error("写入div_log审计日志失败", e);
+            }
        }

        // 4. 更新状态、完成时间以及初复诊标识
--- 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/doctorstation/utils/AdviceUtils.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/utils/AdviceUtils.java
@@ -178,15 +178,26 @@ public class AdviceUtils {
        // 生命提示信息集合
        List<String> tipsList = new ArrayList<>();
        for (MedicationRequestUseExe medicationRequestUseExe : medUseExeList) {
-            // 聚合同一位置所有批次的库存总量
+            // 第一步：按 performLocation 匹配指定药房的库存
            List<AdviceInventoryDto> matchedInventories = adviceInventory.stream()
                    .filter(inventoryDto -> medicationRequestUseExe.getMedicationId().equals(inventoryDto.getItemId())
                    && CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(inventoryDto.getItemTable())
-                    && medicationRequestUseExe.getPerformLocation().equals(inventoryDto.getLocationId())
+                    && (medicationRequestUseExe.getPerformLocation() == null
+                        || medicationRequestUseExe.getPerformLocation().equals(inventoryDto.getLocationId()))
                    // 如果选择了具体的批次号,校验库存时需要加上批次号的匹配条件
                    && (StringUtils.isEmpty(medicationRequestUseExe.getLotNumber())
                    || medicationRequestUseExe.getLotNumber().equals(inventoryDto.getLotNumber())))
                    .collect(Collectors.toList());
+            // 第二步：如果指定药房没有匹配到库存，则放宽条件查询所有药房的库存
+            if (matchedInventories.isEmpty()) {
+                matchedInventories = adviceInventory.stream()
+                        .filter(inventoryDto -> medicationRequestUseExe.getMedicationId().equals(inventoryDto.getItemId())
+                        && CommonConstants.TableName.MED_MEDICATION_DEFINITION.equals(inventoryDto.getItemTable())
+                        // 如果选择了具体的批次号,校验库存时需要加上批次号的匹配条件
+                        && (StringUtils.isEmpty(medicationRequestUseExe.getLotNumber())
+                        || medicationRequestUseExe.getLotNumber().equals(inventoryDto.getLotNumber())))
+                        .collect(Collectors.toList());
+            }
            // 匹配到库存信息
            if (!matchedInventories.isEmpty()) {
                // 聚合所有批次的可用库存
--- 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,7 +341,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                && (DbOpType.INSERT.getCode().equals(e.getDbOpType()) || DbOpType.UPDATE.getCode().equals(e.getDbOpType())))
                .collect(Collectors.toList());

-        // 防重复保存：对新增医嘱进行去重，避免签发单条长期医嘱时产生重复记录
+        // 防重复保存：对所有医嘱进行去重（包括 INSERT 和 UPDATE 混合场景），避免签发单条医嘱时产生重复记录
        Set<String> longUniqueKeySet = new HashSet<>();
        List<RegAdviceSaveDto> longUniqueList = new ArrayList<>();
        for (RegAdviceSaveDto adviceSaveDto : longInsertOrUpdateList) {
@@ -351,10 +351,10 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                    + adviceSaveDto.getDose() + "_"
                    + adviceSaveDto.getMethodCode() + "_"
                    + adviceSaveDto.getRateCode();
-            if (DbOpType.INSERT.getCode().equals(adviceSaveDto.getDbOpType()) && longUniqueKeySet.contains(uniqueKey)) {
-                log.warn("防重复保存：检测到重复长期医嘱，跳过保存 - patientId={}, encounterId={}, adviceDefinitionId={}, dose={}",
+            if (longUniqueKeySet.contains(uniqueKey)) {
+                log.warn("防重复保存：检测到重复长期医嘱（跨操作类型），跳过 - patientId={}, encounterId={}, adviceDefinitionId={}, dbOpType={}",
                        adviceSaveDto.getPatientId(), adviceSaveDto.getEncounterId(),
-                        adviceSaveDto.getAdviceDefinitionId(), adviceSaveDto.getDose());
+                        adviceSaveDto.getAdviceDefinitionId(), adviceSaveDto.getDbOpType());
                continue;
            }
            longUniqueKeySet.add(uniqueKey);
@@ -429,7 +429,7 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                && (DbOpType.INSERT.getCode().equals(e.getDbOpType()) || DbOpType.UPDATE.getCode().equals(e.getDbOpType())))
                .collect(Collectors.toList());

-        // 防重复保存：对新增医嘱进行去重
+        // 防重复保存：对所有医嘱进行去重（包括 INSERT 和 UPDATE 混合场景），避免签发时产生重复记录
        Set<String> tempUniqueKeySet = new HashSet<>();
        List<RegAdviceSaveDto> tempUniqueList = new ArrayList<>();
        for (RegAdviceSaveDto adviceSaveDto : tempInsertOrUpdateList) {
@@ -439,10 +439,10 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                    + adviceSaveDto.getDose() + "_"
                    + adviceSaveDto.getMethodCode() + "_"
                    + adviceSaveDto.getRateCode();
-            if (DbOpType.INSERT.getCode().equals(adviceSaveDto.getDbOpType()) && tempUniqueKeySet.contains(uniqueKey)) {
-                log.warn("防重复保存：检测到重复临时医嘱，跳过保存 - patientId={}, encounterId={}, adviceDefinitionId={}, dose={}",
+            if (tempUniqueKeySet.contains(uniqueKey)) {
+                log.warn("防重复保存：检测到重复临时医嘱（跨操作类型），跳过 - patientId={}, encounterId={}, adviceDefinitionId={}, dbOpType={}",
                        adviceSaveDto.getPatientId(), adviceSaveDto.getEncounterId(),
-                        adviceSaveDto.getAdviceDefinitionId(), adviceSaveDto.getDose());
+                        adviceSaveDto.getAdviceDefinitionId(), adviceSaveDto.getDbOpType());
                continue;
            }
            tempUniqueKeySet.add(uniqueKey);
@@ -710,11 +710,21 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {

        // 批量更新诊疗医嘱状态（使用 update 确保状态字段必定更新）
        if (!processedRequestIds.isEmpty()) {
-            iServiceRequestService.update(null,
-                    new LambdaUpdateWrapper<ServiceRequest>()
-                            .set(ServiceRequest::getStatusEnum,
-                                    is_save ? RequestStatus.DRAFT.getValue() : RequestStatus.ACTIVE.getValue())
-                            .in(ServiceRequest::getId, processedRequestIds));
+            // 🔧 Bug #487 修复：签发时额外设置 authoredTime，确保签发时间被记录
+            if (is_sign) {
+                iServiceRequestService.update(null,
+                        new LambdaUpdateWrapper<ServiceRequest>()
+                                .set(ServiceRequest::getStatusEnum, RequestStatus.ACTIVE.getValue())
+                                .set(ServiceRequest::getAuthoredTime, authoredTime)
+                                .set(ServiceRequest::getSignCode, signCode)
+                                .in(ServiceRequest::getId, processedRequestIds));
+                log.info("签发诊疗医嘱成功，requestIds: {}, signCode: {}", processedRequestIds, signCode);
+            } else {
+                iServiceRequestService.update(null,
+                        new LambdaUpdateWrapper<ServiceRequest>()
+                                .set(ServiceRequest::getStatusEnum, RequestStatus.DRAFT.getValue())
+                                .in(ServiceRequest::getId, processedRequestIds));
+            }
        }
    }

--- 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;
@@ -75,12 +76,34 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R<?> saveRequestForm(RequestFormSaveDto requestFormSaveDto, String typeCode) {
+        // 申请单ID（前端空字符串可能反序列化为0L，需同时判0）
+        Long requestFormId = requestFormSaveDto.getRequestFormId();
+        boolean isEdit = requestFormId != null && requestFormId != 0L;
+
+        // 诊疗执行科室配置校验（必须在任何数据库操作之前）
+        List<ActivityOrganizationConfigDto> activityOrganizationConfig =
+            requestFormManageAppMapper.getActivityOrganizationConfig(typeCode);
+        if (activityOrganizationConfig.isEmpty()) {
+            throw new ServiceException("请先配置当前时间段的执行科室");
+        }
+
+        // 逐个校验activityList中的项目是否都配置了执行科室，避免部分通过后在循环中抛异常导致事务复杂化
+        List<ActivitySaveDto> activityList = requestFormSaveDto.getActivityList();
+        if (activityList != null && !activityList.isEmpty()) {
+            for (ActivitySaveDto activitySaveDto : activityList) {
+                Long positionId = activityOrganizationConfig.stream()
+                    .filter(dto -> activitySaveDto.getAdviceDefinitionId().equals(dto.getActivityDefinitionId()))
+                    .map(ActivityOrganizationConfigDto::getOrganizationId).findFirst().orElse(null);
+                if (positionId == null) {
+                    throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室");
+                }
+            }
+        }
+
        // 诊疗处方号
        String prescriptionNo;
-        // 申请单ID
-        Long requestFormId = requestFormSaveDto.getRequestFormId();
        // 编辑场景
-        if (requestFormId != null) {
+        if (isEdit) {
            RequestForm requestFormInfo = iRequestFormService.getById(requestFormId);
            prescriptionNo = requestFormInfo.getPrescriptionNo();
            // 该申请单存在的待发送医嘱个数
@@ -91,8 +114,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);
        }

        // 当前时间
@@ -122,7 +147,7 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
        iRequestFormService.saveOrUpdate(requestForm);

        // 编辑场景时,先删除掉原有诊疗项目及账单再新增
-        if (requestFormId != null) {
+        if (isEdit) {
            List<Long> serviceRequestIds = iServiceRequestService
                .list(new LambdaQueryWrapper<ServiceRequest>().eq(ServiceRequest::getPrescriptionNo, prescriptionNo))
                .stream().map(ServiceRequest::getId).collect(Collectors.toList());
@@ -136,15 +161,7 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer

        ServiceRequest serviceRequest;
        ChargeItem chargeItem;
-        // 诊疗集合
-        List<ActivitySaveDto> activityList = requestFormSaveDto.getActivityList();
        log.info("保存申请单，typeCode={}, activityListSize={}, encounterId={}", typeCode, activityList != null ? activityList.size() : 0, encounterId);
-        // 诊疗执行科室配置
-        List<ActivityOrganizationConfigDto> activityOrganizationConfig =
-            requestFormManageAppMapper.getActivityOrganizationConfig(typeCode);
-        if (activityOrganizationConfig.isEmpty()) {
-            throw new ServiceException("请先配置当前时间段的执行科室");
-        }

        for (ActivitySaveDto activitySaveDto : activityList) {
            serviceRequest = new ServiceRequest();
@@ -162,15 +179,11 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
            serviceRequest.setEncounterId(encounterId); // 就诊id
            serviceRequest.setAuthoredTime(curDate); // 请求签发时间

-            // 优先使用前端传来的 positionId（用户手动选择的发往科室），未传时从配置表查找
-            Long positionId = activitySaveDto.getPositionId();
+            Long positionId = activityOrganizationConfig.stream()
+                .filter(dto -> activitySaveDto.getAdviceDefinitionId().equals(dto.getActivityDefinitionId()))
+                .map(ActivityOrganizationConfigDto::getOrganizationId).findFirst().orElse(null);
            if (positionId == null) {
-                positionId = activityOrganizationConfig.stream()
-                    .filter(dto -> activitySaveDto.getAdviceDefinitionId().equals(dto.getActivityDefinitionId()))
-                    .map(ActivityOrganizationConfigDto::getOrganizationId).findFirst().orElse(null);
-                if (positionId == null) {
-                    throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室");
-                }
+                throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室");
            }
            serviceRequest.setOrgId(positionId); // 执行科室

--- 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;

 /**
@@ -81,14 +82,23 @@ public class RequestFormManageController {
     * 查询检查申请单
     *
     * @param encounterId 就诊id
+     * @param startDate 开始日期（可选，格式：yyyy-MM-dd）
+     * @param endDate 结束日期（可选，格式：yyyy-MM-dd）
+     * @param status 单据状态（可选）
+     * @param keyword 关键字（可选，申请单号/检查项目名称模糊匹配）
     * @return 检查申请单
     */
    @GetMapping(value = "/get-check")
-    public R<?> getCheckRequestForm(@RequestParam(required = false) Long encounterId) {
+    public R<?> getCheckRequestForm(
+            @RequestParam(required = false) Long encounterId,
+            @RequestParam(required = false) String startDate,
+            @RequestParam(required = false) String endDate,
+            @RequestParam(required = false) String status,
+            @RequestParam(required = false) String keyword) {
        if (encounterId == null) {
            return R.fail("就诊ID不能为空");
        }
-        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.TEST.getCode()));
+        return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.TEST.getCode(), startDate, endDate, status, keyword));
    }

    /**
@@ -142,6 +152,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, ActivityDefCategory.PROCEDURE.getCode(), 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/java/com/openhis/web/tencentJH/dto/CurrentDayEncounterTencentDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/tencentJH/dto/CurrentDayEncounterTencentDto.java
@@ -138,4 +138,12 @@ public class CurrentDayEncounterTencentDto {
     */
    private String englishName;

+    /** 号源池ID（用于分诊队列 div_log 审计日志） */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long poolId;
+
+    /** 号源槽位ID（用于分诊队列 div_log 审计日志） */
+    @JsonSerialize(using = ToStringSerializer.class)
+    private Long slotId;
+
 }
--- 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
@@ -89,15 +89,12 @@
            cs.apply_doctor_name AS apply_doctor_name,
            drf.create_time AS apply_time,
            os.surgery_nature AS surgeryType,
-            fc.contract_name AS feeType,
+            os.fee_type AS feeType,
            COALESCE(pi.identifier_no, ap.bus_no, '') AS identifierNo
        FROM op_schedule os
        LEFT JOIN adm_patient ap ON os.patient_id = ap.id
        INNER JOIN cli_surgery cs ON os.oper_code = cs.surgery_no AND cs.delete_flag = '0'
        LEFT JOIN adm_organization o ON cs.org_id = o.id
-        LEFT JOIN adm_encounter ae ON ae.id = cs.encounter_id AND ae.delete_flag = '0'
-        LEFT JOIN adm_account aa ON aa.encounter_id = ae.id AND aa.delete_flag = '0'
-        LEFT JOIN fin_contract fc ON fc.bus_no = aa.contract_no AND fc.delete_flag = '0'
        LEFT JOIN doc_request_form drf ON drf.prescription_no=cs.surgery_no
        LEFT JOIN (
            SELECT patient_id, identifier_no
--- 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
@@ -239,7 +239,7 @@
                NULL AS activity_type_dictText,
                -- 前端"包装单位"列：显示使用单位（permitted_unit_code）
                T1.permitted_unit_code AS unit_code,
-                '' AS min_unit_code,
+                T1.permitted_unit_code AS min_unit_code,
                '' AS volume,
                '' AS method_code,
                '' AS rate_code,
@@ -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>
@@ -580,6 +583,9 @@
        LEFT JOIN adm_location AS AL ON AL.id = DR.perform_location AND AL.delete_flag = '0'
        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})
+          </if>
          <if test="historyFlag == '0'.toString()">
              AND CI.encounter_id = #{encounterId}
          </if>
@@ -695,6 +701,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/AdviceProcessAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml
@@ -155,7 +155,7 @@
           ii.performer_check_id,
           ii.category_code,
           ii.dispense_status
-    FROM (( SELECT T1.encounter_id,
+    FROM (( SELECT DISTINCT T1.encounter_id,
                   T1.tenant_id,
                   #{medMedicationRequest} AS advice_table,
                   T1.id AS request_id,
@@ -293,7 +293,7 @@
                     T1.sort_number,
                     T1.group_id )
          UNION
-          ( SELECT T1.encounter_id,
+          ( SELECT DISTINCT T1.encounter_id,
                   T1.tenant_id,
                   #{worServiceRequest} AS advice_table,
                   T1.id AS request_id,
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml
@@ -288,7 +288,7 @@
        AND T1.refund_device_id IS NULL
        ORDER BY T1.status_enum)
        UNION ALL
-        (SELECT CASE WHEN T1.category_enum = 4 THEN 6 ELSE COALESCE(T1.category_enum, 3) END AS advice_type,
+        (SELECT CASE WHEN T1.category_enum = 4 THEN 6 ELSE 3 END AS advice_type,
        T1.id AS request_id,
        T1.id || '-3' AS unique_key,
        T1.requester_id AS requester_id,
@@ -373,4 +373,4 @@
        </if>
    </select>

-</mapper>
+</mapper>
--- 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
@@ -13,16 +13,7 @@
               drf.requester_id,
               drf.create_time,
               ap.NAME AS patient_name,
-               CASE MIN(wsr.status_enum)
-                   WHEN 1 THEN 0
-                   WHEN 2 THEN 1
-                   WHEN 3 THEN 4
-                   WHEN 4 THEN 4
-                   WHEN 5 THEN 5
-                   WHEN 6 THEN 5
-                   WHEN 7 THEN 5
-                   ELSE NULL
-               END AS status
+               drf.status
        FROM doc_request_form AS drf
                 LEFT JOIN adm_encounter AS ae ON ae.ID = drf.encounter_id
            AND ae.delete_flag = '0'
@@ -40,16 +31,7 @@
              AND drf.create_time &lt;= (#{endDate}::date + INTERVAL '1 day' - INTERVAL '1 second')
          </if>
          <if test="status != null and status != ''">
-              AND CASE MIN(wsr.status_enum)
-                      WHEN 1 THEN 0
-                      WHEN 2 THEN 1
-                      WHEN 3 THEN 4
-                      WHEN 4 THEN 4
-                      WHEN 5 THEN 5
-                      WHEN 6 THEN 5
-                      WHEN 7 THEN 5
-                      ELSE NULL
-                  END = #{status}::integer
+              AND drf.status = #{status}::integer
          </if>
          <if test="keyword != null and keyword != ''">
              AND (drf.prescription_no ILIKE '%' || #{keyword} || '%'
@@ -161,6 +143,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-application/src/main/resources/mapper/tencentJH/TencentAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/tencentJH/TencentAppMapper.xml
@@ -27,7 +27,9 @@
               T9.payment_id,
               T9.picture_url,
               T9.birth_date,
-               t9.english_name
+               t9.english_name,
+               t9.slot_id,
+               t9.pool_id
        from (
                 SELECT T1.tenant_id       AS tenant_id,
                        T1.id              AS encounter_id,
@@ -51,7 +53,9 @@
                        T13.id             AS payment_id,
                        ai.picture_url     AS picture_url,
                        T8.birth_date      AS birth_date,
-                        tx.staff_english_name AS english_name
+                        tx.staff_english_name AS english_name,
+                        om_slot.slot_id    AS slot_id,
+                        om_slot.pool_id    AS pool_id
                 FROM adm_encounter AS T1
                          LEFT JOIN adm_organization AS T2 ON T1.organization_id = T2.ID AND T2.delete_flag = '0'
                          LEFT JOIN adm_healthcare_service AS T3 ON T1.service_type_id = T3.ID AND T3.delete_flag = '0'
@@ -91,6 +95,8 @@
                 AND T13.status_enum = ${paymentStatus}
                     LEFT JOIN adm_invoice AS ai
                 ON ai.reconciliation_id = T13.id AND ai.delete_flag = '0'
+                 LEFT JOIN order_main AS om ON T1.order_id = om.id AND om.delete_flag = '0'
+                 LEFT JOIN adm_schedule_slot AS om_slot ON om.slot_id = om_slot.id
                 WHERE T1.delete_flag = '0'
                   AND T1.class_enum = #{classEnum}
                   AND T10.context_enum = #{register}
--- 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-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/domain/OpSchedule.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/surgicalschedule/domain/OpSchedule.java
@@ -193,6 +193,9 @@ public class OpSchedule extends HisBaseEntity {
    /** 外请专家姓名 */
    private String externalExpertName;

+    /** 费用类别 */
+    private String feeType;
+
    /** 备注信息 */
    private String remark;

--- a/openhis-server-new/sql/20260115_add_table_triage_queue_item.sql
+++ b/openhis-server-new/sql/20260115_add_table_triage_queue_item.sql
@@ -13,7 +13,7 @@ CREATE TABLE IF NOT EXISTS triage_queue_item (
    patient_name     VARCHAR(255),
    healthcare_name  VARCHAR(255),
    practitioner_name VARCHAR(255),
-    status           VARCHAR(50)  NOT NULL, -- WAITING/CALLING/SKIPPED/COMPLETED
+    status           INTEGER      NOT NULL DEFAULT 0, -- 分诊队列状态: 0=WAITING(等待), 10=CALLING(叫号中), 20=IN_CLINIC(诊中), 30=COMPLETED(已完成), 40=SKIPPED(已跳过)
    queue_order      INTEGER      NOT NULL,
    create_time      TIMESTAMP,
    update_time      TIMESTAMP,
--- a/openhis-server-new/sql/bug_400_fix_triage_queue_item_status_type.sql
+++ b/openhis-server-new/sql/bug_400_fix_triage_queue_item_status_type.sql
@@ -0,0 +1,30 @@
+-- Bug #400 修复：triage_queue_item.status 字段类型修正
+-- 原 DDL 将 status 定义为 VARCHAR(50)，但 Java 实体 TriageQueueItem.status 为 Integer 类型，
+-- 应用层使用 TriageQueueStatus 枚举值（0/10/20/30/40）写入，类型不匹配导致 MyBatis-Plus
+-- 无法正确映射 status 字段，完诊时 status 更新为 30 失败。
+--
+-- 注意：必须在后端实际连接的 schema 中执行（dev=hisdev, test=histest, prd=hisprd）
+-- 执行前请先确认：SET search_path TO hisdev; （或对应的 schema）
+
+-- 1. 先将已有的字符串值转换为对应的整数值
+-- 如果之前写入的是枚举 code（如 'waiting'、'completed'），需要先转换
+UPDATE triage_queue_item
+SET status = CASE
+    WHEN status IN ('0', 'waiting', 'WAITING') THEN 0
+    WHEN status IN ('10', 'calling', 'CALLING') THEN 10
+    WHEN status IN ('20', 'in-clinic', 'IN_CLINIC', 'in-clinic') THEN 20
+    WHEN status IN ('30', 'completed', 'COMPLETED') THEN 30
+    WHEN status IN ('40', 'skipped', 'SKIPPED') THEN 40
+    WHEN status IN ('50', 'refunded', 'REFUNDED') THEN 50
+    WHEN status IN ('60', 'follow', 'FOLLOW') THEN 60
+    ELSE 0
+END
+WHERE status IS NOT NULL AND status !~ '^[0-9]+$';
+
+-- 2. 修改字段类型为 INTEGER
+ALTER TABLE triage_queue_item
+    ALTER COLUMN status TYPE INTEGER USING status::INTEGER;
+
+-- 3. 设置默认值
+ALTER TABLE triage_queue_item
+    ALTER COLUMN status SET DEFAULT 0;
--- 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/basicmanage/implementDepartment/index.vue
+++ b/openhis-ui-vue3/src/views/basicmanage/implementDepartment/index.vue
@@ -226,8 +226,14 @@ function getList() {
  getDiagnosisTreatmentList(queryParams.value).then((res) => {
    loading.value = false;
    catagoryList.value = res.data.records.map(record => {
-      // 为每一行初始化 filteredOptions，确保显示框能正确显示项目名称
      const filteredOptions = allImplementDepartmentList.value.slice(0, 100);
+      // 确保后端返回的项目名称选项存在于 filteredOptions 中，避免 el-select 因找不到选项而回显为 ID
+      if (record.activityDefinitionId && !filteredOptions.some(o => o.value === record.activityDefinitionId)) {
+        filteredOptions.push({
+          value: record.activityDefinitionId,
+          label: record.activityDefinitionId_dictText || record.activityDefinitionId
+        });
+      }
      return {
        ...record,
        loading: false,
--- a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
@@ -372,7 +372,6 @@ import {
 } from './diagnosistreatment';
 import PopoverList from '@/components/OpenHis/popoverList/index.vue';
 import medicineList from './medicineList.vue';
-import MedicineList from '../components/medicineList.vue';
 import {getCurrentInstance, nextTick, watch} from 'vue';

 const { proxy } = getCurrentInstance();
@@ -467,9 +466,9 @@ function calculateTotalPrice() {
  try {
    let sum = 0;
    treatmentItems.value.forEach((item) => {
-      if (item.adviceDefinitionId && item.retailPrice && item.childrenRequestNum) {
-        const price = parseFloat(item.retailPrice) || 0;
-        const count = parseInt(item.childrenRequestNum) || 0;
+      if (item.adviceDefinitionId && item.adviceDefinitionId !== '') {
+        const price = Number(item.retailPrice) || 0;
+        const count = Number(item.childrenRequestNum) || 0;
        sum += price * count;
      }
    });
@@ -479,7 +478,10 @@ function calculateTotalPrice() {
      (item) => item.adviceDefinitionId && item.adviceDefinitionId !== ''
    );
    if (hasValidItem) {
-      form.value.retailPrice = parseFloat(totalPrice.value);
+      // 使用 nextTick 确保总价更新后零售价才更新，避免 Vue 响应式时序问题
+      nextTick(() => {
+        form.value.retailPrice = parseFloat(totalPrice.value) || 0;
+      });
    } else {
      form.value.retailPrice = undefined;
    }
@@ -565,15 +567,16 @@ function edit() {
    form.value.pricingFlag = 1;
  }

-  // 处理子项数据，确保包含retailPrice字段
+  // 处理子项数据，确保包含retailPrice和name字段
  if (props.item.childrenJson) {
    const parsedItems = JSON.parse(props.item.childrenJson);
    treatmentItems.value = parsedItems.map((item) => ({
      ...item,
+      name: item.name || '',
      retailPrice: item.retailPrice || 0,
    }));
  } else {
-    treatmentItems.value = [{ adviceDefinitionId: '', childrenRequestNum: 1, retailPrice: 0 }];
+    treatmentItems.value = [{ adviceDefinitionId: '', childrenRequestNum: 1, name: '', retailPrice: 0 }];
  }
  form.value.permittedUnitCode = form.value.permittedUnitCode
    ? form.value.permittedUnitCode.toString()
@@ -618,7 +621,7 @@ function reset() {
    chrgitmLv: undefined, //医保等级
    pricingFlag: 1, // 划价标记，默认允许划价
  };
-  treatmentItems.value = [{ adviceDefinitionId: '', childrenRequestNum: 1, retailPrice: 0 }];
+  treatmentItems.value = [{ adviceDefinitionId: '', childrenRequestNum: 1, name: '', retailPrice: 0 }];
  totalPrice.value = '0.00';
  proxy.resetForm('diagnosisTreatmentRef');
 }
@@ -760,7 +763,10 @@ function selectRow(row, index) {
  treatmentItems.value[index].adviceDefinitionId = row.id;
  treatmentItems.value[index].retailPrice = row.retailPrice || 0;
  medicineSearchKey.value = '';
-  calculateTotalPrice();
+  // 使用 nextTick 确保 DOM 更新后再计算总价
+  nextTick(() => {
+    calculateTotalPrice();
+  });
 }

 // 清空诊疗子项
--- a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/medicineList.vue
+++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/medicineList.vue
@@ -36,6 +36,7 @@ const emit = defineEmits(['selectRow']);
 const diagnosisTreatmentList = ref([]); // 原始数据列表
 const filteredList = ref([]); // 过滤后的数据列表
 const hasLoaded = ref(false); // 标记是否已加载数据
+const isLoading = ref(false); // 标记是否正在加载