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

根因：saveRequestForm 方法中，执行科室配置校验（activityOrganizationConfig.isEmpty）位于 saveOrUpdate(requestForm) 之后，导致即使校验失败抛出异常，RequestForm 记录已被写入数据库。
修复：将校验逻辑移至方法开头，在任何数据库操作之前执行，确保校验失败时不产生任何脏数据。

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

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("诊疗项目必须选择执行科室");

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

@@ -307,13 +307,15 @@ public class DoctorStationMainAppServiceImpl implements IDoctorStationMainAppSer
         if (queueItem != null && queueItem.getPoolId() != null && queueItem.getSlotId() != null) {
             divPoolId = queueItem.getPoolId();
             divSlotId = queueItem.getSlotId();
-        } else if (encounter.getOrderId() != null) {
+        }
+        // 队列项 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) {
-                    divSlotId = order.getSlotId();
-                    ScheduleSlot slot = scheduleSlotMapper.selectById(divSlotId);
+                    ScheduleSlot slot = scheduleSlotMapper.selectById(order.getSlotId());
                     if (slot != null) {
+                        divSlotId = slot.getId();
                         divPoolId = slot.getPoolId();
                     }
                 }

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

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

@@ -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));
     }

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>

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();
+  });
 }
 
 // 清空诊疗子项

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();
+    }
   }
 );
 

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('只能删除待签发且未收费的项目');

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位');
   }
 

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 {
@@ -716,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
     }
@@ -1009,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 => {
@@ -1130,7 +1151,8 @@ 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;
@@ -1215,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;
@@ -1236,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
     });
 

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;

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: [], //其他断目录
 });

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

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

@@ -1181,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('签发处方参数：', {
@@ -1571,17 +1579,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,
@@ -1600,20 +1612,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/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>
 

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>

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 || []

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级切口';