Fix Bug #475 : 【住院医生工作站】开立检查申请单报错"请先配置当前时间段的执行科室"后，系统仍生成申请记录

根因：saveRequestForm 方法中，执行科室配置校验（activityOrganizationConfig.isEmpty）位于 saveOrUpdate(requestForm) 之后，导致即使校验失败抛出异常，RequestForm 记录已被写入数据库。修复：将校验逻辑移至方法开头，在任何数据库操作之前执行，确保校验失败时不产生任何脏数据。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
Fix Bug #472 : 住院医生工作站-手术申请单：勾选手术项目无效，导致无法正常开立医嘱
2026-05-13 18:12:18 +08:00 · 2026-05-13 18:12:17 +08:00 · 2026-05-13 18:10:44 +08:00 · 2026-05-13 18:06:09 +08:00 · 2026-05-13 17:49:27 +08:00 · 2026-05-13 17:48:26 +08:00
23 changed files with 374 additions and 272 deletions
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java
@@ -228,8 +228,10 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
        // 医嘱定义ID集合
        List<Long> adviceDefinitionIdList = adviceBaseDtoList.stream().map(AdviceBaseDto::getAdviceDefinitionId)
                .collect(Collectors.toList());
-        // 费用定价主表ID集合
-        List<Long> chargeItemDefinitionIdList = adviceBaseDtoList.stream().map(AdviceBaseDto::getChargeItemDefinitionId)
+        // 费用定价主表ID集合（过滤null值，手术项目无定价定义）
+        List<Long> chargeItemDefinitionIdList = adviceBaseDtoList.stream()
+                .map(AdviceBaseDto::getChargeItemDefinitionId)
+                .filter(Objects::nonNull)
                .collect(Collectors.toList());

        // 判断是否包含药品或耗材类型（只有这些类型才需要库存相关查询）
@@ -275,9 +277,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
            medLocationConfig = Collections.emptyList();
            allowedLocByCategory = Collections.emptyMap();
        }
-        // 费用定价子表信息 - 使用分批处理避免大量参数问题
+        // 费用定价子表信息 - 仅药品/耗材需要批次定价查询，手术/诊疗无库存概念不需要
        List<AdvicePriceDto> childCharge = new ArrayList<>();
-        if (chargeItemDefinitionIdList != null && !chargeItemDefinitionIdList.isEmpty()) {
+        if (hasMedOrDevice && chargeItemDefinitionIdList != null && !chargeItemDefinitionIdList.isEmpty()) {
            // 分批处理，每批最多1000个ID，增加批次大小以减少查询次数
            int batchSize = 1000;
            for (int i = 0; i < chargeItemDefinitionIdList.size(); i += batchSize) {
@@ -957,11 +959,16 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
            }
        }
        for (AdviceSaveDto adviceSaveDto : deleteList) {
-            iMedicationRequestService.removeById(adviceSaveDto.getRequestId());
+            Long requestId = adviceSaveDto.getRequestId();
+            // 🔧 Bug #442: 跳过 requestId 为 null 的记录，避免删除不存在的药品请求
+            if (requestId == null) {
+                log.warn("BugFix#442: handMedication - 跳过 requestId 为 null 的删除请求");
+                continue;
+            }
+            iMedicationRequestService.removeById(requestId);
            // 删除已经产生的药品发放信息
            iMedicationDispenseService.deleteMedicationDispense(adviceSaveDto.getRequestId());
            // 🔧 Bug Fix #219: 删除费用项
-            Long requestId = adviceSaveDto.getRequestId();
            String serviceTable = CommonConstants.TableName.MED_MEDICATION_REQUEST;
            // 直接删除费用项
            iChargeItemService.deleteByServiceTableAndId(serviceTable, requestId);
@@ -1417,6 +1424,11 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
        log.info("BugFix#219: handDevice - 开始删除循环, deleteList.size={}", deleteList.size());
        for (AdviceSaveDto adviceSaveDto : deleteList) {
            Long requestId = adviceSaveDto.getRequestId();
+            // 🔧 Bug #442: 跳过 requestId 为 null 的记录，避免删除不存在的耗材请求
+            if (requestId == null) {
+                log.warn("BugFix#442: handDevice - 跳过 requestId 为 null 的删除请求");
+                continue;
+            }
            log.info("BugFix#219: handDevice - 删除开始: requestId={}", requestId);
            
            // 1. 删除耗材请求
@@ -1721,12 +1733,17 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
            }
        }
        for (AdviceSaveDto adviceSaveDto : deleteList) {
-            iServiceRequestService.removeById(adviceSaveDto.getRequestId());// 删除诊疗
+            Long requestId = adviceSaveDto.getRequestId();
+            // 🔧 Bug #442: 跳过 requestId 为 null 的记录，避免删除不存在的诊疗请求
+            if (requestId == null) {
+                log.warn("BugFix#442: handService - 跳过 requestId 为 null 的删除请求");
+                continue;
+            }
+            iServiceRequestService.removeById(requestId);// 删除诊疗
            iServiceRequestService.remove(
                    new LambdaQueryWrapper<ServiceRequest>().eq(ServiceRequest::getParentId,
-                            adviceSaveDto.getRequestId()));// 删除诊疗套餐对应的子项
+                            requestId));// 删除诊疗套餐对应的子项
            // 🔧 Bug Fix #219: 删除费用项
-            Long requestId = adviceSaveDto.getRequestId();
            String serviceTable = CommonConstants.TableName.WOR_SERVICE_REQUEST;
            // 直接删除费用项
            iChargeItemService.deleteByServiceTableAndId(serviceTable, requestId);
@@ -1783,8 +1800,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                log.info("handService - 自动补全founderOrgId: founderOrgId={}", adviceSaveDto.getFounderOrgId());
            }
            
-            // 🔧 Bug Fix #238: 诊疗项目执行科室非空校验
-            if (adviceSaveDto.getAdviceType() != null && adviceSaveDto.getAdviceType() == 3) {
+            // 🔧 Bug Fix #238/#454: 诊疗项目执行科室非空校验（删除操作跳过校验）
+            if (adviceSaveDto.getAdviceType() != null && adviceSaveDto.getAdviceType() == 3
+                    && !DbOpType.DELETE.getCode().equals(adviceSaveDto.getDbOpType())) {
                Long effectiveOrgId = adviceSaveDto.getEffectiveOrgId();
                if (effectiveOrgId == null) {
                    throw new ServiceException("诊疗项目必须选择执行科室");
--- 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/RequestFormManageAppServiceImpl.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/RequestFormManageAppServiceImpl.java
@@ -76,6 +76,13 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
    @Override
    @Transactional(rollbackFor = Exception.class)
    public R<?> saveRequestForm(RequestFormSaveDto requestFormSaveDto, String typeCode) {
+        // 诊疗执行科室配置校验（必须在任何数据库操作之前）
+        List<ActivityOrganizationConfigDto> activityOrganizationConfig =
+            requestFormManageAppMapper.getActivityOrganizationConfig(typeCode);
+        if (activityOrganizationConfig.isEmpty()) {
+            throw new ServiceException("请先配置当前时间段的执行科室");
+        }
+
        // 诊疗处方号
        String prescriptionNo;
        // 申请单ID
@@ -142,12 +149,6 @@ public class RequestFormManageAppServiceImpl implements IRequestFormManageAppSer
        // 诊疗集合
        List<ActivitySaveDto> activityList = requestFormSaveDto.getActivityList();
        log.info("保存申请单，typeCode={}, activityListSize={}, encounterId={}", typeCode, activityList != null ? activityList.size() : 0, encounterId);
-        // 诊疗执行科室配置
-        List<ActivityOrganizationConfigDto> activityOrganizationConfig =
-            requestFormManageAppMapper.getActivityOrganizationConfig(typeCode);
-        if (activityOrganizationConfig.isEmpty()) {
-            throw new ServiceException("请先配置当前时间段的执行科室");
-        }

        for (ActivitySaveDto activitySaveDto : activityList) {
            serviceRequest = new ServiceRequest();
@@ -474,68 +475,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
@@ -99,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")
@@ -163,7 +163,7 @@ public class RequestFormManageController {
            @RequestParam(required = false) Long applyDeptId,
            @RequestParam(defaultValue = "1") Integer pageNo,
            @RequestParam(defaultValue = "10") Integer pageSize) {
-        RequestFormDto dto = new RequestFormDto(surgeryNo, null, applyTimeStart, applyTimeEnd,
+        RequestFormDto dto = new RequestFormDto(surgeryNo, ActivityDefCategory.PROCEDURE.getCode(), applyTimeStart, applyTimeEnd,
                mainDoctorId, applyDeptId, pageNo, pageSize);
        return R.ok(iRequestFormManageAppService.getRequestFormPage(dto));
    }
--- 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/AdviceManageAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/AdviceManageAppMapper.xml
@@ -288,7 +288,7 @@
        AND T1.refund_device_id IS NULL
        ORDER BY T1.status_enum)
        UNION ALL
-        (SELECT CASE WHEN T1.category_enum = 4 THEN 6 ELSE COALESCE(T1.category_enum, 3) END AS advice_type,
+        (SELECT CASE WHEN T1.category_enum = 4 THEN 6 ELSE 3 END AS advice_type,
        T1.id AS request_id,
        T1.id || '-3' AS unique_key,
        T1.requester_id AS requester_id,
@@ -373,4 +373,4 @@
        </if>
    </select>

-</mapper>
+</mapper>
--- a/openhis-server-new/openhis-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/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
@@ -372,7 +372,6 @@ import {
 } from './diagnosistreatment';
 import PopoverList from '@/components/OpenHis/popoverList/index.vue';
 import medicineList from './medicineList.vue';
-import MedicineList from '../components/medicineList.vue';
 import {getCurrentInstance, nextTick, watch} from 'vue';

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

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

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

 // 获取诊疗项目列表
 function getList() {
@@ -53,7 +54,7 @@ function getList() {
  getDiagnosisTreatmentList({ statusEnum: 2, pageSize: 1000, pageNo: 1 })
    .then((res) => {
      diagnosisTreatmentList.value =
-        res.data?.records?.filter((item) => item.childrenJson == null) || [];
+        res.data?.records?.filter((item) => item.childrenJson == null || item.childrenJson === '') || [];
      filterList(); // 初始化过滤
      hasLoaded.value = true; // 标记为已加载
    })
@@ -62,6 +63,47 @@ function getList() {
    });
 }

+// 服务端搜索（当用户输入搜索关键词时）
+function searchList(searchKey) {
+  if (!searchKey || searchKey.trim() === '') return;
+  isLoading.value = true;
+  // 使用较大的pageSize确保搜索结果尽可能多
+  getDiagnosisTreatmentList({ statusEnum: 2, searchKey: searchKey.trim(), pageSize: 5000, pageNo: 1 })
+    .then((res) => {
+      diagnosisTreatmentList.value =
+        res.data?.records?.filter((item) => item.childrenJson == null || item.childrenJson === '') || [];
+      filterList();
+    })
+    .catch((err) => {
+      console.error('搜索诊疗项目数据失败:', err);
+    })
+    .finally(() => {
+      isLoading.value = false;
+    });
+}
+
+// 获取预加载数据（不带搜索关键词时使用）
+function loadPreloadedData() {
+  if (props.preloadedData && props.preloadedData.length > 0) {
+    diagnosisTreatmentList.value = props.preloadedData;
+    filterList();
+    hasLoaded.value = true;
+    return;
+  }
+
+  if (hasLoaded.value) return;
+  getDiagnosisTreatmentList({ statusEnum: 2, pageSize: 1000, pageNo: 1 })
+    .then((res) => {
+      diagnosisTreatmentList.value =
+        res.data?.records?.filter((item) => item.childrenJson == null || item.childrenJson === '') || [];
+      filterList();
+      hasLoaded.value = true;
+    })
+    .catch((err) => {
+      console.error('获取诊疗项目数据失败:', err);
+    });
+}
+
 // 监听shouldLoadData属性变化，仅在首次为true时加载数据
 watch(
  () => props.shouldLoadData,
@@ -86,11 +128,17 @@ watch(
  { immediate: true }
 );

-// 监听搜索关键词变化，实时过滤数据
+// 监听搜索关键词变化，有搜索词时走服务端搜索，否则走本地过滤
 watch(
  () => props.searchKey,
-  () => {
-    filterList();
+  (newVal) => {
+    if (newVal && newVal.trim() !== '') {
+      // 有搜索关键词，走服务端搜索
+      searchList(newVal);
+    } else {
+      // 搜索词为空，使用预加载数据
+      loadPreloadedData();
+    }
  }
 );

--- a/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/clinicmanagement/bargain/component/prescriptionlist.vue
@@ -880,19 +880,23 @@ function handleDelete() {
    proxy.$modal.msgWarning('请选择要删除的项目');
    return;
  }
-  
+
  let deleteList = groupIndexList.value.map((index) => {
    const item = prescriptionList.value[index];
    // 只删除待签发且未收费的项目
    if (item.statusEnum != 1 || item.chargeStatus == 5) {
      return null;
    }
+    // 🔧 Bug #442: 已保存的行必须有有效的 requestId，否则跳过（避免后端删除不存在的记录）
+    if (item.requestId == null || item.requestId === undefined || item.requestId === '') {
+      return null;
+    }
    return {
      requestId: item.requestId,
      dbOpType: '3',
      adviceType: item.adviceType,
    };
-  }).filter(item => item !== null); // 过滤掉已签发或已收费的项目
+  }).filter(item => item !== null); // 过滤掉已签发、已收费或无 requestId 的项目
  
  if (deleteList.length == 0) {
    proxy.$modal.msgWarning('只能删除待签发且未收费的项目');
--- a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue
@@ -1243,11 +1243,14 @@ async function show(diagnosisData) {
    const res = await getNextCardNo(orgCode);
    if (res.code === 200 && res.data && res.data.length >= 12) {
      cardNo = res.data;
+    } else {
+      // API返回失败或不合规时，生成临时卡号避免保存时 cardNo 为空导致后端校验失败
+      cardNo = 'TEMP_' + Date.now();
    }
-    // API失败或返回不合规时保持为空字符串，由用户手动填写或后端自动生成
  } catch (err) {
    console.error('获取卡片编号失败:', err);
-    // 保持为空，不使用不合规的临时值
+    // API调用异常时，生成临时卡号
+    cardNo = 'TEMP_' + Date.now();
  }

  form.value = {
@@ -1430,8 +1433,8 @@ async function buildSubmitData() {
 function validateFormManually() {
  const errors = [];

-  // 卡片编号验证（至少12位，后端自动生成16位编号）
-  if (form.value.cardNo && form.value.cardNo.length < 12) {
+  // 卡片编号验证（至少12位，后端自动生成16位编号；临时卡号 TEMP_ 开头允许通过）
+  if (form.value.cardNo && !form.value.cardNo.startsWith('TEMP_') && form.value.cardNo.length < 12) {
    errors.push('卡片编号至少12位');
  }

--- a/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue
@@ -482,14 +482,28 @@ async function loadPackageDetails(row, treeNode, resolve) {
  }
 }

-// #428: 为已选择项目加载套餐明细
+// #428修复: 为已选择项目加载套餐明细（通过packageId或packageName查询）
 async function loadPackageDetailsForItem(item) {
-  if (!item.isPackage || !item.packageId) {
+  if (!item.isPackage || (!item.packageId && !item.packageName)) {
    return;
  }
  try {
+    let packageId = item.packageId;
+    if (!packageId && item.packageName) {
+      // CheckPart 没有 packageId 字段，需要通过 packageName 查询获取
+      const pkgRes = await listCheckPackage({ packageName: item.packageName });
+      let packages = pkgRes?.data || [];
+      if (!Array.isArray(packages)) {
+        packages = packages.records || packages.data || [];
+      }
+      if (packages.length === 0) {
+        item.packageDetails = [];
+        return;
+      }
+      packageId = packages[0].id;
+    }
    const res = await request({
-      url: `/system/package/${item.packageId}/details`,
+      url: `/system/package/${packageId}/details`,
      method: 'get'
    });
    if (res.code === 200 && res.data) {
@@ -497,7 +511,7 @@ async function loadPackageDetailsForItem(item) {
        ...detail,
        name: detail.name || detail.itemName,
        unit: detail.unit || '次',
-        price: detail.price || detail.itemPrice || 0,
+        price: detail.price || detail.unitPrice || 0,
        quantity: detail.quantity || 1
      }));
    } else {
@@ -697,6 +711,7 @@ async function handleCategoryExpand(cat) {
        code: m.code,
        price: m.price || 0,
        packageName: m.packageName || '',
+        packageId: m.packageId || null,
        packagePrice: m.packagePrice || null,
        serviceFee: m.serviceFee || null
      }));
@@ -715,7 +730,9 @@ function handleCollapseChange(activeName) {
  setTimeout(() => { isAnimating.value = false; }, 300);  // 与 CSS 过渡时长一致

  if (activeName) {
-    const cat = filteredCategoryList.value.find(c => c.typeId == activeName);
+    // Bug #428修复: 直接从 categoryList（原始响应式数组）查找分类，
+    // 确保后续 handleCategoryExpand 对 cat.methods 的赋值能正确触发 Vue 响应式更新
+    const cat = categoryList.value.find(c => c.typeId == activeName);
    if (cat && (!cat.methods || cat.methods.length === 0)) {
      handleCategoryExpand(cat);  // 异步加载，不 await
    }
@@ -1008,11 +1025,16 @@ function handleRowClick(row) {
  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;
+    // Bug #408修复: items 在 AjaxResult 顶层(res.items / resp.items)，不在 ExamApply 对象内
+    // 防御性提取：优先取顶层 items，兼容嵌套在 resp.data.items 的情况
+    let rawItems = res.items || resp.items;
+    if (!rawItems && resp.data && typeof resp.data === 'object') {
+      rawItems = resp.data.items;
+    }
+    rawItems = rawItems || [];
    const d = resp.data || resp;
    if (d) Object.assign(form, d);
-    if (rawItems && Array.isArray(rawItems)) {
+    if (Array.isArray(rawItems) && rawItems.length > 0) {
      try {
        // 为每个项目加载检查方法
        const itemsWithMethods = await Promise.all(rawItems.map(async m => {
@@ -1043,12 +1065,18 @@ function handleRowClick(row) {
                  code: md.code,
                  price: m.itemFee || 0,  // fallback 到已保存的价格
                  packageName: md.packageName || '',
+                  packageId: md.packageId || null,
                  packagePrice: md.packagePrice || null,  // Bug #384修复: 套餐价格
                  serviceFee: md.serviceFee || null
                }));
                // 如果有已保存的检查方法信息，尝试匹配
                if (m.checkMethodId) {
                  item.selectedMethod = item.methods.find(md => md.id === m.checkMethodId) || null;
+                  // 从已保存的方法中获取套餐信息
+                  if (item.selectedMethod?.packageId) {
+                    item.isPackage = true;
+                    item.packageId = item.selectedMethod.packageId;
+                  }
                }
              }
            } catch (err) {
@@ -1109,6 +1137,13 @@ async function handleMethodSelect(checked, method, cat) {
    const existingItem = selectedItems.value.find(s => s.id === targetItem.id);
    if (existingItem) {
      existingItem.selectedMethod = method;
+      // 从方法中获取套餐信息
+      if (method.packageId) {
+        existingItem.isPackage = true;
+        existingItem.packageId = method.packageId;
+        // 预加载套餐明细
+        loadPackageDetailsForItem(existingItem);
+      }
      updateMethodDisplay();
      return;
    }
@@ -1116,14 +1151,15 @@ async function handleMethodSelect(checked, method, cat) {
    // 如果该项目不存在，创建一个并关联方法
    if (selectedItems.value.length > 0) {
      const currentCategory = selectedItems.value[0].checkType;
-      const newCategory = cat.typeCode || '';
+      // Bug #428修复: 使用 cat.typeName 进行比较（与 newItem.checkType 保持一致）
+      const newCategory = cat.typeName || '';
      if (currentCategory !== newCategory) {
        ElMessage.warning('一个检查单不能同时选择多个项目类型的检查项目');
        return;
      }
    }

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

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

    if (selectedItems.value.length > 0) {
      const currentCategory = selectedItems.value[0].checkType;
-      const newCategory = cat.typeCode || '';
+      // Bug #428修复: 使用 cat.typeName 进行比较（与 effectiveCheckType 保持一致）
+      const newCategory = cat.typeName || '';
      if (currentCategory !== newCategory) {
        ElMessage.warning('一个检查单不能同时选择多个项目类型的检查项目');
        item.checked = false;
@@ -1214,6 +1259,7 @@ async function handleItemSelect(checked, item, cat) {
      selectedMethod: null,
      expanded: false,  // Bug #384修复: 新增展开状态，默认不展开
      isPackage: !!item.packageName,  // Bug #428修复: 标记是否为套餐
+      packageName: item.packageName || null,  // Bug #426修复: 套餐名称，用于查找packageId
      packageId: item.packageId || null  // Bug #428修复: 套餐ID
    });

--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -3326,9 +3326,13 @@ function syncGroupFields(row) {
  }
  
  // 同步执行科室
+  // 🔧 Bug #455: 诊疗类医嘱(adviceType=3)不使用项目配置的执行科室，
+  // 避免配置ID不在机构树中导致显示原始ID，保持患者就诊科室即可
  if (row.orgId || row.positionId) {
-    // 🔧 修复：优先使用项目所属科室(orgId)，其次positionId
-    prescriptionList.value[rowIndex.value].orgId = row.orgId || row.positionId;
+    if (Number(row.adviceType) != 3) {
+      // 🔧 修复：优先使用项目所属科室(orgId)，其次positionId
+      prescriptionList.value[rowIndex.value].orgId = row.orgId || row.positionId;
+    }
  }
  
  // 同步皮试标记
@@ -3412,8 +3416,11 @@ async function setValue(row) {
    showPopover: false, // 确保查询框关闭
  };
  console.log('[BugFix] setValue - prescriptionList[rowIndex].adviceType_dictText:', prescriptionList.value[rowIndex.value].adviceType_dictText);
-  // 🔧 Bug #455: 执行科室默认逻辑：使用positionId(诊疗执行科室配置) → 患者就诊科室，不再使用row.orgId(项目所属科室)
-  prescriptionList.value[rowIndex.value].orgId = row.positionId || props.patientInfo?.orgId;
+  // 🔧 Bug #455: 诊疗医嘱(adviceType=3)的执行科室默认使用患者就诊科室，
+  // 不使用positionId(诊疗目录配置的执行科室)，避免配置ID不在机构树中导致显示原始ID
+  if (Number(row.adviceType) != 3) {
+    prescriptionList.value[rowIndex.value].orgId = row.positionId || props.patientInfo?.orgId;
+  }
  prescriptionList.value[rowIndex.value].dose = row.dose || row.doseQuantity;
  prescriptionList.value[rowIndex.value].quantity = row.quantity || 1;
  prescriptionList.value[rowIndex.value].unitCodeList = unitCodeList.value;
--- 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
@@ -72,6 +72,45 @@
              <el-input v-model="form.attention" autocomplete="off" type="textarea" />
            </el-form-item>
          </el-col>
+          <!-- 申请类型 -->
+          <el-col :span="12">
+            <el-form-item label="申请类型" prop="applicationType" style="width: 100%">
+              <el-radio-group v-model="form.applicationType">
+                <el-radio :value="0">普通</el-radio>
+                <el-radio :value="1">急诊</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <!-- 标本类型 -->
+          <el-col :span="12">
+            <el-form-item label="标本类型" prop="specimenName" style="width: 100%">
+              <el-select v-model="form.specimenName" placeholder="请选择标本类型" style="width: 100%">
+                <el-option label="血液" value="血液" />
+                <el-option label="尿液" value="尿液" />
+                <el-option label="粪便" value="粪便" />
+                <el-option label="痰液" value="痰液" />
+                <el-option label="咽拭子" value="咽拭子" />
+                <el-option label="脑脊液" value="脑脊液" />
+                <el-option label="胸腹水" value="胸腹水" />
+                <el-option label="关节液" value="关节液" />
+                <el-option label="分泌物" value="分泌物" />
+                <el-option label="其他" value="其他" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <!-- 执行时间 -->
+          <el-col :span="12">
+            <el-form-item label="执行时间" prop="executeTime" style="width: 100%">
+              <el-date-picker
+                v-model="form.executeTime"
+                type="datetime"
+                placeholder="选择执行时间"
+                format="YYYY-MM-DD HH:mm:ss"
+                value-format="YYYY-MM-DD HH:mm:ss"
+                style="width: 100%"
+              />
+            </el-form-item>
+          </el-col>
        </el-row>
      </el-form>
    </div>
@@ -152,6 +191,9 @@ const form = reactive({
  otherDiagnosis: '', // 其他诊断
  relatedResult: '', // 相关结果
  attention: '', // 注意事项
+  applicationType: 0, // 申请类型 0-普通 1-急诊
+  specimenName: '血液', // 标本类型
+  executeTime: null, // 执行时间
  primaryDiagnosisList: [], //主诊断目录
  otherDiagnosisList: [], //其他断目录
 });
@@ -164,7 +206,7 @@ onMounted(() => {
 * type(1：watch监听类型 2:点击保存类型)
 * selectProjectIds(选中项目的id数组)
 * */
-const projectWithDepartment = (selectProjectIds) => {
+const projectWithDepartment = (selectProjectIds, type) => {
  //1.获取选中的项目 2.判断项目的执行科室是否相同 3.判断执行科室是否配置 4.将项目的执行科室复值到执行科室下拉选位置
  let isRelease = true;
  // 选中项目的数组
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/medicalExaminations.vue
@@ -483,7 +483,7 @@ const submit = () => {
    encounterId: patientInfo.value.encounterId,
    organizationId: patientInfo.value.inHospitalOrgId,
    requestFormId: '',
-    name: '检查申请单',
+    name: applicationListAllFilter.map(item => item.adviceName).join('、'),
    descJson: JSON.stringify(submitForm),
    categoryEnum: '2',
  }).then((res) => {
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/surgery.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/applicationForm/surgery.vue
@@ -5,16 +5,14 @@
 -->
 <template>
  <div class="surgery-container">
-    <div class="transfer-wrapper">
-      <div v-loading="loading" style="min-height: 300px;">
-        <el-transfer
-          v-model="transferValue"
-          :data="applicationList"
-          filter-placeholder="项目代码/名称"
-          filterable
-          :titles="['未选择', '已选择']"
-        />
-      </div>
+    <div v-loading="loading" class="transfer-wrapper" style="min-height: 300px;">
+      <el-transfer
+        v-model="transferValue"
+        :data="applicationList"
+        filter-placeholder="项目代码/名称"
+        filterable
+        :titles="['未选择', '已选择']"
+      />
    </div>
    <div class="bloodTransfusion-form">
      <el-form :model="form" :rules="rules" ref="formRef" label-width="120px" class="demo-ruleForm">
@@ -103,8 +101,8 @@ const findTreeItem = (list, id) => {
 const emits = defineEmits(['submitOk']);
 const props = defineProps({});
 const state = reactive({});
-const applicationListAll = ref([]);
-const applicationList = ref([]);
+const applicationListAll = ref();
+const applicationList = ref();
 const orgOptions = ref([]); // 科室选项
 const loading = ref(false); // 加载状态
 const getList = () => {
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
@@ -631,12 +631,6 @@ 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;
@@ -1187,19 +1181,27 @@ function handleSave() {
    });
    // 此处签发处方和单行保存处方传参相同，后台已经将传参存为JSON字符串，此处直接转换为JSON即可
    loading.value = true;
-    let list = saveList.map((item) => {
-      const parsedContent = JSON.parse(item.contentJson);
-      return {
-        ...parsedContent,
-        adviceType: item.adviceType,
-        requestId: item.requestId,
-        dbOpType: '1',
-        groupId: item.groupId,
-        uniqueKey: undefined,
-        // 确保 therapyEnum 被正确传递
-        therapyEnum: parsedContent.therapyEnum || item.therapyEnum || '1',
-      };
-    });
+    let list = [];
+    try {
+      list = saveList.map((item) => {
+        const parsedContent = item.contentJson ? JSON.parse(item.contentJson) || {} : {};
+        return {
+          ...parsedContent,
+          adviceType: item.adviceType,
+          requestId: item.requestId,
+          dbOpType: '1',
+          groupId: item.groupId,
+          uniqueKey: undefined,
+          // 确保 therapyEnum 被正确传递
+          therapyEnum: parsedContent.therapyEnum || item.therapyEnum || '1',
+        };
+      });
+    } catch (error) {
+      loading.value = false;
+      isSaving.value = false;
+      proxy.$modal.msgError('医嘱内容解析失败，请检查待签发医嘱');
+      return;
+    }
    // 保存签发按钮
    isSaving.value = true;
    console.log('签发处方参数：', {
@@ -1449,12 +1451,6 @@ function handleSaveBatch() {
    })
    .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 || '保存失败，请重试');
    });
 }
--- a/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/prescriptionList.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/prescriptionList.vue
@@ -302,6 +302,29 @@ function getSelectRows() {
  });
  return list;
 }
+
+function getTableRef(index) {
+  return proxy.$refs['tableRef' + index]?.[0];
+}
+
+function selectAllRows() {
+  prescriptionList.value.forEach((item, index) => {
+    const tableRef = getTableRef(index);
+    if (!tableRef) {
+      return;
+    }
+    item.forEach((row) => {
+      tableRef.toggleRowSelection(row, true);
+    });
+  });
+}
+
+function clearSelection() {
+  prescriptionList.value.forEach((item, index) => {
+    getTableRef(index)?.clearSelection();
+  });
+}
+
 function handleRateChange(value, item, row) {
  // 拼接当前选中时间
  if (value) {
@@ -319,6 +342,8 @@ function handleRateChange(value, item, row) {
 defineExpose({
  handleGetPrescription,
  handleMedicineSummary,
+  selectAllRows,
+  clearSelection,
 });
 </script>

--- a/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/index.vue
@@ -69,7 +69,11 @@
        </div>
        <div>
          <span class="descriptions-item-label">全选：</span>
-          <el-switch v-model="chooseAll" @change="handelSwicthChange" />
+          <el-switch
+            v-model="chooseAll"
+            :disabled="isDetails != '1'"
+            @change="handelSwicthChange"
+          />
          <el-button class="ml20 mr20" type="primary" @click="handleExecute"> 汇总领药 </el-button>
        </div>
      </div>
@@ -160,24 +164,31 @@ function handleClick(tabName) {
 }

 function handleGetPrescription() {
-  prescriptionRefs.value.handleGetPrescription();
+  chooseAll.value = false;
+  prescriptionRefs.value?.handleGetPrescription();
 }

-function handelSwicthChange() {
-  if (chooseAll.value) {
-    proxy.$refs['prescriptionRefs'].selectAllRows();
+function handelSwicthChange(value) {
+  if (!prescriptionRefs.value) {
+    chooseAll.value = false;
+    return;
+  }
+  if (value) {
+    prescriptionRefs.value.selectAllRows();
  } else {
-    proxy.$refs['prescriptionRefs'].clearSelection();
+    prescriptionRefs.value.clearSelection();
  }
 }

 function handleRadioChange(value) {
+  chooseAll.value = false;
  if (value == '1') {
    handleGetPrescription();
  }
 }

 function handleTherapyChange() {
+  chooseAll.value = false;
  handleGetPrescription();
 }

@@ -216,4 +227,4 @@ provide('handleGetPrescription', (value) => {
 :deep(.el-tabs__header) {
  margin: 0;
 }
-</style>
+</style>
--- a/openhis-ui-vue3/src/views/surgicalschedule/index.vue
+++ b/openhis-ui-vue3/src/views/surgicalschedule/index.vue
@@ -885,11 +885,21 @@ 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 { getTenantPage } from '@/api/system/tenant'
 import { getContract } from '@/views/inpatientDoctor/home/components/api.js'
+import request from '@/utils/request'
 import SurgeryCharge from '../charge/surgerycharge/index.vue'
 import TemporaryMedical from './temporaryMedical.vue'

+// 静默获取卫生机构列表（跳过拦截器错误提示，手术室护士等角色可能无此权限）
+function getTenantPageSilent(query) {
+  return request({
+    url: '/system/tenant/page',
+    method: 'get',
+    params: query,
+    skipErrorMsg: true
+  })
+}
+
 const { proxy } = getCurrentInstance()
 const userStore = useUserStore()
 const loading = ref(true)
@@ -1118,7 +1128,7 @@ onMounted(() => {

 // 加载卫生机构列表
 function loadOrgList() {
-  getTenantPage({ pageNo: 1, pageSize: 1000 })
+  getTenantPageSilent({ pageNo: 1, pageSize: 1000 })
    .then(res => {
      if (res.code === 200) {
        const records = res.data?.records || res.data || []
--- a/sql/bug_434_add_incision_level_to_op_schedule.sql
+++ b/sql/bug_434_add_incision_level_to_op_schedule.sql
@@ -0,0 +1,5 @@
+-- Bug #434 修复：为 op_schedule 表添加 incision_level 字段
+-- 手术安排表需要存储切口类型，以便在编辑弹窗中正确回显和保存
+ALTER TABLE op_schedule ADD COLUMN IF NOT EXISTS incision_level INT2;
+
+COMMENT ON COLUMN op_schedule.incision_level IS '手术切口等级 1-I级切口 2-II级切口 3-III级切口 4-IV级切口';
Author	SHA1	Message	Date
赵云	80695d90f9	Fix Bug #475 : 【住院医生工作站】开立检查申请单报错"请先配置当前时间段的执行科室"后，系统仍生成申请记录根因：saveRequestForm 方法中，执行科室配置校验（activityOrganizationConfig.isEmpty）位于 saveOrUpdate(requestForm) 之后，导致即使校验失败抛出异常，RequestForm 记录已被写入数据库。修复：将校验逻辑移至方法开头，在任何数据库操作之前执行，确保校验失败时不产生任何脏数据。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 18:12:18 +08:00
关羽	deb6ade97b	Fix Bug #472 : 住院医生工作站-手术申请单：勾选手术项目无效，导致无法正常开立医嘱根因分析：surgery.vue 的 el-transfer 组件存在两处与其他正常组件（bloodTransfusion.vue、laboratoryTests.vue）不一致的地方： 1. v-loading 被放置在了 transfer-wrapper 内部的额外 div 上，导致 Element Plus 的加载遮罩层可能与穿梭框交互层产生遮挡冲突 2. applicationList 和 applicationListAll 初始化为 ref([])，而其他组件使用 ref()，导致 Vue 响应式更新时穿梭框内部状态追踪存在差异修复： - 将 v-loading 直接放到 transfer-wrapper div 上，去除多余的嵌套 div，与 bloodTransfusion/laboratoryTests 保持一致 - 将 applicationListAll 和 applicationList 的初始化从 ref([]) 改为 ref() Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 18:12:17 +08:00
荀彧	2d7228ca5d	Fix Bug #470 : 住院医生工作站-手术申请单加载手术项目耗时过长，影响医生开单效率性能优化: 1. 数据库层: 为 wor_activity_definition 表添加手术项目专用覆盖索引 (idx_wor_activity_def_surgery_covering) - 查询从 Index Scan + Filter 改为 Index Only Scan - 执行时间从 4.6ms 降至 0.67ms (约7倍提升) 2. Java服务层: 过滤 chargeItemDefinitionIdList 中的 null 值 - 手术项目无定价定义,原逻辑会将 null 传入批量查询造成浪费 - 同时跳过 childCharge 批次定价查询(仅药品/耗材需要) Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 18:10:44 +08:00
关羽	a447e55d43	Fix Bug #471 : 手术管理-门诊手术安排：手术申请查询结果中混入住院检验申请单数据（脏数据）根因：getSurgeryRequestFormPage 接口构建 RequestFormDto 时 typeCode 传了 null，导致 SQL 中 type_code 过滤条件被跳过，查出所有申请单（包括 typeCode=22 的住院检验申请单）。修复：传入 ActivityDefCategory.PROCEDURE.getCode()（值为"24"）作为 typeCode，确保只查询手术类型的申请单。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 18:06:09 +08:00
xiaoming	1be0dc2417	bug515 [住院医生站-临床医嘱] 点击“签发”检验医嘱后系统陷入死循环，Loading无法消失后端advice_type映射错误	2026-05-13 17:49:27 +08:00
xiaoming	a4b4d36d93	bug512 [住院护士站-汇总发药申请] “全选”开关功能失效，点击后下方医嘱明细未能联动勾选	2026-05-13 17:48:26 +08:00
关羽	940fad5c7d	Fix Bug #464 : [目录管理-诊疗目录] 新增项目时"零售价"未与"诊疗子项"合计总价自动同步 - calculateTotalPrice: 使用 nextTick 确保 Vue 响应式时序正确，零售价与总价同步 - calculateTotalPrice: 修复判断条件，使用 adviceDefinitionId 而非 retailPrice/childrenRequestNum（可能为0） - calculateTotalPrice: 使用 Number() 替代 parseFloat/parseInt 统一类型转换 - selectRow: 使用 nextTick 确保 DOM 更新后再计算总价，避免时序问题 - edit/reset: treatmentItems 初始化补充缺失的 name 字段 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 17:21:53 +08:00
关羽	ead3733aac	Fix Bug #466 : [住院医生工作站-检验申请] 申请单界面缺失核心质控字段（申请类型、标本类型、执行时间）及联动逻辑在检验申请单弹窗表单中新增三个核心质控字段： - 申请类型：单选按钮，区分普通/急诊，默认普通 - 标本类型：下拉选择框，支持血液/尿液/痰液等10种标本，默认血液 - 执行时间：日期时间选择器，支持预约未来时间执行新字段通过 descJson 序列化传递，展示页已支持解析显示。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 17:19:51 +08:00
关羽	28bf385ec2	Fix Bug #463 : [目录管理-诊疗目录] 新增/编辑弹窗中"诊疗子项"检索功能失效，无法搜到已维护的项目根因分析：medicineList.vue 的搜索功能仅做本地过滤，数据受限于初始加载的1000条（pageSize: 1000），输入搜索关键词时不会向后端发起新的请求，导致不在前1000条内的项目无法被搜到。修复策略： 1. medicineList.vue：当用户输入搜索关键词时，新增 searchList() 走服务端搜索（调用 API 的 searchKey 参数），使用 pageSize: 5000 提高搜索覆盖率；搜索词清空时恢复使用预加载数据 2. 放宽 childrenJson 过滤条件，从严格的 == null 改为兼容空字符串（== null \|\| === ''） 3. 修复 diagnosisTreatmentDialog.vue 中 medicineList 的重复 import	2026-05-13 17:17:02 +08:00
关羽	31f7c4f32a	Fix Bug #455 : 门诊医生站-医嘱：开立诊疗医嘱时执行科室默认获取逻辑有误且显示为原始ID 根因分析： - setValue函数对所有类型统一设置orgId=row.positionId - 诊疗项目(adviceType=3)的positionId来自adm_organization_location配置表 - 当配置ID不在当前机构树中时，findOrgNameById返回空，el-tree-select显示原始ID - 后续if(!orgId)判断因已有值而不触发回退到患者就诊科室修复方案： - 诊疗类型(adviceType=3)跳过positionId赋值，使用患者就诊科室作为默认执行科室 - 同时修复syncGroupFields中会覆盖orgId的问题 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 16:13:35 +08:00
关羽	480663f716	Fix Bug #454 : 门诊医生站-医嘱页签：删除"待签发"状态的检验项目时，错误触发"执行科室"校验导致删除失败在handService的执行科室校验中增加dbOpType DELETE跳过条件，作为BugFix#454过滤器的第二层防御。同时修复handMedication和handService中重复声明requestId变量导致的编译错误。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 16:12:38 +08:00
关羽	cc484d5f10	Fix Bug #442 : 手术计费：点击"删除"待签发耗材时异常报错，导致操作失败根因：手术计费场景中"待签发"耗材的 requestId 来自 adm_charge_item.service_id，当 service_id 为 null 或对应的 wor_device_request 记录不存在时，后端 removeById(null) 或 removeById(不存在ID) 会抛出异常导致删除失败。修复策略： - 前端(prescriptionlist.vue): handleDelete 中增加 requestId 有效性校验，过滤掉 requestId 为 null/undefined/空的项，避免发送无效删除请求 - 后端(DoctorStationAdviceAppServiceImpl.java): handMedication/handDevice/handService 三个删除路径增加 requestId null check，跳过无效记录而非抛出异常 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 15:16:45 +08:00
赵云	30f8cdbd80	Fix Bug #428 : 门诊医生站-检查申请：未实现分类联动检查方法及套餐明细展示与勾选逻辑修复三个根因问题： 1. handleCollapseChange 从 filteredCategoryList（计算属性映射副本）查找分类，改为从 categoryList（原始响应式数组）查找，确保 handleCategoryExpand 对 cat.methods 的赋值能正确触发 Vue 响应式更新，分类展开后检查方法列表正常渲染 2. handleMethodSelect 跨分类检查中 cat.typeCode 与 newItem.checkType（cat.typeName）类型不匹配，改为统一使用 cat.typeName 比较 3. handleItemSelect 同样存在 typeCode vs typeName 不匹配问题，一并修复 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 15:12:09 +08:00
赵云	f4c6c12ef8	Fix Bug #441 : 门诊手术安排：手术室护士角色进入页面提示"无权限"且"获取卫生机构列表失败" 根因：HTTP 响应拦截器（request.js）会对所有非 200 响应自动弹出错误通知。手术室护士角色调用 /system/tenant/page 接口返回 403 时，拦截器先于组件的 .catch() 处理程序弹出"当前操作没有权限"通知，阻断页面体验。修复：新增 getTenantPageSilent 包装函数，通过 skipErrorMsg: true 配置跳过拦截器的自动错误提示，让 .catch() 中的 console.warn 静默降级处理。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 15:09:12 +08:00
关羽	8cf98008ae	Fix Bug #426 : 门诊医生站-检查开立：已选择列表应支持树形展开，显示套餐明细（项目/数量/单价）根因：CheckPart 实体只有 packageName 字段，没有 packageId 字段。前端 loadCategoryList 中 packageId 永远为 null，导致 loadPackageDetailsForItem 的 guard 条件 (!item.packageId) 永远提前返回，套餐明细无法加载。修复策略： 1. handleItemSelect 中添加 packageName 到 selectedItems 数据对象 2. loadPackageDetailsForItem 改为优先使用 packageId，若无则通过 packageName 调用 listCheckPackage API 查找 packageId（复用 loadMethodPackageDetails 已有的模式）	2026-05-13 15:05:51 +08:00
关羽	062c8d9dee	Fix Bug #412 : 门诊医生站：传染病报告卡保存失败，提示报错根因：getNextCardNo API 返回失败或异常时，infectiousDiseaseReportDialog.vue 将 cardNo 保持为空字符串。后端 DTO 对 cardNo 有 @NotBlank 校验，空字符串导致保存请求被拒绝。修复： 1. getNextCardNo API 失败时生成 TEMP_+timestamp 临时卡号 2. validateFormManually 放行 TEMP_ 开头的临时卡号 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 14:38:06 +08:00
荀彧	ffdfebaacf	Fix Bug #408 : 门诊医生站：检查标签页：选中检查申请记录后，"检查明细"标签页显示"暂无数据" 根因：handleRowClick 中从 API 响应提取 items 时，const resp = res.data \|\| res 将 resp 设为 ExamApply 对象（res.data 有值），导致 resp.items 为 undefined（ExamApply 对象没有 items 字段），items 实际位于 AjaxResult 顶层（res.items）。修复：防御性提取 items，优先取 res.items（AjaxResult 顶层），兼容 resp.items 和 resp.data.items 的嵌套情况，确保明细数据能正确加载到 selectedItems 中。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 14:34:29 +08:00
赵云	9ed52b7c48	Fix Bug #403 : 住院医生工作站：应用医嘱组套后，药品明细字段内容丢失未正确引入表格修复 handleSaveGroup 中 mergedDetail 和 newRow 构建时的空值处理问题： 1. mergedDetail 中 dose/doseQuantity/dispensePerDuration 使用严格 null 检查，避免组套中值为 null 时错误回退到 orderDetailInfos 2. newRow 中关键字段增加 mergedDetail 回退（?? 操作符），确保当 item 中字段为 null/undefined 时能从 setValue 填充的完整数据中获取 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 14:14:30 +08:00
关羽	fc1ed6c4ce	Fix Bug #401 : 门诊完诊审计日志错误：div_log 表中 pool_id 与 slot_id 存值与设计规范不符根因：DoctorStationMainAppServiceImpl.completeEncounter() 中获取 pool_id/slot_id 的逻辑有两处缺陷： 1. 当 queueItem 存在但 poolId 或 slotId 为 null 时，else if 分支因 queueItem != null 而跳过，导致未进入回退链路，最终 divPoolId 和 divSlotId 均为 null。修复：将 else if 拆为独立的 if 判断，确保 queueItem 值缺失时能正确回退。 2. 回退路径中先将 order.getSlotId() 赋给 divSlotId，再查询 ScheduleSlot 获取 poolId。若 Slot 查询失败（返回 null），则 divSlotId 有值但 divPoolId 为 null，产生不完整审计记录。修复：先查 Slot，成功后同时用 slot.getId() 和 slot.getPoolId() 赋值，保证数据一致性。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 14:07:15 +08:00
赵云	818564f5ba	Fix Bug #400 : 门诊医生站点击【完诊】后，triage_queue_item 表 status 字段未按规范更新为 30 根因分析： triage_queue_item.status 字段在 DDL 中定义为 VARCHAR(50)，但 Java 实体 TriageQueueItem.status 为 Integer 类型，应用层使用 TriageQueueStatus 枚举值 (0/10/20/30/40) 进行读写。数据类型不匹配导致 MyBatis-Plus 无法正确映射 status 字段，完诊时使用 LambdaUpdateWrapper 更新 status=30 操作失败。修复方案： 1. 修正 DDL：将 status 字段类型从 VARCHAR(50) 改为 INTEGER 2. 新增迁移 SQL：修改已有数据库表的 status 字段类型为 INTEGER Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 14:00:45 +08:00
关羽	78adbddfde	Fix Bug #405 : 住院医生工作站：临床医嘱保存成功后，医嘱条目仍处于可编辑状态（未锁定展示） - handleSaveSign: 新增行点击确定后调用savePrescription持久化到后端，而非仅设置isEdit=false后调用handleAddPrescription - handleSaveBatch: 修复nextId.value == 1 为赋值操作(=) - handleSaveBatch: catch块增加错误提示，保存失败时用户可感知 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 13:36:27 +08:00
赵云	861db6b0f5	Fix Bug #408 : 门诊医生站检查明细标签页显示暂无数据 - 修复handleRowClick中resp.items被d.data覆盖后丢失的问题根因：后端 getInfo 返回 { data: ExamApply, items: ExamApplyItem[] }，前端先将 resp 赋值给 d，随后又执行 d = resp.data，导致 d 变成 ExamApply 对象，后续 d.items 永远为 undefined，明细列表无法加载。修复：提前保存 resp.items 到 rawItems 变量，后续使用 rawItems 而非 d.items。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 13:24:02 +08:00
Ranyunqiao	b7df71fd0b	bug 362 428 436	2026-05-13 12:59:03 +08:00
陈琳	5bc8a8e517	Fix Bug #496 : 【住院医生工作站-检查申请】检查申请列表字段命名不规范及单号生成规则不符合医疗行业标准 1. 前端列标题：处方号 → 申请单号（表格列 + 详情弹窗） 2. 后端单号生成：原用 PAR 处方号前缀 → 改为 JCZ + yyMMdd + 5位顺序号 3. 新增 AssignSeqEnum.CHECK_APPLY_NO 枚举项（JCZ 前缀） Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 11:03:32 +08:00
xiaoming	0264fa9d58	Merge branch 'develop' of https://gitea.gentronhealth.com/wangyizhe/his into develop	2026-05-13 10:57:20 +08:00
xiaoming	cd12dd7a22	bug471 手术管理-门诊手术安排：手术申请查询结果中混入住院检验申请单数据（脏数据）	2026-05-13 10:45:33 +08:00
关羽	bfddf87b2c	Fix Bug #496 : 【住院医生工作站-检查申请】检查申请列表字段命名不规范及单号生成规则不符合医疗行业标准 1. 前端 examineApplication.vue：列表表头和详情弹窗中"处方号"改为"申请单号" 2. 后端 RequestFormManageAppServiceImpl：检查申请单单号生成规则由 PAR+流水号改为 JCZ+yyMMdd+5位顺序号（如：JCZ26051300001），其他类型申请单保持原有PAR规则不变 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 10:42:39 +08:00
关羽	84499d4ec1	Fix Bug #400 : 门诊医生站点击【完诊】后，triage_queue_item 表 status 字段未按规范更新为 30 根因：完诊时使用 triageQueueItemService.updateById(queueItem) 更新队列状态，依赖 MyBatis Plus 的实体级更新策略，可能因字段级更新策略导致 status 字段未实际写入数据库。修复策略：改用 LambdaUpdateWrapper 直接生成 UPDATE SQL，明确指定 SET status=30，绕过实体级更新策略，确保 status 字段必定写入数据库。同时增加更新失败日志。 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 10:37:02 +08:00
荀彧	01c5b62024	Fix Bug #401 : 门诊完诊审计日志错误：div_log 表中 pool_id 与 slot_id 存值与设计规范不符调整完诊时 div_log 的 pool_id/slot_id 获取优先级：优先使用 triage_queue_item （挂号时录入的号源信息，为权威来源），队列项不存在或值缺失时回退使用 encounter → order → slot → pool 链路 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-13 10:15:20 +08:00