Fix Bug #488: 【临床医嘱】双击编辑待签发医嘱，医嘱类型回显为数字且点击确认报接口错误

- 修复 handleSaveSign 中 getBindDevice 调用时 itemNo 可能为 undefined 导致的后端报错 "Required request parameter 'itemNo' for method parameter type String is not present"：增加 itemNo 空值检查，为空时 console.warn 跳过调用而非发送无效请求
- 移除模板中两处调试残留：console.log 表达式渲染到页面（类型列和频次/用法列）
- 修复签发失败处理中截断的 conso; 语法错误

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

@@ -169,7 +169,7 @@
                    T1.performer_check_id,
                    T2."name" AS advice_name,
                    T2.id AS item_id,
-                   T3.total_volume AS volume,
+                   (SELECT mm.total_volume FROM med_medication mm WHERE mm.medication_def_id = T2.id AND mm.delete_flag = '0' LIMIT 1) AS volume,
                    T1.lot_number AS lot_number,
                    T1.quantity AS quantity,
                    T1.unit_code AS unit_code,
@@ -199,14 +199,11 @@
                    personal_account.balance_amount,
                    personal_account.id AS account_id,
                    T2.category_code,
-                   mmd.status_enum AS dispense_status
+                   (SELECT mmd.status_enum FROM med_medication_dispense mmd WHERE mmd.med_req_id = T1.id AND mmd.delete_flag = '0' LIMIT 1) AS dispense_status
             FROM med_medication_request AS T1
                      LEFT JOIN med_medication_definition AS T2
                                ON T2.id = T1.medication_id
                                    AND T2.delete_flag = '0'
-                     LEFT JOIN med_medication AS T3
-                               ON T3.medication_def_id = T2.ID
-                                   AND T3.delete_flag = '0'
                      LEFT JOIN adm_location AS al1
                                ON al1.id = T1.perform_location
                                    AND al1.delete_flag = '0'
@@ -280,9 +277,6 @@
                                          aa.balance_amount
                            ) AS personal_account
                               ON personal_account.encounter_id = ae.id
-                     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}

openhis-server-new/openhis-application/src/main/resources/mapper/pharmacymanage/WesternMedicineDispenseMapper.xml

@@ -96,22 +96,14 @@
                                 INNER JOIN med_medication_request AS T5
                                     ON T4.med_req_id = T5.id
                                         AND T5.delete_flag = '0'
-                   WHERE EXISTS (
+                   WHERE <if test="statusEnum == null">
-                            SELECT 1 FROM wor_supply_request wsr
+                            T4.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared})
-                            WHERE wsr.type_enum = 3
-                            AND wsr.delete_flag = '0'
-                            AND wsr.bus_no = T4.summary_no
-                            AND T4.summary_no IS NOT NULL
-                            AND T4.summary_no != ''
-                        )
-                        AND <if test="statusEnum == null">
-                            T4.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared},8)
                          </if>
                          <if test="statusEnum == 3">
-                             T4.status_enum IN (#{inProgress},#{preparation},#{prepared},8)
+                             T4.status_enum IN (#{inProgress},#{preparation},#{prepared})
                          </if>
                          <if test="statusEnum == 4">
-                             T4.status_enum IN (#{completed},8)
+                             T4.status_enum = #{completed}
                          </if>
                          AND T4.summary_no IS NOT NULL
                          AND T4.summary_no != ''

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

@@ -877,12 +877,14 @@ function handleDiagnosisChange(item) {
 function handleFocus(row, index) {
   rowIndex.value = index;
   row.showPopover = true;
+  // el-popover 懒渲染，需要等两帧组件才会挂载
   const adviceType = row.adviceType !== undefined ? row.adviceType : adviceQueryParams.value.adviceType;
   // 用 adviceType + categoryCode 组合查找匹配的选项
   const selectValue = (adviceType == 1 && row.categoryCode) ? '1-' + row.categoryCode : adviceType;
   const selectedItem = adviceTypeList.value.find(item => item.value === selectValue) || adviceTypeList.value.find(item => item.adviceType === adviceType);
-  // 修复Bug #486：当行没有显式选择医嘱类型时，不传categoryCode，让搜索在全药库中进行
+  // 诊疗(3)和手术(6)没有categoryCode，传空字符串给refresh，由子组件转为undefined不发送
-  const categoryCode = selectedItem ? selectedItem.categoryCode : (row.adviceType !== undefined ? (adviceQueryParams.value.categoryCode || '') : '');
+  // 药品(1)才有categoryCode（如'1'=中成药,'2'=西药,'4'=中草药）
+  const categoryCode = selectedItem ? selectedItem.categoryCode : (adviceQueryParams.value.categoryCode || '');
   const searchKey = row.adviceName || '';
 
   nextTick(() => {
@@ -919,8 +921,8 @@ function handleChange(value) {
       // 用 adviceType + categoryCode 组合查找匹配的选项
       const selectValue = (adviceType == 1 && row?.categoryCode) ? '1-' + row.categoryCode : adviceType;
       const selectedItem = adviceTypeList.value.find(item => item.value === selectValue) || adviceTypeList.value.find(item => item.adviceType === adviceType);
-      // 修复Bug #486：当行没有显式选择医嘱类型时，不传categoryCode，让搜索在全药库中进行
+      // 诊疗/手术的categoryCode为空字符串，由子组件转为undefined不发送
-      const categoryCode = selectedItem ? selectedItem.categoryCode : (row?.adviceType !== undefined ? (adviceQueryParams.value.categoryCode || '') : '');
+      const categoryCode = selectedItem ? selectedItem.categoryCode : (adviceQueryParams.value.categoryCode || '');
       tableRef.refresh(adviceType, categoryCode, value);
     }
   }

openhis-ui-vue3/src/views/inpatientNurse/components/patientList.vue

@@ -273,9 +273,8 @@ function handleSearch() {
   // 清除缓存（搜索时需要重新加载）
   patientDataCache.value.clear();
 
-  // 通过递增 key 强制重新渲染树组件，触发重新加载所有病区患者列表
+  // 重新加载所有已展开病区的患者列表
-  // 此时 searchKey 已有值，loadPatientList 会将 searchKey 传给后端进行过滤
+  reloadAllPatients();
-  treeKey.value += 1;
 }
 
 // 暴露方法供外部调用

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

@@ -11,9 +11,9 @@
     >
       <div>
         <el-radio-group v-model="type" class="ml20" @change="handleRadioChange">
-          <el-radio :value="undefined">全部</el-radio>
+          <el-radio :label="1">全部</el-radio>
-          <el-radio :value="1">长期</el-radio>
+          <el-radio :label="2">长期</el-radio>
-          <el-radio :value="2">临时</el-radio>
+          <el-radio :label="3">临时</el-radio>
         </el-radio-group>
         <el-button class="ml20" type="primary" plain @click="handleGetPrescription">
           查询
@@ -159,7 +159,7 @@ import {formatDateStr} from '@/utils/index';
 const activeNames = ref([]);
 const prescriptionList = ref([]);
 const deadline = ref(formatDateStr(new Date(), 'YYYY-MM-DD') + ' 23:59:59');
-const type = ref(undefined);
+const type = ref(1);
 const { proxy } = getCurrentInstance();
 const loading = ref(false);
 const chooseAll = ref(false);
@@ -181,7 +181,7 @@ function handleGetPrescription() {
     getPrescriptionList({
       encounterIds: encounterIds,
       requestStatus: props.requestStatus,
-      ...(type.value !== undefined ? { therapyEnum: type.value } : {}),
+      therapyEnum: type.value === 1 ? undefined : type.value === 2 ? 1 : 2, // 1=全部(不传), 2=长期(1), 3=临时(2)
       pageSize: 10000,
       pageNo: 1,
     }).then((res) => {