Fix Bug #516 : [住院医生站-临床医嘱-检验申请] 检验申请单手动填写的"发往科室"与生成的医嘱执行科室不一致

根因: 前端 projectWithDepartment 函数缺少 type 参数声明，导致用户手动选择的发往科室被清空；后端完全忽略前端传来的 positionId，始终使用配置表中的默认科室。修复: 1) 前端添加 type 参数 + 提交前保存用户选择并在校验后恢复；2) 后端优先使用前端 positionId，配置表仅作为兜底。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Fix Bug #537 : [住院医生工作站] 屏蔽汇总发药申请标签页——移除医生站中护士职能的汇总发药申请Tab（同时清理远程分支合并遗留的markdown代码块污染）
2026-05-17 13:15:08 +08:00 · 2026-05-17 13:12:05 +08:00 · 2026-05-13 01:05:18 +08:00 · 2026-05-13 01:04:27 +08:00 · 2026-05-13 01:03:24 +08:00 · 2026-05-13 00:16:10 +08:00
27 changed files with 93 additions and 398 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,13 +2,9 @@ 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.*;
@@ -30,7 +26,6 @@ import java.util.Map;
 public class SurgicalScheduleController {

    private final ISurgicalScheduleAppService surgicalScheduleAppService;
-    private final IRequestFormManageAppService requestFormManageAppService;

    /**
     * 分页查询手术安排列表
@@ -92,27 +87,6 @@ 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,16 +59,6 @@ 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,25 +1987,13 @@ 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(),
-                sourceEnum, sourceBillNo);
-        // 手术计费场景：sourceBillNo 不为空时，只保留诊疗请求（3/6），过滤掉药品（1）和耗材（2）
-        if (sourceBillNo != null && !sourceBillNo.isEmpty()) {
-            requestBaseInfo.removeIf(dto -> dto.getAdviceType() != null
-                    && (dto.getAdviceType() == 1 || dto.getAdviceType() == 2));
-        }
+                GenerateSource.DOCTOR_PRESCRIPTION.getValue());
        for (RequestBaseDto requestBaseDto : requestBaseInfo) {
            // 请求状态
            requestBaseDto
@@ -2126,7 +2114,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(), null);
+                GenerateSource.DOCTOR_PRESCRIPTION.getValue());
        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,8 +274,27 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
            return R.fail("非就诊中患者不能完诊");
        }

-        // 2. 查找队列项（限定当天，避免复诊患者匹配到历史队列记录）
+        // 2. 获取 pool_id 和 slot_id：从 encounter → order_main → adm_schedule_slot 链路获取
+        //    确保 div_log 中的值与排班主表一致，不依赖 triage_queue_item（队列项可能不存在或值错误）
        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)
@@ -300,41 +319,14 @@ 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);
-            // 使用 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());
-            }
+            queueItem.setStatus(TriageQueueStatus.COMPLETED.getValue());
+            queueItem.setUpdateTime(nowLocal);
+            triageQueueItemService.updateById(queueItem);
        } 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,16 +112,11 @@ 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,
-            @RequestParam(required = false) Integer generateSourceEnum,
-            @RequestParam(required = false) String sourceBillNo) {
-        return iDoctorStationAdviceAppService.getRequestBaseInfo(encounterId, generateSourceEnum, sourceBillNo);
+    public R<?> getRequestBaseInfo(@RequestParam(required = false) Long encounterId) {
+        return iDoctorStationAdviceAppService.getRequestBaseInfo(encounterId);
    }

    /**
--- 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,8 +122,7 @@ 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("sourceBillNo") String sourceBillNo);
+            @Param("historyFlag") String historyFlag, @Param("generateSourceEnum") Integer generateSourceEnum);

    /**
     * 查询就诊费用性质
--- 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,7 +31,6 @@ 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;
@@ -92,10 +91,8 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
                return R.fail("无待签发的医嘱,该申请单不可编辑");
            }
        } else {
-            // 检查申请单号：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);
+            // 诊疗处方号
+            prescriptionNo = assignSeqUtil.getSeq(AssignSeqEnum.ACTIVITY_PSYCHOTROPIC_NO.getPrefix(), 8);
        }

        // 当前时间
@@ -165,11 +162,15 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
            serviceRequest.setEncounterId(encounterId); // 就诊id
            serviceRequest.setAuthoredTime(curDate); // 请求签发时间

-            Long positionId = activityOrganizationConfig.stream()
-                .filter(dto -> activitySaveDto.getAdviceDefinitionId().equals(dto.getActivityDefinitionId()))
-                .map(ActivityOrganizationConfigDto::getOrganizationId).findFirst().orElse(null);
+            // 优先使用前端传来的 positionId（用户手动选择的发往科室），未传时从配置表查找
+            Long positionId = activitySaveDto.getPositionId();
            if (positionId == null) {
-                throw new ServiceException(activitySaveDto.getAdviceDefinitionName() + "未配置当前时间段的执行科室");
+                positionId = activityOrganizationConfig.stream()
+                    .filter(dto -> activitySaveDto.getAdviceDefinitionId().equals(dto.getActivityDefinitionId()))
+                    .map(ActivityOrganizationConfigDto::getOrganizationId).findFirst().orElse(null);
+                if (positionId == null) {
+                    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,7 +16,6 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

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

 /**
@@ -143,32 +142,6 @@ 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,10 +14,6 @@ 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,9 +527,6 @@
        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>
@@ -698,9 +695,6 @@
        -- 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/regdoctorstation/RequestFormManageAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml
@@ -161,9 +161,6 @@
                <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,10 +270,6 @@ public enum AssignSeqEnum {
     * 诊疗处方号
     */
    ACTIVITY_PSYCHOTROPIC_NO("62", "诊疗处方号", "PAR"),
-    /**
-     * 检查申请单号（住院）
-     */
-    CHECK_APPLY_NO("72", "检查申请单号", "JCZ"),
    /**
     * b 病历文书
     */
--- 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           INTEGER      NOT NULL DEFAULT 0, -- 分诊队列状态: 0=WAITING(等待), 10=CALLING(叫号中), 20=IN_CLINIC(诊中), 30=COMPLETED(已完成), 40=SKIPPED(已跳过)
+    status           VARCHAR(50)  NOT NULL, -- WAITING/CALLING/SKIPPED/COMPLETED
    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
@@ -1,30 +0,0 @@
-- 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/package/list',
+    url: '/system/check-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,17 +58,10 @@ export function singOut(data) {
 /**
 * 获取患者本次就诊处方
 */
-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()
+export function getPrescriptionList(encounterId) {
+  // Add timestamp to bypass browser caching and ensure fresh data is loaded
  return request({
-    url: url,
+    url: '/doctor-station/advice/request-base-info?encounterId=' + encounterId + '&t=' + Date.now(),
    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,14 +381,6 @@ 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 防重复提交锁
@@ -476,11 +468,7 @@ watch(

 function getListInfo(addNewRow) {
  isAdding.value = false;
-  getPrescriptionList(
-    props.patientInfo.encounterId,
-    props.generateSourceEnum ?? undefined,
-    props.sourceBillNo ?? undefined,
-  ).then((res) => {
+  getPrescriptionList(props.patientInfo.encounterId).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,11 +1318,7 @@ async function show(diagnosisData) {
    // 系统关联信息
    encounterId: patientInfo.encounterId || '', // 就诊ID
    patientId: patientInfo.patientId || '', // 患者ID
-    diagnosisId: (diagnosisData?.conditionId != null && diagnosisData?.conditionId !== '')
-      ? diagnosisData.conditionId
-      : (diagnosisData?.definitionId != null && diagnosisData?.definitionId !== '')
-        ? diagnosisData.definitionId
-        : '', // 诊断ID
+    diagnosisId: diagnosisData?.conditionId || diagnosisData?.definitionId || '', // 诊断ID
  };

  // 更新selectedDiseases数组
@@ -1377,7 +1373,7 @@ async function buildSubmitData() {
  const submitData = {
    cardNo: formData.cardNo,
    visitId: props.patientInfo?.encounterId || formData.encounterId || null,
-    diagId: formData.diagnosisId ? Number(formData.diagnosisId) : null,
+    diagId: formData.diagnosisId || null,
    patId: formData.patientId || null,
    idType: 1, // 默认身份证
    idNo: formData.idNo,
@@ -1543,12 +1539,6 @@ 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,21 +402,6 @@
                        <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>
@@ -434,7 +419,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, listCheckPackage } from '@/api/system/checkType';
+import { listCheckMethod, searchCheckMethod } from '@/api/system/checkType';
 import { getEncounterDiagnosis } from '../api.js';

 const props = defineProps({
@@ -460,7 +445,7 @@ async function loadPackageDetails(row, treeNode, resolve) {
  }
  try {
    const res = await request({
-      url: `/system/package/${row.packageId}/details`,
+      url: `/exam/package/${row.packageId}/details`,
      method: 'get'
    });
    if (res.code === 200 && res.data) {
@@ -489,7 +474,7 @@ async function loadPackageDetailsForItem(item) {
  }
  try {
    const res = await request({
-      url: `/system/package/${item.packageId}/details`,
+      url: `/exam/package/${item.packageId}/details`,
      method: 'get'
    });
    if (res.code === 200 && res.data) {
@@ -697,7 +682,6 @@ 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
      }));
@@ -1008,15 +992,14 @@ function handleRowClick(row) {
  selectedItems.value = [];
  activeDetailTab.value = 'applyForm';
  request({ url: `/exam/apply/${row.applyNo}`, method: 'get' }).then(async res => {
-    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)) {
+    // Axios interceptor already returns res.data (AjaxResult body: {code, data, items})
+    // Don't double-unwrap: if res has 'code', use res directly; otherwise fall back to res.data
+    const d = (res && res.code !== undefined) ? res : (res.data || res);
+    if (d.data) Object.assign(form, d.data);
+    if (d.items && Array.isArray(d.items)) {
      try {
        // 为每个项目加载检查方法
-        const itemsWithMethods = await Promise.all(rawItems.map(async m => {
+        const itemsWithMethods = await Promise.all(d.items.map(async m => {
          const item = {
            id: m.itemCode, name: m.itemName,
            price: m.itemFee || 0, quantity: 1,
@@ -1044,18 +1027,12 @@ 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) {
@@ -1116,13 +1093,6 @@ 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;
    }
@@ -1137,7 +1107,7 @@ async function handleMethodSelect(checked, method, cat) {
      }
    }

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

    // 自动回填执行科室
    if (selectedItems.value.length === 1 && cat?.performDeptName) {
@@ -1203,7 +1166,6 @@ 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修复: 服务费
          }));
@@ -1268,68 +1230,21 @@ async function toggleItemExpand(item) {
 }

 // Bug #384修复: 勾选框选择检查方法（单选逻辑）
-async function selectMethodCheckbox(checked, item, method) {
+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() {
  // 找到第一个有选中检查方法的项目
@@ -1735,29 +1650,6 @@ 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,17 +44,6 @@ 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="申请者">{{
--- 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
@@ -225,9 +225,13 @@ const submit = () => {
  if (transferValue.value.length == 0) {
    return proxy.$message.error('请选择申请单');
  }
+  // 🔧 Bug #516: 捕获用户手动选择的发往科室，避免 projectWithDepartment 将其覆盖为默认科室
+  const savedTargetDept = form.targetDepartment;
  if (!projectWithDepartment(transferValue.value, 2)) {
    return;
  }
+  // 用户手动选择的发往科室优先于项目默认执行科室
+  const targetDept = savedTargetDept || form.targetDepartment;
  let applicationListAllFilter = applicationListAll.value.filter((item) => {
    return transferValue.value.includes(item.adviceDefinitionId);
  });
@@ -238,7 +242,7 @@ const submit = () => {
      unitCode: item.priceList[0].unitCode /** 请求单位编码 */,
      unitPrice: item.priceList[0].price /** 单价 */,
      totalPrice: item.priceList[0].price /** 总价 */,
-      positionId: item.positionId || form.targetDepartment, //执行科室id，未配置时使用用户手动选择的科室
+      positionId: targetDept || item.positionId, // 用户指定发往科室优先于项目默认执行科室
      ybClassEnum: item.ybClassEnum, //类别医保编码
      conditionId: item.conditionId, //诊断ID
      encounterDiagnosisId: item.encounterDiagnosisId, //就诊诊断id
--- 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: applicationListAllFilter.map(item => item.adviceName).join('、'),
+    name: '检查申请单',
    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,7 +801,9 @@ function clickRowDb(row, column, event) {
    return;
  }
  row.showPopover = false;
-  // 仅”待签发(statusEnum==1)”允许编辑；”已签发(statusEnum==2)”及之后状态不允许编辑
+  // 允许所有 statusEnum==1 的医嘱进入编辑：
+  // 1. 新医嘱（无 requestId）：待保存
+  // 2. 护士退回医嘱（有 requestId）：退回后状态重置为 DRAFT(1)，需允许医生编辑修改后重新签发
  if (row.statusEnum == 1) {
    // 确保治疗类型为字符串，方便与单选框 label 对齐，默认为长期医嘱('1')
    row.therapyEnum = String(row.therapyEnum ?? '1');
@@ -1210,7 +1212,7 @@ function handleSave() {
          isSaving.value = false;
          getListInfo(false);
          bindMethod.value = {};
-          nextId.value = 1;
+          nextId.value == 1;
        } else {
          proxy.$modal.msgError(res.message);
          isSaving.value = false;
@@ -1376,21 +1378,13 @@ function handleSaveSign(row, index) {
    savePrescription({ regAdviceSaveList: [row] }).then((res) => {
      if (res.code === 200) {
        proxy.$modal.msgSuccess('保存成功');
-        nextId.value = 1;
+        nextId.value == 1;
      }
    });
  } else {
-    // 新增行：调用保存接口将数据持久化到后端
-    row.dbOpType = '1';
-    savePrescription({ regAdviceSaveList: [row] }).then((res) => {
-      if (res.code === 200) {
-        proxy.$modal.msgSuccess('保存成功');
-        nextId.value = 1;
-        // 保存成功后刷新列表，确保后端返回的数据带 requestId
-        getListInfo(false);
-      }
-    });
-    // 不需要再添加空行，保存成功后由 getListInfo 处理
+    if (prescriptionList.value[0].adviceName) {
+      handleAddPrescription();
+    }
  }
  adviceQueryParams.value.adviceType = undefined;
 }
@@ -1437,13 +1431,12 @@ function handleSaveBatch() {
          if (row) row.isEdit = false;
        });
        getListInfo(false);
-        nextId.value = 1;
+        nextId.value == 1;
        isSaving.value = false;
      }
    })
    .catch((error) => {
      isSaving.value = false;
-      proxy.$modal.msgError(error?.msg || '保存失败，请重试');
    });
 }

--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/index.vue
@@ -19,14 +19,10 @@
            <el-tab-pane label="检验申请" name="test">
              <TestApplication ref="testApplicationRef" :show-status-column="true" />
            </el-tab-pane>
-```vue
            <el-tab-pane label="检查申请" name="examine">
              <ExamineApplication ref="examineApplicationRef" />
            </el-tab-pane>
-```
-            <el-tab-pane label="汇总发药申请" name="summaryDrug">
-              <SummaryDrugApplication ref="summaryDrugApplicationRef" />
-            </el-tab-pane>
+            <!-- 汇总发药申请属于护士站职能，医生站不显示 -->
            <el-tab-pane label="手术申请" name="surgery">
              <SurgeryApplication ref="surgeryApplicationRef" />
            </el-tab-pane>
--- a/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/transferInDialog.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/inOut/components/transferInDialog.vue
@@ -453,10 +453,6 @@ 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,9 +829,7 @@
            </el-descriptions>
          </div>
          <div style="padding: 10px">
-            <prescriptionlist v-if="showChargeDialog" :patientInfo="chargePatientInfo" ref="prescriptionRef"
-              :generateSourceEnum="1"
-              :sourceBillNo="chargePatientInfo.sourceBillNo" />
+            <prescriptionlist v-if="showChargeDialog" :patientInfo="chargePatientInfo" ref="prescriptionRef" />
            <div class="overlay" v-if="disabled"></div>
          </div>
        </div>
@@ -874,17 +872,11 @@ 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 { getSurgeryPage} from '@/views/inpatientDoctor/home/components/applicationShow/api.js'
+import { getSurgery} 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'
@@ -1396,8 +1388,8 @@ async function handleChargeCharge(row) {
    orgId: userStore.organizationId || userStore.orgId || userStore.tenantId || 1,
    // 添加账户ID
    accountId: accountId,
-    // 添加手术单号用于关联对应的手术医嘱
-    sourceBillNo: row.operCode,
+    // 添加手术申请单号用于追溯
+    sourceBillNo: row.applyId,
    //添加计费标志手术计费
    generateSourceEnum: 6
  }
@@ -1424,12 +1416,9 @@ function closeChargeDialog() {
  if (prescriptionRef.value && prescriptionRef.value.closeAllPopovers) {
    prescriptionRef.value.closeAllPopovers()
  }
-  // 等 Vue 完成 DOM 更新后再关闭弹窗，确保 popover 先消失
-  nextTick(() => {
-    showChargeDialog.value = false
-    chargePatientInfo.value = {}
-    chargeSurgeryInfo.value = {}
-  })
+  showChargeDialog.value = false
+  chargePatientInfo.value = {}
+  chargeSurgeryInfo.value = {}
 }

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

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

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

-</style>
+</style>