Fix Bug #405: 住院医生工作站：临床医嘱保存成功后，医嘱条目仍处于可编辑状态（未锁定展示）

- getListInfo: 增加 getPrescriptionList 的 .catch() 处理，API失败时锁定所有行(isEdit=false)
  防止列表加载静默失败导致医嘱永久处于可编辑状态
- handleSaveBatch: 在 .catch() 中增加 isEdit=false 重置，保存失败时也锁定行
- 与之前的修复配合：保存成功时先设置 isEdit=false 再调用 getListInfo 刷新数据

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

openhis-server-new/openhis-application/src/main/java/com/openhis/web/clinicalmanage/controller/SurgicalScheduleController.java

@@ -2,9 +2,13 @@ package com.openhis.web.clinicalmanage.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.core.common.core.domain.R;
+import com.openhis.common.enums.ActivityDefCategory;
 import com.openhis.web.clinicalmanage.appservice.ISurgicalScheduleAppService;
 import com.openhis.web.clinicalmanage.dto.OpCreateScheduleDto;
 import com.openhis.web.clinicalmanage.dto.OpScheduleDto;
+import com.openhis.web.regdoctorstation.appservice.IRequestFormManageAppService;
+import com.openhis.web.regdoctorstation.dto.RequestFormDto;
+import com.openhis.web.regdoctorstation.dto.RequestFormPageDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
@@ -26,6 +30,7 @@ import java.util.Map;
 public class SurgicalScheduleController {
 
     private final ISurgicalScheduleAppService surgicalScheduleAppService;
+    private final IRequestFormManageAppService requestFormManageAppService;
 
     /**
      * 分页查询手术安排列表
@@ -87,6 +92,27 @@ public class SurgicalScheduleController {
         return surgicalScheduleAppService.deleteSurgerySchedule(scheduleId);
     }
 
+    /**
+     * 分页查询待排期手术申请列表
+     *
+     * @param requestFormDto 查询条件
+     * @return 手术申请列表
+     */
+    @PostMapping(value = "/apply-list")
+    public R<IPage<RequestFormPageDto>> getSurgeryApplyList(@RequestBody RequestFormDto requestFormDto) {
+        if (requestFormDto.getPageNo() == null) {
+            requestFormDto.setPageNo(1);
+        }
+        if (requestFormDto.getPageSize() == null) {
+            requestFormDto.setPageSize(10);
+        }
+        //虽然很想这么写，但是库里的手术申请单的type_code都是直接写的SURGERY
+//        requestFormDto.setTypeCode(ActivityDefCategory.PROCEDURE.getCode());
+        //只查询手术申请单
+        requestFormDto.setTypeCode("SURGERY");
+        return R.ok(requestFormManageAppService.getRequestFormPage(requestFormDto));
+    }
+
     /**
      * 导出手术安排列表
      *

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/IDoctorStationAdviceAppService.java

@@ -59,6 +59,16 @@ public interface IDoctorStationAdviceAppService {
      */
     R<?> getRequestBaseInfo(Long encounterId);
 
+    /**
+     * 查询医嘱请求数据（支持按生成来源和来源单据号过滤）
+     *
+     * @param encounterId 就诊id
+     * @param generateSourceEnum 生成来源（可选，如手术计费=6）
+     * @param sourceBillNo 来源业务单据号（可选）
+     * @return 医嘱请求数据
+     */
+    R<?> getRequestBaseInfo(Long encounterId, Integer generateSourceEnum, String sourceBillNo);
+
     /**
      * 门诊签退医嘱
      *

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java

@@ -1987,13 +1987,25 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
      */
     @Override
     public R<?> getRequestBaseInfo(Long encounterId) {
+        return this.getRequestBaseInfo(encounterId, null, null);
+    }
+
+    @Override
+    public R<?> getRequestBaseInfo(Long encounterId, Integer generateSourceEnum, String sourceBillNo) {
         // 当前账号的参与者id
         Long practitionerId = SecurityUtils.getLoginUser().getPractitionerId();
+        // 未指定generateSourceEnum时，默认只查询医生开立的医嘱
+        int sourceEnum = (generateSourceEnum != null) ? generateSourceEnum : GenerateSource.DOCTOR_PRESCRIPTION.getValue();
         // 医嘱请求数据
         List<RequestBaseDto> requestBaseInfo = doctorStationAdviceAppMapper.getRequestBaseInfo(encounterId, null,
                 CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST,
                 CommonConstants.TableName.WOR_SERVICE_REQUEST, practitionerId, Whether.NO.getCode(),
-                GenerateSource.DOCTOR_PRESCRIPTION.getValue());
+                sourceEnum, sourceBillNo);
+        // 手术计费场景：sourceBillNo 不为空时，只保留诊疗请求（3/6），过滤掉药品（1）和耗材（2）
+        if (sourceBillNo != null && !sourceBillNo.isEmpty()) {
+            requestBaseInfo.removeIf(dto -> dto.getAdviceType() != null
+                    && (dto.getAdviceType() == 1 || dto.getAdviceType() == 2));
+        }
         for (RequestBaseDto requestBaseDto : requestBaseInfo) {
             // 请求状态
             requestBaseDto
@@ -2114,7 +2126,7 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         List<RequestBaseDto> requestBaseInfo = doctorStationAdviceAppMapper.getRequestBaseInfo(encounterId, patientId,
                 CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST,
                 CommonConstants.TableName.WOR_SERVICE_REQUEST, practitionerId, Whether.YES.getCode(),
-                GenerateSource.DOCTOR_PRESCRIPTION.getValue());
+                GenerateSource.DOCTOR_PRESCRIPTION.getValue(), null);
         for (RequestBaseDto requestBaseDto : requestBaseInfo) {
             // 请求状态
             requestBaseDto

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationMainAppServiceImpl.java

@@ -274,27 +274,8 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
             return R.fail("非就诊中患者不能完诊");
         }
 
-        // 2. 获取 pool_id 和 slot_id：从 encounter → order_main → adm_schedule_slot 链路获取
-        //    确保 div_log 中的值与排班主表一致，不依赖 triage_queue_item（队列项可能不存在或值错误）
+        // 2. 查找队列项（限定当天，避免复诊患者匹配到历史队列记录）
         Integer tenantId = SecurityUtils.getLoginUser().getTenantId();
-        Long divPoolId = null;
-        Long divSlotId = null;
-        if (encounter.getOrderId() != null) {
-            try {
-                Order order = iOrderService.getById(encounter.getOrderId());
-                if (order != null && order.getSlotId() != null) {
-                    divSlotId = order.getSlotId();
-                    ScheduleSlot slot = scheduleSlotMapper.selectById(divSlotId);
-                    if (slot != null) {
-                        divPoolId = slot.getPoolId();
-                    }
-                }
-            } catch (Exception e) {
-                log.warn("获取完诊div_log的pool_id/slot_id失败，encounterId={}", encounterId, e);
-            }
-        }
-
-        // 3. 查找队列项（限定当天，避免复诊患者匹配到历史队列记录）
         TriageQueueItem queueItem = triageQueueItemService.getOne(
             new LambdaQueryWrapper<TriageQueueItem>()
                 .eq(TriageQueueItem::getTenantId, tenantId)
@@ -319,14 +300,43 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
             }
         }
 
+        // 3. 获取 pool_id 和 slot_id：优先使用 triage_queue_item（挂号时录入的号源信息，为权威来源）
+        //    队列项不存在或值缺失时，回退使用 encounter → order_main → adm_schedule_slot 链路
+        Long divPoolId = null;
+        Long divSlotId = null;
+        if (queueItem != null && queueItem.getPoolId() != null && queueItem.getSlotId() != null) {
+            divPoolId = queueItem.getPoolId();
+            divSlotId = queueItem.getSlotId();
+        }
+        // 队列项 poolId/slotId 缺失时，通过 encounter.orderId → order_main.slot_id → adm_schedule_slot.pool_id 回退获取
+        if ((divPoolId == null || divSlotId == null) && encounter.getOrderId() != null) {
+            try {
+                Order order = iOrderService.getById(encounter.getOrderId());
+                if (order != null && order.getSlotId() != null) {
+                    ScheduleSlot slot = scheduleSlotMapper.selectById(order.getSlotId());
+                    if (slot != null) {
+                        divSlotId = slot.getId();
+                        divPoolId = slot.getPoolId();
+                    }
+                }
+            } catch (Exception e) {
+                log.warn("回退获取完诊div_log的pool_id/slot_id失败，encounterId={}", encounterId, e);
+            }
+        }
+
         // 如果队列项存在且未完成，更新队列状态为已完成
         // 使用排除法而非白名单：只要不是"已完成"就可以完诊，覆盖跳过、等待等非标准流转状态
         if (queueItem != null &&
             !TriageQueueStatus.COMPLETED.getValue().equals(queueItem.getStatus())) {
             java.time.LocalDateTime nowLocal = java.time.LocalDateTime.now().truncatedTo(ChronoUnit.SECONDS);
-            queueItem.setStatus(TriageQueueStatus.COMPLETED.getValue());
-            queueItem.setUpdateTime(nowLocal);
-            triageQueueItemService.updateById(queueItem);
+            // 使用 LambdaUpdateWrapper 直接更新，确保 status 字段必定写入数据库
+            boolean queueUpdate = triageQueueItemService.update(new LambdaUpdateWrapper<TriageQueueItem>()
+                .eq(TriageQueueItem::getId, queueItem.getId())
+                .set(TriageQueueItem::getStatus, TriageQueueStatus.COMPLETED.getValue())
+                .set(TriageQueueItem::getUpdateTime, nowLocal));
+            if (!queueUpdate) {
+                log.error("完诊：triage_queue_item 状态更新失败，queueItemId={}", queueItem.getId());
+            }
         } else if (queueItem == null) {
             log.error("完诊：未找到任何 triage_queue_item 记录，encounterId={}, tenantId={}",
                 encounterId, tenantId);

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/controller/DoctorStationAdviceController.java

@@ -112,11 +112,16 @@ public class DoctorStationAdviceController {
      * 查询医嘱请求数据
      *
      * @param encounterId 就诊id
+     * @param generateSourceEnum 生成来源（可选，用于按来源过滤，如手术计费=6）
+     * @param sourceBillNo 来源业务单据号（可选，用于按来源单据过滤）
      * @return 医嘱请求数据
      */
     @GetMapping(value = "/request-base-info")
-    public R<?> getRequestBaseInfo(@RequestParam(required = false) Long encounterId) {
-        return iDoctorStationAdviceAppService.getRequestBaseInfo(encounterId);
+    public R<?> getRequestBaseInfo(
+            @RequestParam(required = false) Long encounterId,
+            @RequestParam(required = false) Integer generateSourceEnum,
+            @RequestParam(required = false) String sourceBillNo) {
+        return iDoctorStationAdviceAppService.getRequestBaseInfo(encounterId, generateSourceEnum, sourceBillNo);
     }
 
     /**

openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/mapper/DoctorStationAdviceAppMapper.java

@@ -122,7 +122,8 @@ public interface DoctorStationAdviceAppMapper {
             @Param("MED_MEDICATION_REQUEST") String MED_MEDICATION_REQUEST,
             @Param("WOR_DEVICE_REQUEST") String WOR_DEVICE_REQUEST,
             @Param("WOR_SERVICE_REQUEST") String WOR_SERVICE_REQUEST, @Param("practitionerId") Long practitionerId,
-            @Param("historyFlag") String historyFlag, @Param("generateSourceEnum") Integer generateSourceEnum);
+            @Param("historyFlag") String historyFlag, @Param("generateSourceEnum") Integer generateSourceEnum,
+            @Param("sourceBillNo") String sourceBillNo);
 
     /**
      * 查询就诊费用性质

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/IRequestFormManageAppService.java

@@ -63,4 +63,20 @@ 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);
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java

@@ -31,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -91,8 +92,10 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
                 return R.fail("无待签发的医嘱,该申请单不可编辑");
             }
         } else {
-            // 诊疗处方号
-            prescriptionNo = assignSeqUtil.getSeq(AssignSeqEnum.ACTIVITY_PSYCHOTROPIC_NO.getPrefix(), 8);
+            // 检查申请单号：JC（检查）+ Z（住院标识）+ yyMMdd（日期）+ 5位顺序号
+            String dateStr = new java.text.SimpleDateFormat("yyMMdd").format(new Date());
+            int seq = assignSeqUtil.getSeqNoByDay(AssignSeqEnum.CHECK_APPLY_NO.getPrefix());
+            prescriptionNo = "JCZ" + dateStr + String.format("%05d", seq);
         }
 
         // 当前时间
@@ -471,4 +474,68 @@ 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, "撤回成功");
+    }
+
 }

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/controller/RequestFormManageController.java

@@ -16,6 +16,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
 
+import java.time.LocalDate;
 import java.util.List;
 
 /**
@@ -98,7 +99,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")
@@ -142,6 +143,32 @@ public class RequestFormManageController {
         return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.PROCEDURE.getCode()));
     }
 /**
+     * 分页查询手术申请单（全局，不需要encounterId，用于门诊手术安排查找弹窗）
+     *
+     * @param surgeryNo     手术单号（模糊查询，可选）
+     * @param applyTimeStart 申请时间起始（可选）
+     * @param applyTimeEnd   申请时间截止（可选）
+     * @param mainDoctorId   主刀医生ID（可选）
+     * @param applyDeptId    申请科室ID（可选）
+     * @param pageNo   页码，默认1
+     * @param pageSize 每页数量，默认10
+     * @return 分页手术申请单列表
+     */
+    @GetMapping(value = "/get-surgery-page")
+    public R<IPage<RequestFormPageDto>> getSurgeryRequestFormPage(
+            @RequestParam(required = false) String surgeryNo,
+            @RequestParam(required = false) LocalDate applyTimeStart,
+            @RequestParam(required = false) LocalDate applyTimeEnd,
+            @RequestParam(required = false) Long mainDoctorId,
+            @RequestParam(required = false) Long applyDeptId,
+            @RequestParam(defaultValue = "1") Integer pageNo,
+            @RequestParam(defaultValue = "10") Integer pageSize) {
+        RequestFormDto dto = new RequestFormDto(surgeryNo, null, applyTimeStart, applyTimeEnd,
+                mainDoctorId, applyDeptId, pageNo, pageSize);
+        return R.ok(iRequestFormManageAppService.getRequestFormPage(dto));
+    }
+
+    /**
      * 分页查询申请单
      * @return 申请单
      */

openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/dto/RequestFormDto.java

@@ -14,6 +14,10 @@ public class RequestFormDto {
      * 手术单号
      */
     private String surgeryNo;
+    /**
+     * 申请单类型编码
+     */
+    private String typeCode;
     /**
      * 申请时间开始
      */

openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationAdviceAppMapper.xml

@@ -527,6 +527,9 @@
         LEFT JOIN cli_condition AS cc ON cc.id = T1.condition_id AND cc.delete_flag = '0'
         LEFT JOIN cli_condition_definition AS ccd ON ccd.id = cc.definition_id
         WHERE T1.delete_flag = '0' AND T1.tcm_flag = 0
+        <if test="generateSourceEnum != null">
+            AND T1.generate_source_enum = #{generateSourceEnum}
+        </if>
         <if test="historyFlag == '0'.toString()">
             AND T1.encounter_id = #{encounterId}
         </if>
@@ -695,6 +698,9 @@
         -- based_on_table='med_medication_request' → 输液/皮试执行记录，应排除
         -- based_on_table='exam_apply'/'lab_apply' → 申请单原始医嘱，应保留
         AND (T1.based_on_id IS NULL OR T1.based_on_table IS NULL OR T1.based_on_table NOT IN ('med_medication_request', 'med_medication_dispense'))
+        <if test="sourceBillNo != null and sourceBillNo != ''">
+            AND T1.prescription_no = #{sourceBillNo}
+        </if>
         <if test="historyFlag == '0'.toString()">
             AND T1.encounter_id = #{encounterId}
         </if>

openhis-server-new/openhis-application/src/main/resources/mapper/inhospitalnursestation/AdviceProcessAppMapper.xml

@@ -280,9 +280,17 @@
                                          aa.balance_amount
                            ) AS personal_account
                               ON personal_account.encounter_id = ae.id
-                     LEFT JOIN med_medication_dispense mmd
+                     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
                                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}

openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml

@@ -161,6 +161,9 @@
                 <if test="requestFormDto.surgeryNo != null and requestFormDto.surgeryNo != ''">
                     AND drf.prescription_no LIKE CONCAT('%', #{requestFormDto.surgeryNo}, '%')
                 </if>
+                <if test="requestFormDto.typeCode != null and requestFormDto.typeCode != ''">
+                    AND drf.type_code = #{requestFormDto.typeCode}
+                </if>
                 <if test="requestFormDto.applyTimeStart != null">
                     AND drf.create_time >= #{requestFormDto.applyTimeStart}
                 </if>

openhis-server-new/openhis-common/src/main/java/com/openhis/common/enums/AssignSeqEnum.java

@@ -270,6 +270,10 @@ public enum AssignSeqEnum {
      * 诊疗处方号
      */
     ACTIVITY_PSYCHOTROPIC_NO("62", "诊疗处方号", "PAR"),
+    /**
+     * 检查申请单号（住院）
+     */
+    CHECK_APPLY_NO("72", "检查申请单号", "JCZ"),
     /**
      * b 病历文书
      */

openhis-server-new/openhis-domain/src/main/java/com/openhis/document/domain/RequestForm.java

@@ -59,4 +59,9 @@ public class RequestForm extends HisBaseEntity {
      */
     private String typeCode;
 
+    /**
+     * 单据状态 0=待签发 1=已签发 2=已校对 3=待接收 4=已接收 5=已检查 6=已出报告 7=已作废
+     */
+    private Integer status;
+
 }

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 = 0
+          AND tcm_flag = 1
     </delete>
     <select id="getEncounterDiagnosisByEncounterConDefId"
             resultType="com.openhis.administration.domain.EncounterDiagnosis">

openhis-server-new/sql/20260115_add_table_triage_queue_item.sql

@@ -13,7 +13,7 @@ CREATE TABLE IF NOT EXISTS triage_queue_item (
     patient_name     VARCHAR(255),
     healthcare_name  VARCHAR(255),
     practitioner_name VARCHAR(255),
-    status           VARCHAR(50)  NOT NULL, -- WAITING/CALLING/SKIPPED/COMPLETED
+    status           INTEGER      NOT NULL DEFAULT 0, -- 分诊队列状态: 0=WAITING(等待), 10=CALLING(叫号中), 20=IN_CLINIC(诊中), 30=COMPLETED(已完成), 40=SKIPPED(已跳过)
     queue_order      INTEGER      NOT NULL,
     create_time      TIMESTAMP,
     update_time      TIMESTAMP,

openhis-server-new/sql/bug_400_fix_triage_queue_item_status_type.sql

@@ -0,0 +1,30 @@
+-- Bug #400 修复：triage_queue_item.status 字段类型修正
+-- 原 DDL 将 status 定义为 VARCHAR(50)，但 Java 实体 TriageQueueItem.status 为 Integer 类型，
+-- 应用层使用 TriageQueueStatus 枚举值（0/10/20/30/40）写入，类型不匹配导致 MyBatis-Plus
+-- 无法正确映射 status 字段，完诊时 status 更新为 30 失败。
+--
+-- 注意：必须在后端实际连接的 schema 中执行（dev=hisdev, test=histest, prd=hisprd）
+-- 执行前请先确认：SET search_path TO hisdev; （或对应的 schema）
+
+-- 1. 先将已有的字符串值转换为对应的整数值
+-- 如果之前写入的是枚举 code（如 'waiting'、'completed'），需要先转换
+UPDATE triage_queue_item
+SET status = CASE
+    WHEN status IN ('0', 'waiting', 'WAITING') THEN 0
+    WHEN status IN ('10', 'calling', 'CALLING') THEN 10
+    WHEN status IN ('20', 'in-clinic', 'IN_CLINIC', 'in-clinic') THEN 20
+    WHEN status IN ('30', 'completed', 'COMPLETED') THEN 30
+    WHEN status IN ('40', 'skipped', 'SKIPPED') THEN 40
+    WHEN status IN ('50', 'refunded', 'REFUNDED') THEN 50
+    WHEN status IN ('60', 'follow', 'FOLLOW') THEN 60
+    ELSE 0
+END
+WHERE status IS NOT NULL AND status !~ '^[0-9]+$';
+
+-- 2. 修改字段类型为 INTEGER
+ALTER TABLE triage_queue_item
+    ALTER COLUMN status TYPE INTEGER USING status::INTEGER;
+
+-- 3. 设置默认值
+ALTER TABLE triage_queue_item
+    ALTER COLUMN status SET DEFAULT 0;

openhis-ui-vue3/src/api/system/checkType.js

@@ -163,7 +163,7 @@ export function updateCheckPart(data) {
 // 查询检查套餐列表
 export function listCheckPackage(query) {
   return request({
-    url: '/system/check-package/list',
+    url: '/system/package/list',
     method: 'get',
     params: query
   })

openhis-ui-vue3/src/views/clinicmanagement/bargain/component/api.js

@@ -58,10 +58,17 @@ export function singOut(data) {
 /**
  * 获取患者本次就诊处方
  */
-export function getPrescriptionList(encounterId) {
-  // Add timestamp to bypass browser caching and ensure fresh data is loaded
+export function getPrescriptionList(encounterId, generateSourceEnum, sourceBillNo) {
+  let url = '/doctor-station/advice/request-base-info?encounterId=' + encounterId
+  if (generateSourceEnum != null) {
+    url += '&generateSourceEnum=' + generateSourceEnum
+  }
+  if (sourceBillNo != null) {
+    url += '&sourceBillNo=' + encodeURIComponent(sourceBillNo)
+  }
+  url += '&t=' + Date.now()
   return request({
-    url: '/doctor-station/advice/request-base-info?encounterId=' + encounterId + '&t=' + Date.now(),
+    url: url,
     method: 'get',
   })
 }

openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue

@@ -381,6 +381,14 @@ const props = defineProps({
   activeTab: {
     type: String,
   },
+  generateSourceEnum: {
+    type: Number,
+    default: null,
+  },
+  sourceBillNo: {
+    type: String,
+    default: null,
+  },
 });
 const isAdding = ref(false);
 const isSaving = ref(false); // #437 防重复提交锁
@@ -468,7 +476,11 @@ watch(
 
 function getListInfo(addNewRow) {
   isAdding.value = false;
-  getPrescriptionList(props.patientInfo.encounterId).then((res) => {
+  getPrescriptionList(
+    props.patientInfo.encounterId,
+    props.generateSourceEnum ?? undefined,
+    props.sourceBillNo ?? undefined,
+  ).then((res) => {
     // 为每行数据添加 adviceTypeValue 字段，用于类型下拉框显示
     prescriptionList.value = (res.data || []).map(item => {
       // 根据 adviceType 和 categoryCode 找到对应的 adviceTypeValue

openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue

@@ -402,6 +402,21 @@
                         <span class="method-price">¥{{ method.packagePrice || item.price }}</span>
                       </el-checkbox>
                     </div>
+                    <!-- 选中方法后，显示对应的套餐明细 -->
+                    <div v-if="item.selectedMethod && item.methodPackageDetails && item.methodPackageDetails.length > 0" class="method-package-details">
+                      <div class="method-package-header">
+                        <span class="method-package-title">套餐明细 - {{ item.selectedMethod.name }}</span>
+                      </div>
+                      <div v-for="detail in item.methodPackageDetails" :key="detail.id" class="method-option">
+                        <el-checkbox v-model="detail.checked">
+                          <span class="method-name">{{ detail.name }}</span>
+                          <span class="method-price">数量: {{ detail.quantity }} ¥{{ detail.price }}</span>
+                        </el-checkbox>
+                      </div>
+                    </div>
+                    <div v-if="item.selectedMethod && item.methodPackageLoading" class="method-package-loading">
+                      加载套餐明细中...
+                    </div>
                   </div>
                 </div>
               </div>
@@ -419,7 +434,7 @@ import { ElMessage, ElMessageBox } from 'element-plus';
 import { Printer, Delete, ArrowDown, ArrowUp, Close } from '@element-plus/icons-vue';
 import useUserStore from '@/store/modules/user';
 import request from '@/utils/request';
-import { listCheckMethod, searchCheckMethod } from '@/api/system/checkType';
+import { listCheckMethod, searchCheckMethod, listCheckPackage } from '@/api/system/checkType';
 import { getEncounterDiagnosis } from '../api.js';
 
 const props = defineProps({
@@ -445,7 +460,7 @@ async function loadPackageDetails(row, treeNode, resolve) {
   }
   try {
     const res = await request({
-      url: `/exam/package/${row.packageId}/details`,
+      url: `/system/package/${row.packageId}/details`,
       method: 'get'
     });
     if (res.code === 200 && res.data) {
@@ -474,7 +489,7 @@ async function loadPackageDetailsForItem(item) {
   }
   try {
     const res = await request({
-      url: `/exam/package/${item.packageId}/details`,
+      url: `/system/package/${item.packageId}/details`,
       method: 'get'
     });
     if (res.code === 200 && res.data) {
@@ -682,7 +697,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
       }));
@@ -993,12 +1007,15 @@ function handleRowClick(row) {
   selectedItems.value = [];
   activeDetailTab.value = 'applyForm';
   request({ url: `/exam/apply/${row.applyNo}`, method: 'get' }).then(async res => {
-    const d = res.data || res;
-    if (d.data) Object.assign(form, d.data);
-    if (d.items && Array.isArray(d.items)) {
+    const resp = res.data || res;
+    // 保存 items 在顶层响应中，避免后面 d.data 赋值后丢失
+    const rawItems = resp.items;
+    const d = resp.data || resp;
+    if (d) Object.assign(form, d);
+    if (rawItems && Array.isArray(rawItems)) {
       try {
         // 为每个项目加载检查方法
-        const itemsWithMethods = await Promise.all(d.items.map(async m => {
+        const itemsWithMethods = await Promise.all(rawItems.map(async m => {
           const item = {
             id: m.itemCode, name: m.itemName,
             price: m.itemFee || 0, quantity: 1,
@@ -1026,18 +1043,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) {
@@ -1098,13 +1109,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;
     }
@@ -1119,7 +1123,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,
@@ -1131,16 +1135,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) {
@@ -1185,7 +1182,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修复: 服务费
           }));
@@ -1250,21 +1246,68 @@ async function toggleItemExpand(item) {
 }
 
 // Bug #384修复: 勾选框选择检查方法（单选逻辑）
-function selectMethodCheckbox(checked, item, method) {
+async function selectMethodCheckbox(checked, item, method) {
   if (checked) {
     item.selectedMethod = method;
+    // 动态加载该方法对应的套餐明细
+    await loadMethodPackageDetails(item, method);
   } else {
     item.selectedMethod = null;
+    item.methodPackageDetails = [];
   }
   // 联动更新表单检查方法显示字段
   updateMethodDisplay();
-  
+
   // #430: 套餐金额实时同步到申请单
   nextTick(() => {
     form.totalAmount = totalAmountCalc.value;
   });
 }
 
+// 根据检查方法的packageName加载对应的套餐明细
+async function loadMethodPackageDetails(item, method) {
+  item.methodPackageLoading = true;
+  item.methodPackageDetails = [];
+  try {
+    if (!method.packageName) {
+      item.methodPackageLoading = false;
+      return;
+    }
+    // 通过packageName查询套餐获取packageId
+    const pkgRes = await listCheckPackage({ packageName: method.packageName });
+    let packages = pkgRes?.data || [];
+    if (!Array.isArray(packages)) {
+      packages = packages.records || packages.data || [];
+    }
+    if (packages.length === 0) {
+      item.methodPackageLoading = false;
+      return;
+    }
+    const packageId = packages[0].id;
+    // 查询套餐明细
+    const detailRes = await request({
+      url: `/system/package/${packageId}/details`,
+      method: 'get'
+    });
+    if (detailRes.code === 200 && detailRes.data) {
+      item.methodPackageDetails = detailRes.data.map(d => ({
+        id: d.id,
+        name: d.itemName || d.name,
+        quantity: d.quantity || 1,
+        unit: d.unit || '次',
+        price: d.unitPrice || d.price || 0,
+        amount: d.amount || d.total || 0,
+        checked: true  // 默认勾选
+      }));
+    }
+  } catch (err) {
+    console.error('加载方法套餐明细失败:', err);
+    item.methodPackageDetails = [];
+  } finally {
+    item.methodPackageLoading = false;
+  }
+}
+
 // Bug #384修复: 更新检查方法显示字段（联动）
 function updateMethodDisplay() {
   // 找到第一个有选中检查方法的项目
@@ -1670,6 +1713,29 @@ defineExpose({ getList });
   margin-left: 8px;
 }
 
+/* 选中方法后显示的套餐明细 */
+.method-package-details {
+  margin-top: 4px;
+  padding: 4px 0;
+  border-top: 1px dashed #dcdfe6;
+}
+
+.method-package-header {
+  padding: 2px 0 4px 24px;
+}
+
+.method-package-title {
+  font-size: 10px;
+  color: #909399;
+  font-weight: 500;
+}
+
+.method-package-loading {
+  padding: 4px 0 4px 24px;
+  font-size: 10px;
+  color: #c0c4cc;
+}
+
 /* 折叠组件细节 */
 :deep(.el-collapse) {
   border: none;

openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/api.js

@@ -44,6 +44,17 @@ export function getSurgery(queryParams) {
   });
 }
 
+/**
+ * 分页查询手术申请单（全局，不需要encounterId，用于门诊手术安排查找弹窗）
+ */
+export function getSurgeryPage(queryParams) {
+  return request({
+    url: '/reg-doctorstation/request-form/get-surgery-page',
+    method: 'get',
+    params: queryParams,
+  });
+}
+
 /**
  * 查询护理医嘱信息
  */

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="申请者">{{

openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue

@@ -169,6 +169,7 @@
 <script setup>
 import {getCurrentInstance} from 'vue'; // 添加 nextTick 导入
 import useUserStore from '@/store/modules/user';
+import { formatDateStr } from '@/utils';
 import {
   delEncounterDiagnosis,
   deleteDiagnosisBind,
@@ -286,10 +287,22 @@ 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);
     }
   });
@@ -305,13 +318,16 @@ function getList() {
             ybNo: item.ybNo,
             medTypeCode: item.medTypeCode,
             diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
-            diagnosisTime: new Date().toLocaleString('zh-CN')
+            diagnosisTime: item.diagnosisTime || getCurrentDate(),
+            diagSrtNo: item.diagSrtNo,
+            classification: '中医',
+            longTermFlag: item.longTermFlag || 0
           });
         });
-        
+
         // 将新数据添加到现有列表中
         form.value.diagnosisList.push(...newList);
-        
+
         // 重新排序整个列表
         form.value.diagnosisList.sort((a, b) => {
           const aNo = typeof a.diagSrtNo === 'number' ? a.diagSrtNo : 9999;
@@ -322,7 +338,7 @@ function getList() {
       emits('diagnosisSave', false);
     }
   });
-  
+
   getTree();
 }
 
@@ -339,11 +355,12 @@ 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,
@@ -355,7 +372,10 @@ function handleImport() {
           iptDiseTypeCode: 2,
           diagnosisDesc: '',
           diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
-          diagnosisTime: new Date().toLocaleString('zh-CN'),
+          diagnosisTime: currentDate,
+          onsetDate: currentDate,
+          classification: '西医',
+          longTermFlag: 0,
           //添加 patientId
           patientId: props.patientInfo.patientId
         },
@@ -470,6 +490,7 @@ function handleAddDiagnosis() {
  * 添加诊断项
  */
 function addDiagnosisItem() {
+  const currentDate = getCurrentDate();
   form.value.diagnosisList.push({
     showPopover: false,
     name: undefined,
@@ -479,9 +500,10 @@ function addDiagnosisItem() {
     iptDiseTypeCode: 2,
     diagnosisDesc: '',
     diagnosisDoctor: props.patientInfo.practitionerName || props.patientInfo.doctorName || props.patientInfo.physicianName || userStore.name,
-    diagnosisTime: new Date().toLocaleString('zh-CN'),
-
-    // 新增这一行：为每个诊断项添加 patientId
+    diagnosisTime: currentDate,
+    classification: '西医',
+    onsetDate: currentDate,
+    longTermFlag: 0,
     patientId: props.patientInfo.patientId
   });
 
@@ -558,16 +580,7 @@ function handleMaindise(value, index) {
 /**
  * 保存诊断
  */
-/**
- * 保存诊断
- */
-/**
- * 保存诊断
- */
-/**
- * 保存诊断
- */
-function handleSaveDiagnosis() {
+async function handleSaveDiagnosis() {
   for (let index = 0; index < (form.value.diagnosisList || []).length; index++) {
     const item = form.value.diagnosisList[index];
     if (!item.diagSrtNo) {
@@ -578,7 +591,7 @@ function handleSaveDiagnosis() {
       break;
     }
   }
-  proxy.$refs.formRef.validate((valid) => {
+  proxy.$refs.formRef.validate(async (valid) => {
     if (valid) {
       if (form.value.diagnosisList.length === 0) {
         proxy.$modal.msgWarning('诊断不能为空');
@@ -591,43 +604,51 @@ function handleSaveDiagnosis() {
       // 设置保存标志，避免触发watch监听器
       isSaving.value = true;
 
-      // 步骤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;
-      });
+      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;
+        });
 
-      // 步骤2：重新分配连续的序号（从1开始）
-      sortedList.forEach((item, index) => {
-        item.diagSrtNo = index + 1; // 这里是关键！把“诊断排序”改成新顺序
-      });
+        // 步骤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,
+        });
 
-      // 步骤3：提交排序后的数据
-      saveDiagnosis({
-        patientId: props.patientInfo.patientId,
-        encounterId: props.patientInfo.encounterId,
-        diagnosisChildList: sortedList,
-      }).then((res) => {
         if (res.code === 200) {
-          // 步骤4：更新本地数据，使用全新对象防止响应式问题
-          form.value.diagnosisList = sortedList.map(item => ({ ...item }));
-
+          // 步骤4：从服务器刷新数据，确保获取最新的诊断信息（避免重复记录）
+          await getList();
+          getTree();
           emits('diagnosisSave', false);
           proxy.$modal.msgSuccess('诊断已保存');
 
           // 食源性疾病逻辑
           isFoodDiseasesNew({ encounterId: props.patientInfo.encounterId }).then((res2) => {
-            if (res2.code === 20 && res2.data) {
+            if (res2.code === 200 && res2.data) {
               window.open(res2.data, '_blank');
             }
           });
         }
-      }).finally(() => {
+      } catch (error) {
+        console.error('保存诊断失败:', error);
+        const errorMsg = error?.response?.data?.msg || error?.message || '保存诊断失败，请稍后重试';
+        proxy.$modal.msgError(errorMsg);
+      } finally {
         setTimeout(() => {
           isSaving.value = false;
         }, 100);
-      });
+      }
     }
   });
 }
@@ -687,6 +708,7 @@ function handleNodeClick(data) {
     proxy.$modal.msgWarning('该诊断项已存在');
     return;
   }
+  const currentDate = getCurrentDate();
   form.value.diagnosisList.push({
     ybNo: data.ybNo,
     name: data.name,
@@ -694,9 +716,12 @@ 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: new Date().toLocaleString('zh-CN'),
-    // 添加 patientId
+    diagnosisTime: currentDate,
+    longTermFlag: 0,
+    selectedDiseases: data.ybNo ? [data.ybNo] : [],
     patientId: props.patientInfo.patientId
   });
   if (form.value.diagnosisList.length == 1) {

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, type) => {
+const projectWithDepartment = (selectProjectIds) => {
   //1.获取选中的项目 2.判断项目的执行科室是否相同 3.判断执行科室是否配置 4.将项目的执行科室复值到执行科室下拉选位置
   let isRelease = true;
   // 选中项目的数组

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) => {

openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue

@@ -631,6 +631,12 @@ function getListInfo(addNewRow) {
         handleAddPrescription();
       }
     });
+  }).catch((err) => {
+    console.error('处方列表加载失败:', err);
+    // 🔧 Bug #405 修复：列表加载失败时，确保所有行被锁定（isEdit=false）
+    // 防止行永久处于可编辑状态
+    prescriptionList.value.forEach(item => { item.isEdit = false; });
+    loadingInstance.close();
   });
   getContract({ encounterId: patientInfo.value.encounterId }).then((res) => {
     contractList.value = res.data;
@@ -1210,7 +1216,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,13 +1382,21 @@ function handleSaveSign(row, index) {
     savePrescription({ regAdviceSaveList: [row] }).then((res) => {
       if (res.code === 200) {
         proxy.$modal.msgSuccess('保存成功');
-        nextId.value == 1;
+        nextId.value = 1;
       }
     });
   } else {
-    if (prescriptionList.value[0].adviceName) {
-      handleAddPrescription();
-    }
+    // 新增行：调用保存接口将数据持久化到后端
+    row.dbOpType = '1';
+    savePrescription({ regAdviceSaveList: [row] }).then((res) => {
+      if (res.code === 200) {
+        proxy.$modal.msgSuccess('保存成功');
+        nextId.value = 1;
+        // 保存成功后刷新列表，确保后端返回的数据带 requestId
+        getListInfo(false);
+      }
+    });
+    // 不需要再添加空行，保存成功后由 getListInfo 处理
   }
   adviceQueryParams.value.adviceType = undefined;
 }
@@ -1429,12 +1443,19 @@ function handleSaveBatch() {
           if (row) row.isEdit = false;
         });
         getListInfo(false);
-        nextId.value == 1;
+        nextId.value = 1;
         isSaving.value = false;
       }
     })
     .catch((error) => {
       isSaving.value = false;
+      // 🔧 Bug #405 修复：保存失败时也锁定行，防止行永久处于可编辑状态
+      filterPrescriptionList.value.forEach(item => {
+        if (item.statusEnum == 1 && !item.requestId) {
+          item.isEdit = false;
+        }
+      });
+      proxy.$modal.msgError(error?.msg || '保存失败，请重试');
     });
 }
 
@@ -1562,17 +1583,21 @@ function handleSaveGroup(orderGroupList) {
     // 🔥 新版组件已经预处理了数据，优先使用 mergedDetail
     const mergedDetail = item.mergedDetail || {
       ...(item.orderDetailInfos || {}),
-      adviceName: item.orderDetailInfos?.adviceName || item.orderDefinitionName || '未知项目',
+      adviceName: item.orderDefinitionName || item.orderDetailInfos?.adviceName || '未知项目',
       adviceType: item.orderDetailInfos?.adviceType,
       adviceDefinitionId: item.orderDefinitionId || item.orderDetailInfos?.adviceDefinitionId,
       quantity: item.quantity,
       unitCode: item.unitCode || item.orderDetailInfos?.unitCode,
       unitCodeName: item.unitCodeName,
-      dose: item.dose || item.orderDetailInfos?.dose,
+      // 🔧 Bug #403 修复：dose/doseQuantity/dispensePerDuration 需用 null 检查，
+      // 避免组套中值为 null 时回退到医嘱库的 orderDetailInfos
+      dose: item.dose !== undefined && item.dose !== null ? item.dose : item.orderDetailInfos?.dose,
       rateCode: item.rateCode || item.orderDetailInfos?.rateCode,
       methodCode: item.methodCode || item.orderDetailInfos?.methodCode,
-      dispensePerDuration: item.dispensePerDuration || item.orderDetailInfos?.dispensePerDuration,
-      doseQuantity: item.doseQuantity,
+      dispensePerDuration: item.dispensePerDuration !== undefined && item.dispensePerDuration !== null
+        ? item.dispensePerDuration : item.orderDetailInfos?.dispensePerDuration,
+      doseQuantity: item.doseQuantity !== undefined && item.doseQuantity !== null
+        ? item.doseQuantity : item.orderDetailInfos?.doseQuantity,
       inventoryList: item.orderDetailInfos?.inventoryList || [],
       priceList: item.orderDetailInfos?.priceList || [],
       partPercent: item.orderDetailInfos?.partPercent || 1,
@@ -1591,20 +1616,21 @@ function handleSaveGroup(orderGroupList) {
     setValue(mergedDetail);
 
     // 创建新的处方项目
+    // 🔧 Bug #403 修复：关键字段使用 null-safe 回退到 mergedDetail（已由 setValue 填充完整数据）
     const newRow = {
       ...prescriptionList.value[rowIndex.value],
       patientId: patientInfo.value.patientId,
       encounterId: patientInfo.value.encounterId,
       accountId: accountId.value,
-      quantity: item.quantity,
-      methodCode: item.methodCode,
-      rateCode: item.rateCode,
-      dispensePerDuration: item.dispensePerDuration,
-      dose: item.dose,
-      doseQuantity: item.doseQuantity,
+      quantity: item.quantity ?? mergedDetail.quantity,
+      methodCode: item.methodCode ?? mergedDetail.methodCode,
+      rateCode: item.rateCode ?? mergedDetail.rateCode,
+      dispensePerDuration: item.dispensePerDuration ?? mergedDetail.dispensePerDuration,
+      dose: item.dose ?? mergedDetail.dose,
+      doseQuantity: item.doseQuantity ?? mergedDetail.doseQuantity,
       executeNum: 1,
-      unitCode: item.unitCode,
-      unitCode_dictText: item.unitCodeName || '',
+      unitCode: item.unitCode ?? mergedDetail.unitCode,
+      unitCode_dictText: item.unitCodeName || mergedDetail.unitCodeName || '',
       statusEnum: 1,
       orgId: resolveOrgId(item.orderDetailInfos?.orgId || mergedDetail.orgId || patientInfo.value?.inHospitalOrgId) || '',
       // 🔧 修复：同时保存 orgName，确保树匹配不到时仍有中文名称可显示

openhis-ui-vue3/src/views/inpatientNurse/inOut/components/transferInDialog.vue

@@ -453,6 +453,10 @@ const loadPatientInfo = () => {
       interventionForm.value.startTime = dayjs(res.data.startTime).format(
         'YYYY-MM-DD HH:mm:ss'
       );
+    } else if (res.data.inHosTime) {
+      interventionForm.value.startTime = dayjs(res.data.inHosTime).format(
+        'YYYY-MM-DD HH:mm:ss'
+      );
     } else {
       interventionForm.value.startTime = dayjs(new Date()).format('YYYY-MM-DD HH:mm:ss');
     }

openhis-ui-vue3/src/views/surgicalschedule/index.vue

@@ -829,7 +829,9 @@
             </el-descriptions>
           </div>
           <div style="padding: 10px">
-            <prescriptionlist v-if="showChargeDialog" :patientInfo="chargePatientInfo" ref="prescriptionRef" />
+            <prescriptionlist v-if="showChargeDialog" :patientInfo="chargePatientInfo" ref="prescriptionRef"
+              :generateSourceEnum="1"
+              :sourceBillNo="chargePatientInfo.sourceBillNo" />
             <div class="overlay" v-if="disabled"></div>
           </div>
         </div>
@@ -872,11 +874,17 @@ import { Loading } from '@element-plus/icons-vue' // 🔧 新增：导入 Loadin
 import { getPrescriptionList } from '@/views/clinicmanagement/bargain/component/api'
 
 // API 导入
-import { getSurgerySchedulePage, addSurgerySchedule, updateSurgerySchedule, deleteSurgerySchedule, getSurgeryScheduleDetail } from '@/api/surgicalschedule'
+import {
+  getSurgerySchedulePage,
+  addSurgerySchedule,
+  updateSurgerySchedule,
+  deleteSurgerySchedule,
+  getSurgeryScheduleDetail
+} from '@/api/surgicalschedule'
 import { listUser } from '@/api/system/user'
 import { deptTreeSelect } from '@/api/system/user'
 import { listOperatingRoom } from '@/api/operatingroom'
-import { getSurgery} from '@/views/inpatientDoctor/home/components/applicationShow/api.js'
+import { getSurgeryPage} from '@/views/inpatientDoctor/home/components/applicationShow/api.js'
 import { getTenantPage } from '@/api/system/tenant'
 import { getContract } from '@/views/inpatientDoctor/home/components/api.js'
 import SurgeryCharge from '../charge/surgerycharge/index.vue'
@@ -1388,8 +1396,8 @@ async function handleChargeCharge(row) {
     orgId: userStore.organizationId || userStore.orgId || userStore.tenantId || 1,
     // 添加账户ID
     accountId: accountId,
-    // 添加手术申请单号用于追溯
-    sourceBillNo: row.applyId,
+    // 添加手术单号用于关联对应的手术医嘱
+    sourceBillNo: row.operCode,
     //添加计费标志手术计费
     generateSourceEnum: 6
   }
@@ -1450,7 +1458,8 @@ function handleMedicalAdvice(row) {
     role: userStore.roles[0],
     effectiveOrgId : row.effectiveOrgId,
     orgId: userStore.orgId,
-    positionId: userStore.orgId
+    positionId: userStore.orgId,
+    applyId: row.applyId  // 手术申请单ID，用于过滤关联医嘱
   }
 
   // 🔧 关键修复：如果已有提交的医嘱数据，并且是同一个患者的就诊，则使用保存的数据
@@ -1748,7 +1757,7 @@ function handleQuoteBilling() {
   // 重新拉取计费药品数据
   if (temporaryPatientInfo.value.visitId) {
     temporaryMedicalLoading.value = true // 🔧 新增：开始加载
-    getPrescriptionList(temporaryPatientInfo.value.visitId).then((res) => {
+    getPrescriptionList(temporaryPatientInfo.value.visitId, 6, temporaryPatientInfo.value.operCode).then((res) => {
             if (res.code === 200 && res.data) {
               // 🔧 修复：先清空旧数据，避免数据累积
               temporaryBillingMedicines.value = []
@@ -2023,7 +2032,7 @@ function handleFindApply() {
   getSurgicalScheduleList()
 }
 
-// 获取手术申请列表（用于“查找”弹窗）
+// 获取手术申请列表（用于”查找”弹窗）
 function getSurgicalScheduleList() {
   applyLoading.value = true
   const params = { ...applyQueryParams }
@@ -2032,8 +2041,7 @@ function getSurgicalScheduleList() {
     params.applyTimeEnd = params.applyTimeRange[1]
     delete params.applyTimeRange
   }
-  getSurgery(params).then((res) => {
-    // Check if data is nested under data.data or directly under data
+  getSurgeryPage(params).then((res) => {
     const responseData = res.data.data || res.data
     applyList.value = responseData.records || []
     applyTotal.value = responseData.total || 0
@@ -2282,4 +2290,4 @@ function getRowClassName({ row, rowIndex }) {
   border-bottom: 1px solid #d9ecff !important;
 }
 
-</style>
+</style>