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 已有的模式）

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

@@ -228,10 +228,8 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
         // 医嘱定义ID集合
         List<Long> adviceDefinitionIdList = adviceBaseDtoList.stream().map(AdviceBaseDto::getAdviceDefinitionId)
                 .collect(Collectors.toList());
-        // 费用定价主表ID集合（过滤null值，手术项目无定价定义）
-        List<Long> chargeItemDefinitionIdList = adviceBaseDtoList.stream()
-                .map(AdviceBaseDto::getChargeItemDefinitionId)
-                .filter(Objects::nonNull)
+        // 费用定价主表ID集合
+        List<Long> chargeItemDefinitionIdList = adviceBaseDtoList.stream().map(AdviceBaseDto::getChargeItemDefinitionId)
                 .collect(Collectors.toList());
 
         // 判断是否包含药品或耗材类型（只有这些类型才需要库存相关查询）
@@ -277,9 +275,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             medLocationConfig = Collections.emptyList();
             allowedLocByCategory = Collections.emptyMap();
         }
-        // 费用定价子表信息 - 仅药品/耗材需要批次定价查询，手术/诊疗无库存概念不需要
+        // 费用定价子表信息 - 使用分批处理避免大量参数问题
         List<AdvicePriceDto> childCharge = new ArrayList<>();
-        if (hasMedOrDevice && chargeItemDefinitionIdList != null && !chargeItemDefinitionIdList.isEmpty()) {
+        if (chargeItemDefinitionIdList != null && !chargeItemDefinitionIdList.isEmpty()) {
             // 分批处理，每批最多1000个ID，增加批次大小以减少查询次数
             int batchSize = 1000;
             for (int i = 0; i < chargeItemDefinitionIdList.size(); i += batchSize) {
@@ -959,16 +957,11 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             }
         }
         for (AdviceSaveDto adviceSaveDto : deleteList) {
-            Long requestId = adviceSaveDto.getRequestId();
-            // 🔧 Bug #442: 跳过 requestId 为 null 的记录，避免删除不存在的药品请求
-            if (requestId == null) {
-                log.warn("BugFix#442: handMedication - 跳过 requestId 为 null 的删除请求");
-                continue;
-            }
-            iMedicationRequestService.removeById(requestId);
+            iMedicationRequestService.removeById(adviceSaveDto.getRequestId());
             // 删除已经产生的药品发放信息
             iMedicationDispenseService.deleteMedicationDispense(adviceSaveDto.getRequestId());
             // 🔧 Bug Fix #219: 删除费用项
+            Long requestId = adviceSaveDto.getRequestId();
             String serviceTable = CommonConstants.TableName.MED_MEDICATION_REQUEST;
             // 直接删除费用项
             iChargeItemService.deleteByServiceTableAndId(serviceTable, requestId);
@@ -1424,11 +1417,6 @@ 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. 删除耗材请求
@@ -1733,17 +1721,12 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
             }
         }
         for (AdviceSaveDto adviceSaveDto : deleteList) {
-            Long requestId = adviceSaveDto.getRequestId();
-            // 🔧 Bug #442: 跳过 requestId 为 null 的记录，避免删除不存在的诊疗请求
-            if (requestId == null) {
-                log.warn("BugFix#442: handService - 跳过 requestId 为 null 的删除请求");
-                continue;
-            }
-            iServiceRequestService.removeById(requestId);// 删除诊疗
+            iServiceRequestService.removeById(adviceSaveDto.getRequestId());// 删除诊疗
             iServiceRequestService.remove(
                     new LambdaQueryWrapper<ServiceRequest>().eq(ServiceRequest::getParentId,
-                            requestId));// 删除诊疗套餐对应的子项
+                            adviceSaveDto.getRequestId()));// 删除诊疗套餐对应的子项
             // 🔧 Bug Fix #219: 删除费用项
+            Long requestId = adviceSaveDto.getRequestId();
             String serviceTable = CommonConstants.TableName.WOR_SERVICE_REQUEST;
             // 直接删除费用项
             iChargeItemService.deleteByServiceTableAndId(serviceTable, requestId);
@@ -1800,9 +1783,8 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp
                 log.info("handService - 自动补全founderOrgId: founderOrgId={}", adviceSaveDto.getFounderOrgId());
             }
             
-            // 🔧 Bug Fix #238/#454: 诊疗项目执行科室非空校验（删除操作跳过校验）
-            if (adviceSaveDto.getAdviceType() != null && adviceSaveDto.getAdviceType() == 3
-                    && !DbOpType.DELETE.getCode().equals(adviceSaveDto.getDbOpType())) {
+            // 🔧 Bug Fix #238: 诊疗项目执行科室非空校验
+            if (adviceSaveDto.getAdviceType() != null && adviceSaveDto.getAdviceType() == 3) {
                 Long effectiveOrgId = adviceSaveDto.getEffectiveOrgId();
                 if (effectiveOrgId == null) {
                     throw new ServiceException("诊疗项目必须选择执行科室");

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

@@ -76,13 +76,6 @@ 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
@@ -149,6 +142,12 @@ 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, ActivityDefCategory.PROCEDURE.getCode(), applyTimeStart, applyTimeEnd,
+        RequestFormDto dto = new RequestFormDto(surgeryNo, null, 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 3 END AS advice_type,
+        (SELECT CASE WHEN T1.category_enum = 4 THEN 6 ELSE COALESCE(T1.category_enum, 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,6 +372,7 @@ 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();
@@ -466,9 +467,9 @@ function calculateTotalPrice() {
   try {
     let sum = 0;
     treatmentItems.value.forEach((item) => {
-      if (item.adviceDefinitionId && item.adviceDefinitionId !== '') {
-        const price = Number(item.retailPrice) || 0;
-        const count = Number(item.childrenRequestNum) || 0;
+      if (item.adviceDefinitionId && item.retailPrice && item.childrenRequestNum) {
+        const price = parseFloat(item.retailPrice) || 0;
+        const count = parseInt(item.childrenRequestNum) || 0;
         sum += price * count;
       }
     });
@@ -478,10 +479,7 @@ function calculateTotalPrice() {
       (item) => item.adviceDefinitionId && item.adviceDefinitionId !== ''
     );
     if (hasValidItem) {
-      // 使用 nextTick 确保总价更新后零售价才更新，避免 Vue 响应式时序问题
-      nextTick(() => {
-        form.value.retailPrice = parseFloat(totalPrice.value) || 0;
-      });
+      form.value.retailPrice = parseFloat(totalPrice.value);
     } else {
       form.value.retailPrice = undefined;
     }
@@ -567,16 +565,15 @@ function edit() {
     form.value.pricingFlag = 1;
   }
 
-  // 处理子项数据，确保包含retailPrice和name字段
+  // 处理子项数据，确保包含retailPrice字段
   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, name: '', retailPrice: 0 }];
+    treatmentItems.value = [{ adviceDefinitionId: '', childrenRequestNum: 1, retailPrice: 0 }];
   }
   form.value.permittedUnitCode = form.value.permittedUnitCode
     ? form.value.permittedUnitCode.toString()
@@ -621,7 +618,7 @@ function reset() {
     chrgitmLv: undefined, //医保等级
     pricingFlag: 1, // 划价标记，默认允许划价
   };
-  treatmentItems.value = [{ adviceDefinitionId: '', childrenRequestNum: 1, name: '', retailPrice: 0 }];
+  treatmentItems.value = [{ adviceDefinitionId: '', childrenRequestNum: 1, retailPrice: 0 }];
   totalPrice.value = '0.00';
   proxy.resetForm('diagnosisTreatmentRef');
 }
@@ -763,10 +760,7 @@ function selectRow(row, index) {
   treatmentItems.value[index].adviceDefinitionId = row.id;
   treatmentItems.value[index].retailPrice = row.retailPrice || 0;
   medicineSearchKey.value = '';
-  // 使用 nextTick 确保 DOM 更新后再计算总价
-  nextTick(() => {
-    calculateTotalPrice();
-  });
+  calculateTotalPrice();
 }
 
 // 清空诊疗子项

openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/medicineList.vue

@@ -36,7 +36,6 @@ const emit = defineEmits(['selectRow']);
 const diagnosisTreatmentList = ref([]); // 原始数据列表
 const filteredList = ref([]); // 过滤后的数据列表
 const hasLoaded = ref(false); // 标记是否已加载数据
-const isLoading = ref(false); // 标记是否正在加载
 
 // 获取诊疗项目列表
 function getList() {
@@ -54,7 +53,7 @@ function getList() {
   getDiagnosisTreatmentList({ statusEnum: 2, pageSize: 1000, pageNo: 1 })
     .then((res) => {
       diagnosisTreatmentList.value =
-        res.data?.records?.filter((item) => item.childrenJson == null || item.childrenJson === '') || [];
+        res.data?.records?.filter((item) => item.childrenJson == null) || [];
       filterList(); // 初始化过滤
       hasLoaded.value = true; // 标记为已加载
     })
@@ -63,47 +62,6 @@ 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,
@@ -128,17 +86,11 @@ watch(
   { immediate: true }
 );
 
-// 监听搜索关键词变化，有搜索词时走服务端搜索，否则走本地过滤
+// 监听搜索关键词变化，实时过滤数据
 watch(
   () => props.searchKey,
-  (newVal) => {
-    if (newVal && newVal.trim() !== '') {
-      // 有搜索关键词，走服务端搜索
-      searchList(newVal);
-    } else {
-      // 搜索词为空，使用预加载数据
-      loadPreloadedData();
-    }
+  () => {
+    filterList();
   }
 );
 

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

@@ -880,23 +880,19 @@ 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); // 过滤掉已签发、已收费或无 requestId 的项目
+  }).filter(item => item !== null); // 过滤掉已签发或已收费的项目
   
   if (deleteList.length == 0) {
     proxy.$modal.msgWarning('只能删除待签发且未收费的项目');

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

@@ -730,9 +730,7 @@ function handleCollapseChange(activeName) {
   setTimeout(() => { isAnimating.value = false; }, 300);  // 与 CSS 过渡时长一致
 
   if (activeName) {
-    // Bug #428修复: 直接从 categoryList（原始响应式数组）查找分类，
-    // 确保后续 handleCategoryExpand 对 cat.methods 的赋值能正确触发 Vue 响应式更新
-    const cat = categoryList.value.find(c => c.typeId == activeName);
+    const cat = filteredCategoryList.value.find(c => c.typeId == activeName);
     if (cat && (!cat.methods || cat.methods.length === 0)) {
       handleCategoryExpand(cat);  // 异步加载，不 await
     }
@@ -1151,8 +1149,7 @@ async function handleMethodSelect(checked, method, cat) {
     // 如果该项目不存在，创建一个并关联方法
     if (selectedItems.value.length > 0) {
       const currentCategory = selectedItems.value[0].checkType;
-      // Bug #428修复: 使用 cat.typeName 进行比较（与 newItem.checkType 保持一致）
-      const newCategory = cat.typeName || '';
+      const newCategory = cat.typeCode || '';
       if (currentCategory !== newCategory) {
         ElMessage.warning('一个检查单不能同时选择多个项目类型的检查项目');
         return;
@@ -1237,8 +1234,7 @@ async function handleItemSelect(checked, item, cat) {
 
     if (selectedItems.value.length > 0) {
       const currentCategory = selectedItems.value[0].checkType;
-      // Bug #428修复: 使用 cat.typeName 进行比较（与 effectiveCheckType 保持一致）
-      const newCategory = cat.typeName || '';
+      const newCategory = cat.typeCode || '';
       if (currentCategory !== newCategory) {
         ElMessage.warning('一个检查单不能同时选择多个项目类型的检查项目');
         item.checked = false;

openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue

@@ -3326,13 +3326,9 @@ function syncGroupFields(row) {
   }
   
   // 同步执行科室
-  // 🔧 Bug #455: 诊疗类医嘱(adviceType=3)不使用项目配置的执行科室，
-  // 避免配置ID不在机构树中导致显示原始ID，保持患者就诊科室即可
   if (row.orgId || row.positionId) {
-    if (Number(row.adviceType) != 3) {
-      // 🔧 修复：优先使用项目所属科室(orgId)，其次positionId
-      prescriptionList.value[rowIndex.value].orgId = row.orgId || row.positionId;
-    }
+    // 🔧 修复：优先使用项目所属科室(orgId)，其次positionId
+    prescriptionList.value[rowIndex.value].orgId = row.orgId || row.positionId;
   }
   
   // 同步皮试标记
@@ -3416,11 +3412,8 @@ async function setValue(row) {
     showPopover: false, // 确保查询框关闭
   };
   console.log('[BugFix] setValue - prescriptionList[rowIndex].adviceType_dictText:', prescriptionList.value[rowIndex.value].adviceType_dictText);
-  // 🔧 Bug #455: 诊疗医嘱(adviceType=3)的执行科室默认使用患者就诊科室，
-  // 不使用positionId(诊疗目录配置的执行科室)，避免配置ID不在机构树中导致显示原始ID
-  if (Number(row.adviceType) != 3) {
-    prescriptionList.value[rowIndex.value].orgId = row.positionId || props.patientInfo?.orgId;
-  }
+  // 🔧 Bug #455: 执行科室默认逻辑：使用positionId(诊疗执行科室配置) → 患者就诊科室，不再使用row.orgId(项目所属科室)
+  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,45 +72,6 @@
               <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>
@@ -191,9 +152,6 @@ 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,14 +5,16 @@
 -->
 <template>
   <div class="surgery-container">
-    <div v-loading="loading" class="transfer-wrapper" style="min-height: 300px;">
-      <el-transfer
-        v-model="transferValue"
-        :data="applicationList"
-        filter-placeholder="项目代码/名称"
-        filterable
-        :titles="['未选择', '已选择']"
-      />
+    <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>
     <div class="bloodTransfusion-form">
       <el-form :model="form" :rules="rules" ref="formRef" label-width="120px" class="demo-ruleForm">
@@ -101,8 +103,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,27 +1181,19 @@ function handleSave() {
     });
     // 此处签发处方和单行保存处方传参相同，后台已经将传参存为JSON字符串，此处直接转换为JSON即可
     loading.value = true;
-    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;
-    }
+    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',
+      };
+    });
     // 保存签发按钮
     isSaving.value = true;
     console.log('签发处方参数：', {

openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/components/prescriptionList.vue

@@ -302,29 +302,6 @@ 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) {
@@ -342,8 +319,6 @@ function handleRateChange(value, item, row) {
 defineExpose({
   handleGetPrescription,
   handleMedicineSummary,
-  selectAllRows,
-  clearSelection,
 });
 </script>
 

openhis-ui-vue3/src/views/inpatientNurse/drugDistribution/index.vue

@@ -69,11 +69,7 @@
         </div>
         <div>
           <span class="descriptions-item-label">全选：</span>
-          <el-switch
-            v-model="chooseAll"
-            :disabled="isDetails != '1'"
-            @change="handelSwicthChange"
-          />
+          <el-switch v-model="chooseAll" @change="handelSwicthChange" />
           <el-button class="ml20 mr20" type="primary" @click="handleExecute"> 汇总领药 </el-button>
         </div>
       </div>
@@ -164,31 +160,24 @@ function handleClick(tabName) {
 }
 
 function handleGetPrescription() {
-  chooseAll.value = false;
-  prescriptionRefs.value?.handleGetPrescription();
+  prescriptionRefs.value.handleGetPrescription();
 }
 
-function handelSwicthChange(value) {
-  if (!prescriptionRefs.value) {
-    chooseAll.value = false;
-    return;
-  }
-  if (value) {
-    prescriptionRefs.value.selectAllRows();
+function handelSwicthChange() {
+  if (chooseAll.value) {
+    proxy.$refs['prescriptionRefs'].selectAllRows();
   } else {
-    prescriptionRefs.value.clearSelection();
+    proxy.$refs['prescriptionRefs'].clearSelection();
   }
 }
 
 function handleRadioChange(value) {
-  chooseAll.value = false;
   if (value == '1') {
     handleGetPrescription();
   }
 }
 
 function handleTherapyChange() {
-  chooseAll.value = false;
   handleGetPrescription();
 }
 
@@ -227,4 +216,4 @@ provide('handleGetPrescription', (value) => {
 :deep(.el-tabs__header) {
   margin: 0;
 }
-</style>
+</style>

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

@@ -885,21 +885,11 @@ 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)
@@ -1128,7 +1118,7 @@ onMounted(() => {
 
 // 加载卫生机构列表
 function loadOrgList() {
-  getTenantPageSilent({ pageNo: 1, pageSize: 1000 })
+  getTenantPage({ 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

@@ -1,5 +0,0 @@
--- 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级切口';