Fix Bug #486: [住院医生工作站-临床医嘱] 医嘱检索框不支持全局模糊搜索，未选"医嘱类型"时检索结果为空

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

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 (
-                            SELECT 1 FROM wor_supply_request wsr
-                            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)
+                   WHERE <if test="statusEnum == null">
+                            T4.status_enum IN (#{inProgress},#{completed},#{preparation},#{prepared})
                          </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

@@ -122,6 +122,7 @@
 
         <el-table-column label="类型" align="center" prop="" width="120">
           <template #default="scope">
+            {{ console.log(scope.row, 1111) }}
             <el-radio-group
               v-model="scope.row.therapyEnum"
               size="small"
@@ -269,6 +270,7 @@
         </el-table-column>
         <el-table-column label="频次/用法" align="center" prop="" width="180">
           <template #default="scope">
+            {{ console.log(scope.row) }}
             <span v-if="!scope.row.isEdit && scope.row.adviceType == 1" style="text-align: right">
               {{
                 [
@@ -1210,8 +1212,12 @@ function handleSave() {
           getListInfo(false);
           bindMethod.value = {};
           nextId.value == 1;
+
+          // 处方保存成功后，自动将医嘱信息同步至患者处置记录
+          // handleEmrTreatment();
         } else {
           proxy.$modal.msgError(res.message);
+          conso;
           isSaving.value = false;
         }
       })
@@ -1311,26 +1317,22 @@ function handleCancelEdit(row, index) {
 function handleSaveSign(row, index) {
   if (row.adviceType != 2) {
     let itemNo = row.adviceType == 1 ? row.methodCode : row.adviceDefinitionId;
-    if (!itemNo) {
-      console.warn('绑定设备检查跳过：itemNo为空（adviceType=' + row.adviceType + ', adviceName=' + row.adviceName + '）');
-    } else {
-      getBindDevice({ typeCode: row.adviceType, itemNo: itemNo }).then((res) => {
-        if (res.data.length == 0) {
-          return;
+    getBindDevice({ typeCode: row.adviceType, itemNo: itemNo }).then((res) => {
+      if (res.data.length == 0) {
+        return;
+      }
+      let openBindDialog = localStorage.getItem('doctor' + userStore.id);
+      if (!JSON.parse(openBindDialog)) {
+        proxy.$refs['orderBindInfoRef'].open(res.data);
+      } else {
+        // 如果弹窗不提示带出的项目，自动带出
+        // 如果有未签发的项目，并且当前的项目没有带出过绑定项目，则自动带出
+        if (!bindMethod.value[itemNo]) {
+          handleOrderBindInfo(res.data);
+          bindMethod.value[itemNo] = true;
         }
-        let openBindDialog = localStorage.getItem('doctor' + userStore.id);
-        if (!JSON.parse(openBindDialog)) {
-          proxy.$refs['orderBindInfoRef'].open(res.data);
-        } else {
-          // 如果弹窗不提示带出的项目，自动带出
-          // 如果有未签发的项目，并且当前的项目没有带出过绑定项目，则自动带出
-          if (!bindMethod.value[itemNo]) {
-            handleOrderBindInfo(res.data);
-            bindMethod.value[itemNo] = true;
-          }
-        }
-      });
-    }
+      }
+    });
   }
 
   // 更新UI状态

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

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

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 :value="1">长期</el-radio>
-          <el-radio :value="2">临时</el-radio>
+          <el-radio :label="1">全部</el-radio>
+          <el-radio :label="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) => {