Fix Bug #493 : 【住院医生工作站-临床医嘱-检验申请】项目未维护执行科室时，医生手动选择发往科室后仍报错且数据被清空

根因：projectWithDepartment 函数定义时遗漏了 type 参数，导致函数体内引用 type 变量时报 ReferenceError（未定义），type === 2 的判断永远无法正确执行。用户在提交时手动选择的发往科室被清空且无法提交。修复：在函数签名中添加 type 参数，与 working 版本 medicalExaminations.vue 保持一致。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Fix Bug #491 : 【执行科室配置】保存配置时系统报错 - 修复Organization.getName()空指针异常
2026-05-13 00:13:44 +08:00 · 2026-05-13 00:13:44 +08:00 · 2026-05-13 00:13:44 +08:00 · 2026-05-13 00:13:44 +08:00 · 2026-05-13 00:13:44 +08:00 · 2026-05-13 00:13:44 +08:00
30 changed files with 119 additions and 543 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/IRequestFormManageAppService.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java
@@ -63,20 +63,4 @@ public interface IRequestFormManageAppService {
     * @return 申请单
     */
     IPage<RequestFormPageDto> getRequestFormPage(RequestFormDto requestFormDto);
-
-    /**
-     * 删除申请单（仅待签发状态可删除）
-     *
-     * @param requestFormId 申请单ID
-     * @return 结果
-     */
-    R<?> deleteRequestForm(Long requestFormId);
-
-    /**
-     * 撤回申请单（已签发状态撤回至待签发）
-     *
-     * @param requestFormId 申请单ID
-     * @return 结果
-     */
-    R<?> withdrawRequestForm(Long requestFormId);
 }
--- 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,28 +341,6 @@ public class AdviceManageAppServiceImpl implements IAdviceManageAppService {
                && (DbOpType.INSERT.getCode().equals(e.getDbOpType()) || DbOpType.UPDATE.getCode().equals(e.getDbOpType())))
                .collect(Collectors.toList());

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

        // 当前时间
@@ -474,68 +471,4 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
        return requestFormManageAppMapper.getRequestFormPage(requestFormDto, page);
    }

-    /**
-     * 删除申请单（仅待签发状态可删除）
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public R<?> deleteRequestForm(Long requestFormId) {
-        if (requestFormId == null) {
-            return R.fail("申请单ID不能为空");
-        }
-        RequestForm requestForm = iRequestFormService.getById(requestFormId);
-        if (requestForm == null) {
-            return R.fail("申请单不存在");
-        }
-        if (!Integer.valueOf(0).equals(requestForm.getStatus())) {
-            return R.fail("仅待签发状态的申请单可删除");
-        }
-        // 删除申请单
-        iRequestFormService.removeById(requestFormId);
-        // 删除关联的诊疗项目及账单
-        String prescriptionNo = requestForm.getPrescriptionNo();
-        List<Long> serviceRequestIds = iServiceRequestService
-            .list(new LambdaQueryWrapper<ServiceRequest>().eq(ServiceRequest::getPrescriptionNo, prescriptionNo))
-            .stream().map(ServiceRequest::getId).collect(Collectors.toList());
-        for (Long serviceRequestId : serviceRequestIds) {
-            iServiceRequestService.removeById(serviceRequestId);
-            iChargeItemService.deleteByServiceTableAndId(CommonConstants.TableName.WOR_SERVICE_REQUEST, serviceRequestId);
-        }
-        return R.ok(null, "删除成功");
-    }
-
-    /**
-     * 撤回申请单（已签发状态撤回至待签发）
-     */
-    @Override
-    @Transactional(rollbackFor = Exception.class)
-    public R<?> withdrawRequestForm(Long requestFormId) {
-        if (requestFormId == null) {
-            return R.fail("申请单ID不能为空");
-        }
-        RequestForm requestForm = iRequestFormService.getById(requestFormId);
-        if (requestForm == null) {
-            return R.fail("申请单不存在");
-        }
-        if (!Integer.valueOf(1).equals(requestForm.getStatus())) {
-            return R.fail("仅已签发状态的申请单可撤回");
-        }
-        // 将申请单状态回滚至待签发
-        RequestForm updateForm = new RequestForm();
-        updateForm.setId(requestFormId);
-        updateForm.setStatus(0);
-        iRequestFormService.updateById(updateForm);
-        // 将关联的诊疗项目状态回滚至DRAFT
-        String prescriptionNo = requestForm.getPrescriptionNo();
-        List<ServiceRequest> serviceRequests = iServiceRequestService
-            .list(new LambdaQueryWrapper<ServiceRequest>().eq(ServiceRequest::getPrescriptionNo, prescriptionNo));
-        for (ServiceRequest serviceRequest : serviceRequests) {
-            ServiceRequest updateService = new ServiceRequest();
-            updateService.setId(serviceRequest.getId());
-            updateService.setStatusEnum(RequestStatus.DRAFT.getValue());
-            iServiceRequestService.updateById(updateService);
-        }
-        return R.ok(null, "撤回成功");
-    }
-
 }
--- 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;

 /**
@@ -99,7 +98,7 @@ public class RequestFormManageController {
     * @param startDate 开始日期（可选，格式：yyyy-MM-dd）
     * @param endDate 结束日期（可选，格式：yyyy-MM-dd）
     * @param status 单据状态（可选）
-     * @param keyword 关键字（可选，申请单号/检验项目名称模糊匹配）
+     * @param keyword 关键字（可选，申请单号/检验项目模糊匹配）
     * @return 检验申请单
     */
    @GetMapping(value = "/get-inspection")
@@ -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/inhospitalnursestation/ATDManageAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/ATDManageAppMapper.xml
@@ -231,7 +231,7 @@
               ae.priority_enum,
               ae.organization_id,
               ae.start_time                     AS in_hos_time,
-               COALESCE(bed.start_time, ae.start_time) AS start_time,
+               bed.start_time,
               bed.location_id                   AS bed_id,
               bed.location_name                 AS bed_name,
               house.location_id                 AS house_id,
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml
@@ -280,17 +280,9 @@
                                         aa.balance_amount
                           ) AS personal_account
                              ON personal_account.encounter_id = ae.id
-                     LEFT JOIN (
-                        SELECT med_req_id, status_enum
-                        FROM (
-                            SELECT med_req_id, status_enum,
-                                   ROW_NUMBER() OVER (PARTITION BY med_req_id ORDER BY id DESC) AS rn
-                            FROM med_medication_dispense
-                            WHERE delete_flag = '0'
-                        ) t
-                        WHERE rn = 1
-                    ) mmd
+                     LEFT JOIN med_medication_dispense mmd
                               ON mmd.med_req_id = T1.id
+                                   AND mmd.delete_flag = '0'
                WHERE T1.delete_flag = '0'
                AND T1.refund_medicine_id IS NULL
                AND T1.generate_source_enum = #{doctorPrescription}
--- 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/openhis-domain/src/main/java/com/openhis/document/domain/RequestForm.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/RequestForm.java
@@ -59,9 +59,4 @@ public class RequestForm extends HisBaseEntity {
     */
    private String typeCode;

-    /**
-     * 单据状态 0=待签发 1=已签发 2=已校对 3=待接收 4=已接收 5=已检查 6=已出报告 7=已作废
-     */
-    private Integer status;
-
 }
--- a/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterDiagnosisMapper.xml
+++ b/openhis-server-new/openhis-domain/src/main/resources/mapper/administration/EncounterDiagnosisMapper.xml
@@ -15,7 +15,7 @@
        DELETE
        FROM adm_encounter_diagnosis
        WHERE encounter_id = #{encounterId}
-          AND tcm_flag = 1
+          AND tcm_flag = 0
    </delete>
    <select id="getEncounterDiagnosisByEncounterConDefId"
            resultType="com.openhis.administration.domain.EncounterDiagnosis">
--- 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) {
@@ -1007,15 +992,12 @@ 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)) {
+    const d = 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,
@@ -1246,68 +1228,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() {
  // 找到第一个有选中检查方法的项目
@@ -1713,29 +1648,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/diagnosis/diagnosis.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
@@ -169,7 +169,6 @@
 <script setup>
 import {getCurrentInstance} from 'vue'; // 添加 nextTick 导入
 import useUserStore from '@/store/modules/user';
-import { formatDateStr } from '@/utils';
 import {
  delEncounterDiagnosis,
  deleteDiagnosisBind,
@@ -287,22 +286,10 @@ function getList() {
        if (obj.diagSrtNo == null) {
          obj.diagSrtNo = '1';
        }
-        // 补充缺失的元数据字段
-        if (!obj.diagnosisDoctor) {
-          obj.diagnosisDoctor = props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name;
-        }
-        if (!obj.diagnosisTime) {
-          obj.diagnosisTime = item.diagnosisTime || getCurrentDate();
-        }
-        if (!obj.classification) {
-          obj.classification = item.typeName === '中医诊断' ? '中医' : '西医';
-        }
-        if (obj.longTermFlag == null) {
-          obj.longTermFlag = 0;
-        }
        return obj;
      });
      form.value.diagnosisList = datas;
+      // form.value.diagnosisList = res.data;
      emits('diagnosisSave', false);
    }
  });
@@ -318,16 +305,13 @@ function getList() {
            ybNo: item.ybNo,
            medTypeCode: item.medTypeCode,
            diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
-            diagnosisTime: item.diagnosisTime || getCurrentDate(),
-            diagSrtNo: item.diagSrtNo,
-            classification: '中医',
-            longTermFlag: item.longTermFlag || 0
+            diagnosisTime: new Date().toLocaleString('zh-CN')
          });
        });
-
+        
        // 将新数据添加到现有列表中
        form.value.diagnosisList.push(...newList);
-
+        
        // 重新排序整个列表
        form.value.diagnosisList.sort((a, b) => {
          const aNo = typeof a.diagSrtNo === 'number' ? a.diagSrtNo : 9999;
@@ -338,7 +322,7 @@ function getList() {
      emits('diagnosisSave', false);
    }
  });
-
+  
  getTree();
 }

@@ -355,12 +339,11 @@ function handleImport() {
  if (!props.patientInfo || !props.patientInfo.encounterId) {
    return;
  }
-
+  
  if (props.patientInfo.contractName != '自费') {
    // 获取患者慢性病信息
    getChronicDisease({ encounterId: props.patientInfo.encounterId }).then((res) => {
      if (res.data && res.data.length > 0) {
-        const currentDate = getCurrentDate();
        res.data.forEach((item, index) => {
          form.value.diagnosisList.push({
        ...item,
@@ -372,10 +355,7 @@ function handleImport() {
          iptDiseTypeCode: 2,
          diagnosisDesc: '',
          diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
-          diagnosisTime: currentDate,
-          onsetDate: currentDate,
-          classification: '西医',
-          longTermFlag: 0,
+          diagnosisTime: new Date().toLocaleString('zh-CN'),
          //添加 patientId
          patientId: props.patientInfo.patientId
        },
@@ -490,7 +470,6 @@ function handleAddDiagnosis() {
 * 添加诊断项
 */
 function addDiagnosisItem() {
-  const currentDate = getCurrentDate();
  form.value.diagnosisList.push({
    showPopover: false,
    name: undefined,
@@ -500,10 +479,9 @@ function addDiagnosisItem() {
    iptDiseTypeCode: 2,
    diagnosisDesc: '',
    diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
-    diagnosisTime: currentDate,
-    classification: '西医',
-    onsetDate: currentDate,
-    longTermFlag: 0,
+    diagnosisTime: new Date().toLocaleString('zh-CN'),
+
+    // 新增这一行：为每个诊断项添加 patientId
    patientId: props.patientInfo.patientId
  });

@@ -580,7 +558,16 @@ function handleMaindise(value, index) {
 /**
 * 保存诊断
 */
-async function handleSaveDiagnosis() {
+/**
+ * 保存诊断
+ */
+/**
+ * 保存诊断
+ */
+/**
+ * 保存诊断
+ */
+function handleSaveDiagnosis() {
  for (let index = 0; index < (form.value.diagnosisList || []).length; index++) {
    const item = form.value.diagnosisList[index];
    if (!item.diagSrtNo) {
@@ -591,7 +578,7 @@ async function handleSaveDiagnosis() {
      break;
    }
  }
-  proxy.$refs.formRef.validate(async (valid) => {
+  proxy.$refs.formRef.validate((valid) => {
    if (valid) {
      if (form.value.diagnosisList.length === 0) {
        proxy.$modal.msgWarning('诊断不能为空');
@@ -604,51 +591,43 @@ async function handleSaveDiagnosis() {
      // 设置保存标志，避免触发watch监听器
      isSaving.value = true;

-      try {
-        // 步骤1：深拷贝并按 diagSrtNo 排序
-        const sortedList = [...form.value.diagnosisList].sort((a, b) => {
-          const aNo = typeof a.diagSrtNo === 'number' ? a.diagSrtNo : 9999;
-          const bNo = typeof b.diagSrtNo === 'number' ? b.diagSrtNo : 9999;
-          return aNo - bNo;
-        });
+      // 步骤1：深拷贝并按 diagSrtNo 排序
+      const sortedList = [...form.value.diagnosisList].sort((a, b) => {
+        const aNo = typeof a.diagSrtNo === 'number' ? a.diagSrtNo : 9999;
+        const bNo = typeof b.diagSrtNo === 'number' ? b.diagSrtNo : 9999;
+        return aNo - bNo;
+      });

-        // 步骤2：转换日期格式为后端期望的格式
-        const diagnosisChildList = sortedList.map(item => ({
-          ...item,
-          onsetDate: item.onsetDate ? formatDateStr(item.onsetDate, 'YYYY/M/D HH:mm:ss') : null,
-          diagnosisTime: item.diagnosisTime ? formatDateStr(item.diagnosisTime, 'YYYY/M/D HH:mm:ss') : null
-        }));
-
-        // 步骤3：提交排序后的数据
-        const res = await saveDiagnosis({
-          patientId: props.patientInfo.patientId,
-          encounterId: props.patientInfo.encounterId,
-          diagnosisChildList: diagnosisChildList,
-        });
+      // 步骤2：重新分配连续的序号（从1开始）
+      sortedList.forEach((item, index) => {
+        item.diagSrtNo = index + 1; // 这里是关键！把“诊断排序”改成新顺序
+      });

+      // 步骤3：提交排序后的数据
+      saveDiagnosis({
+        patientId: props.patientInfo.patientId,
+        encounterId: props.patientInfo.encounterId,
+        diagnosisChildList: sortedList,
+      }).then((res) => {
        if (res.code === 200) {
-          // 步骤4：从服务器刷新数据，确保获取最新的诊断信息（避免重复记录）
-          await getList();
-          getTree();
+          // 步骤4：更新本地数据，使用全新对象防止响应式问题
+          form.value.diagnosisList = sortedList.map(item => ({ ...item }));
+
          emits('diagnosisSave', false);
          proxy.$modal.msgSuccess('诊断已保存');

          // 食源性疾病逻辑
          isFoodDiseasesNew({ encounterId: props.patientInfo.encounterId }).then((res2) => {
-            if (res2.code === 200 && res2.data) {
+            if (res2.code === 20 && res2.data) {
              window.open(res2.data, '_blank');
            }
          });
        }
-      } catch (error) {
-        console.error('保存诊断失败:', error);
-        const errorMsg = error?.response?.data?.msg || error?.message || '保存诊断失败，请稍后重试';
-        proxy.$modal.msgError(errorMsg);
-      } finally {
+      }).finally(() => {
        setTimeout(() => {
          isSaving.value = false;
        }, 100);
-      }
+      });
    }
  });
 }
@@ -708,7 +687,6 @@ function handleNodeClick(data) {
    proxy.$modal.msgWarning('该诊断项已存在');
    return;
  }
-  const currentDate = getCurrentDate();
  form.value.diagnosisList.push({
    ybNo: data.ybNo,
    name: data.name,
@@ -716,12 +694,9 @@ function handleNodeClick(data) {
    medTypeCode: undefined,
    diagSrtNo: form.value.diagnosisList.length + 1,
    definitionId: data.definitionId,
-    classification: '西医',
-    onsetDate: currentDate,
    diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
-    diagnosisTime: currentDate,
-    longTermFlag: 0,
-    selectedDiseases: data.ybNo ? [data.ybNo] : [],
+    diagnosisTime: new Date().toLocaleString('zh-CN'),
+    // 添加 patientId
    patientId: props.patientInfo.patientId
  });
  if (form.value.diagnosisList.length == 1) {
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/laboratoryTests.vue
@@ -164,7 +164,7 @@ onMounted(() => {
 * type(1：watch监听类型 2:点击保存类型)
 * selectProjectIds(选中项目的id数组)
 * */
-const projectWithDepartment = (selectProjectIds) => {
+const projectWithDepartment = (selectProjectIds, type) => {
  //1.获取选中的项目 2.判断项目的执行科室是否相同 3.判断执行科室是否配置 4.将项目的执行科室复值到执行科室下拉选位置
  let isRelease = true;
  // 选中项目的数组
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
@@ -1210,7 +1210,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 +1376,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 +1429,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/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>
Author	SHA1	Message	Date
赵云	c7a6578094	Fix Bug #493 : 【住院医生工作站-临床医嘱-检验申请】项目未维护执行科室时，医生手动选择发往科室后仍报错且数据被清空根因：projectWithDepartment 函数定义时遗漏了 type 参数，导致函数体内引用 type 变量时报 ReferenceError（未定义），type === 2 的判断永远无法正确执行。用户在提交时手动选择的发往科室被清空且无法提交。修复：在函数签名中添加 type 参数，与 working 版本 medicalExaminations.vue 保持一致。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 00:13:44 +08:00
刘备	a5ed6eaea9	Fix Bug #491 : 【执行科室配置】保存配置时系统报错 - 修复Organization.getName()空指针异常根因分析： 1. organizationLocationInit() 中 Organization.getName() 未做空值过滤，若数据库存在name为null的科室记录会NPE 2. addOrEditOrgLoc() 中 activityDefinitionMapper.selectById().getName() 未对selectById返回null做防护 3. addOrEditOrgLoc() 缺少organizationId前置校验，空值传入可能导致后续流程异常修复内容： - 第74行：stream中增加 .filter(organization -> organization != null && organization.getName() != null) - 第136-138行：增加organizationId为null时的校验，返回友好错误提示 - 第145-147行：将activityDefinitionMapper.selectById结果先赋值再判空，避免NPE Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 00:13:44 +08:00
赵云	31504f3260	Fix Bug #488 : 【临床医嘱】双击编辑待签发医嘱，医嘱类型回显为数字且点击确认报接口错误修复 clickRowDb 函数中编辑条件过于严格的问题：原条件 `row.statusEnum == 1 && !row.requestId` 只允许"待保存"(无requestId)的医嘱进入编辑，导致"待签发"(有requestId)的医嘱无法编辑。改为 `row.statusEnum == 1`，允许所有待签发状态的医嘱编辑。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 00:13:44 +08:00
张飞	8bd687581c	Fix Bug #477 : 住院医生工作站-住院检查申请详情弹窗中"发往科室"字段显示为短横线（-），未正常获取数据根因分析： 1. 前端组件使用了错误的API获取科室列表：表单使用getDepartmentList(/app-common/department-list) 保存的targetDepartment ID，但详情弹窗使用getOrgList(/base-data-manage/organization/organization) 查询，两个接口返回的数据结构和ID不同，导致recursionFun无法匹配到科室名称 2. recursionFun中obj.children可能为null/undefined，直接遍历会抛TypeError 3. getLocationInfo是异步调用，handleViewDetail可能在科室数据加载完成前被调用修复： - 统一使用getDepartmentList(@/api/public.js)获取科室数据，与表单组件保持一致 - recursionFun增加children空值保护 - handleViewDetail改为async，打开详情前确保科室数据已加载	2026-05-13 00:13:44 +08:00
刘备	2d16d6695c	Fix Bug #468 : [住院医生工作站-检验申请] 列表页缺失【单据状态】列，无法闭环管理检验医嘱执行进度前后端完整链路修复： - 后端 Mapper: LEFT JOIN wor_service_request 表，通过 CASE MIN(status_enum) 映射单据状态 - 后端 Mapper: 新增状态筛选和关键字搜索（申请单号/检验项目模糊匹配） - 后端 Service/Controller: 新增 status 和 keyword 参数传递 - 前端 Vue: 列表页添加【单据状态】列，绑定 status 字段 - 前端 Vue: 移除中间状态选项（已采集/已收样），与后端 CASE 映射保持一致 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 00:13:44 +08:00
荀彧	d04f998ae7	Fix Bug #464 : [目录管理-诊疗目录] 新增项目时"零售价"未与"诊疗子项"合计总价自动同步根本原因: calculateTotalPrice() 中同步零售价的条件只检查了第一个子项 (treatmentItems.value[0])，当第一个子项被清空但其他子项有效时，零售价不会同步。submitForm() 中存在相同问题。修复内容: 1. calculateTotalPrice(): 使用 Array.some() 检查是否有任何有效子项，而非只检查第一个 2. 当无有效子项时，将 retailPrice 重置为 undefined 避免残留旧值 3. submitForm(): childrenJson 序列化和零售价同步同样改用 some() 检查 4. addItem(): 补充缺失的 name 字段，与初始值结构保持一致 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 00:13:44 +08:00
荀彧	2d5d01bedc	Fix Bug #457 : 门诊收费：已签发的手术类医嘱在门诊收费列表中不显示项目名称根因分析：门诊医生站处方列表查询（DoctorStationAdviceAppMapper.xml）中，手术类医嘱（category_enum=4）的 advice_table_name 固定返回 'wor_activity_definition'，而非 'cli_surgery'。当医生通过"签发"按钮处理手术医嘱时，handService() 据此创建 ChargeItem，导致 product_table = 'wor_activity_definition'，但 product_id 实际指向 cli_surgery 表中的手术记录。门诊收费SQL查询的CASE语句仅匹配 product_table = 'cli_surgery' 的手术项，因此这些手术医嘱无法匹配，item_name 返回 NULL。修复方案：在 selectEncounterPatientPrescription 和 selectEncounterPatientPrescriptionWithPrice 的 item_name CASE 表达式中新增兜底分支： WHEN context_enum = #{activity} AND service_table = 'wor_service_request' THEN COALESCE(T9.surgery_name, wsr.content_json->>'surgeryName', wsr.content_json->>'adviceName', T2."name") 按优先级回退获取手术名称：cli_surgery表 → content_json手术名称 → content_json医嘱名称 → 诊疗定义名称 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 00:13:44 +08:00
刘备	44fd7de754	Fix Bug #458 : 门诊医生站：诊疗类医嘱保存成功后，列表"医嘱类型"列显示为空值根因：mapAdviceTypeLabel 函数依赖 drord_doctor_type 字典数据进行类型映射，当字典中缺少 value=3（诊疗）的条目时，find() 返回 undefined，函数返回空字符串，导致保存后刷新列表时"医嘱类型"列显示为空白。修复：在 mapAdviceTypeLabel 中为诊疗/手术类医嘱（wor_activity_definition 表）添加兜底映射逻辑：type 3→诊疗, 6→手术, 4→手术, 1→检验, 2→检查, 5→其他, 确保即使字典缺失对应条目也能正确显示类型标签。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-12 23:29:30 +08:00