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

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

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java

@@ -178,7 +178,7 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
         inpatientAdviceParam.setEncounterIds(null);
         Integer exeStatus = inpatientAdviceParam.getExeStatus();
         inpatientAdviceParam.setExeStatus(null);
-        Integer requestStatus = inpatientAdviceParam.getRequestStatus();
+        // requestStatus由前端tab控制，后端SQL已通过CASE条件处理校对状态过滤，无需再作为SQL条件
         inpatientAdviceParam.setRequestStatus(null);
         // 构建查询条件
         QueryWrapper<InpatientAdviceParam> queryWrapper
@@ -198,7 +198,7 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
                         ParticipantType.ADMITTING_DOCTOR.getCode(), AccountType.PERSONAL_CASH_ACCOUNT.getCode(),
                         ChargeItemStatus.BILLABLE.getValue(), ChargeItemStatus.BILLED.getValue(),
                         ChargeItemStatus.REFUNDED.getValue(), EncounterClass.IMP.getValue(),
-                        GenerateSource.DOCTOR_PRESCRIPTION.getValue(), requestStatus);
+                        GenerateSource.DOCTOR_PRESCRIPTION.getValue());
         inpatientAdvicePage.getRecords().forEach(e -> {
             // 是否皮试
             e.setSkinTestFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getSkinTestFlag()));

openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/mapper/AdviceProcessAppMapper.java

@@ -69,6 +69,5 @@ public interface AdviceProcessAppMapper {
         @Param("active") Integer active, @Param("bed") Integer bed, @Param("admittingDoctor") String admittingDoctor,
         @Param("personalCashAccount") String personalCashAccount, @Param("billable") Integer billable,
         @Param("billed") Integer billed, @Param("refunded") Integer refunded, @Param("imp") Integer imp,
-        @Param("doctorPrescription") Integer doctorPrescription,
-        @Param("requestStatus") Integer requestStatus);
+        @Param("doctorPrescription") Integer doctorPrescription);
 }

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

@@ -290,7 +290,6 @@
                 WHERE T1.delete_flag = '0'
                 AND T1.refund_medicine_id IS NULL
                 AND T1.generate_source_enum = #{doctorPrescription}
-                AND T1.status_enum = #{requestStatus}
                 AND CASE WHEN T1.status_enum = #{draft}
                     THEN T1.performer_check_id IS NOT NULL
                     ELSE 1=1 END
@@ -423,7 +422,6 @@
                                    AND af.delete_flag = '0'
             WHERE T1.delete_flag = '0'
                 AND T1.generate_source_enum = #{doctorPrescription}
-                AND T1.status_enum = #{requestStatus}
                 AND CASE WHEN T1.status_enum = #{draft}
                     THEN T1.performer_check_id IS NOT NULL
                     ELSE 1=1 END

openhis-server-new/openhis-application/src/main/resources/mapper/regdoctorstation/RequestFormManageAppMapper.xml

@@ -61,14 +61,15 @@
         GROUP BY drf.id, drf.encounter_id, drf.prescription_no, drf.name, drf.desc_json,
                  drf.requester_id, drf.create_time, ap.name
         <if test="status != null and status != ''">
-            HAVING CASE
-                       WHEN MIN(wsr.status_enum) = 1 THEN 0
-                       WHEN MIN(wsr.status_enum) = 2 THEN 1
-                       WHEN MIN(wsr.status_enum) = 3 AND MAX(CASE WHEN wsr.performer_check_id IS NOT NULL THEN 1 ELSE 0 END) = 1 THEN 2
-                       WHEN MIN(wsr.status_enum) = 3 THEN 4
-                       WHEN MIN(wsr.status_enum) = 4 THEN 3
-                       WHEN MIN(wsr.status_enum) = 5 OR MIN(wsr.status_enum) = 6 OR MIN(wsr.status_enum) = 7 THEN 7
-                       WHEN MIN(wsr.status_enum) = 8 THEN 6
+            HAVING CASE MIN(wsr.status_enum)
+                       WHEN 1 THEN 0
+                       WHEN 2 THEN 1
+                       WHEN 3 THEN 4
+                       WHEN 4 THEN 4
+                       WHEN 5 THEN 5
+                       WHEN 6 THEN 5
+                       WHEN 7 THEN 5
+                       WHEN 8 THEN 6
                        ELSE NULL
                    END = #{status}::integer
         </if>

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

@@ -389,8 +389,7 @@
                     </el-checkbox>
                     <span class="item-price">¥{{ item.price }}/{{ item.unit || "次" }}</span>
                   </div>
-                  <!-- Bug #500修复: 使用 v-show + 占位符，避免加载提示出现/消失时高度跳变 -->
-                  <div v-show="categoryLoadingSet.has(cat.typeId)" class="category-loading-hint">
+                  <div v-if="categoryLoadingSet.has(cat.typeId)" class="category-loading-hint">
                     加载中...
                   </div>
                   <!-- Bug #428修复: 渲染分类联动加载的检查方法列表 -->
@@ -1805,8 +1804,8 @@ defineExpose({ getList });
 .collapse-scroll {
   flex: 1;
   overflow-y: auto;
-  overflow-x: hidden;
-  min-height: 350px;   /* Bug #500: 增大最小高度，确保切换分类时容器高度不会收缩导致抖动 */
+  overflow-x: hidden;  /* Bug #500: 防止切换时水平方向溢出导致抖动 */
+  min-height: 120px;   /* Bug #500: 固定最小高度，避免分类切换时 flex 容器高度突变 */
 }
 .empty-hint {
   color: #909399;
@@ -2120,18 +2119,18 @@ defineExpose({ getList });
   height: auto;
   line-height: 1.5;
 }
-/* Bug #500修复: 折叠内容不添加额外过渡动画，避免与 el-collapse 内部动画冲突导致双重动画/闪烁 */
+/* Bug #500修复: 折叠内容使用明确属性过渡，避免 transition: all 导致子元素意外动画 */
 :deep(.el-collapse-item__content) {
   padding-bottom: 4px;
+  transition: height 0.3s ease, max-height 0.3s ease;
 }
-/* Bug #500: 折叠面板容器不加 border，保持简洁 */
+/* Bug #500: 折叠面板动画容器，添加 overflow:hidden 防止展开时内容溢出导致闪烁 */
 :deep(.el-collapse-item__wrap) {
   border: none;
   overflow: hidden;
 }
-/* Bug #500: 分类项不加 margin 过渡，避免展开/收起时意外位移 */
 :deep(.el-collapse-item) {
-  /* 不使用 transition，依赖 el-collapse 原生动画 */
+  transition: margin 0.2s ease;
 }
 /* Bug #500: 分类加载中提示样式 */
 .category-loading-hint {

openhis-ui-vue3/src/views/doctorstation/components/surgery/surgeryApplication.vue

@@ -1141,9 +1141,7 @@ function submitForm() {
             // 保存麻醉方式
             sessionStorage.setItem('anesthesiaType', form.value.anesthesiaTypeEnum)
             open.value = false
-            // 子组件自身主动刷新列表（立即），确保数据展示不依赖父组件事件
-            getList()
-            // 通知父组件刷新医嘱列表（父组件也会带延迟再次刷新手术列表作为兜底）
+            // 由父组件 @saved 事件负责刷新列表（带延迟确保后端事务已提交）
             emit('saved')
           } else {
             proxy.$modal.msgError(res.msg || '新增手术失败，请检查表单信息')
@@ -1160,8 +1158,6 @@ function submitForm() {
             // 保存麻醉方式
             sessionStorage.setItem('anesthesiaType', form.value.anesthesiaTypeEnum)
             open.value = false
-            // 子组件自身主动刷新列表（立即）
-            getList()
             // 由父组件 @saved 事件负责刷新列表
             emit('saved')
           } else {

openhis-ui-vue3/src/views/inpatientDoctor/home/components/applicationShow/examineApplication.vue

@@ -93,6 +93,7 @@
           </el-table-column>
           <el-table-column prop="createTime" label="创建时间" width="160" />
           <el-table-column prop="prescriptionNo" label="申请单号" width="140" />
+          <el-table-column prop="requesterId_dictText" label="申请者" width="120" />
           <el-table-column label="申请单状态" width="120" align="center">
             <template #default="scope">
               <el-tag :type="getStatusTagType(scope.row.status)" effect="plain" round>
@@ -100,7 +101,6 @@
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column prop="requesterId_dictText" label="申请者" width="120" />
           <el-table-column label="操作" width="280" align="center" fixed="right">
             <template #default="scope">
               <!-- 详情 - 所有状态都显示 -->

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

@@ -142,11 +142,6 @@
         <el-table-column label="医嘱" align="center" prop="productName" width="300">
           <template #default="scope">
             <template v-if="getRowDisabled(scope.row)">
-              <!-- 当行的 adviceType 不在当前选项列表中时，显示标签而非下拉框 -->
-              <template v-if="!hasAdviceTypeOption(scope.row)">
-                <el-tag size="small" type="primary">{{ getAdviceTypeLabel(scope.row.adviceType) }}</el-tag>
-              </template>
-              <template v-else>
               <el-select
                 style="width: 35%; margin-right: 8px"
                 :model-value="getRowSelectValue(scope.row)"
@@ -221,7 +216,6 @@
                   />
                 </template>
               </el-popover>
-              </template>
             </template>
             <span v-else>{{ scope.row.adviceName }}</span>
           </template>
@@ -756,31 +750,6 @@ function getRowDisabled(row) {
   return row.isEdit;
 }
 
-/**
- * 判断行的 adviceType 是否在当前 adviceTypeList 选项中有匹配项
- * 修复 Bug #488：避免 el-select 因无匹配选项而回显为纯数字
- */
-function hasAdviceTypeOption(row) {
-  if (!row.adviceType && row.adviceType !== 0) return false;
-  if (row.adviceType == 1 && row.categoryCode) {
-    const compositeValue = '1-' + row.categoryCode;
-    return adviceTypeList.value.some(item => item.value === compositeValue);
-  }
-  return adviceTypeList.value.some(item => item.value === row.adviceType);
-}
-
-/**
- * 将原始 adviceType 数字映射为人类可读标签
- * 修复 Bug #488：当 adviceType 不在选项列表中时，显示标签而非数字
- */
-function getAdviceTypeLabel(type) {
-  if (!type && type !== 0) return '';
-  // 优先使用字典文本（如果后端返回了 adviceType_dictText）
-  // 但由于当前行数据可能没有 dictText，提供兜底映射
-  const fallbackMap = { 1: '西药', 2: '中成药', 3: '诊疗', 4: '耗材', 5: '会诊', 6: '手术', 23: '检查' };
-  return fallbackMap[type] || String(type);
-}
-
 /**
  * 将行的 adviceType + categoryCode 映射为 el-select 的选中值
  * 药品子分类使用复合值如 '1-2'（adviceType-categoryCode），诊疗/手术/全部使用原始值
@@ -863,22 +832,13 @@ function clickRowDb(row, column, event) {
   }
   row.showPopover = false;
   // 仅”待签发(statusEnum==1)”允许编辑；”已签发(statusEnum==2)”及之后状态不允许编辑
-  // 使用 Number() 做类型转换，确保后端返回的数值能正确比较
-  if (Number(row.statusEnum) === 1) {
+  if (row.statusEnum == 1) {
     // 确保治疗类型为字符串，方便与单选框 label 对齐，默认为长期医嘱('1')
     row.therapyEnum = String(row.therapyEnum ?? '1');
     row.isEdit = true;
     const index = prescriptionList.value.findIndex((item) => item.uniqueKey === row.uniqueKey);
-    if (index !== -1) {
-      prescriptionList.value.splice(index, 1, row);
-      // 使用 nextTick 确保数据更新后再设置展开状态，保证 el-table 能正确识别 row-key
-      nextTick(() => {
-        expandOrder.value = [row.uniqueKey];
-      });
-    } else {
-      console.warn('⚠️ clickRowDb 未找到匹配行: uniqueKey=', row.uniqueKey, ', row=', row);
-      proxy.$modal.msgWarning('无法进入编辑模式，请刷新列表后重试');
-    }
+    prescriptionList.value[index] = row;
+    expandOrder.value = [row.uniqueKey];
   }
 }
 
@@ -1416,9 +1376,6 @@ function handleSaveSign(row, index) {
             bindMethod.value[itemNo] = true;
           }
         }
-      }).catch(() => {
-        // 绑定设备接口失败不影响主流程保存，静默降级
-        console.warn('绑定设备检查接口调用失败（adviceType=' + row.adviceType + ', itemNo=' + itemNo + '）');
       });
     }
   }

openhis-ui-vue3/src/views/inpatientNurse/InpatientBilling/components/FeeDialog.vue

@@ -1,6 +1,5 @@
 <template>
-  <div class="fee-dialog-wrapper">
-    <el-dialog v-model="dialogVisible" title="补费" width="80%" :close-on-click-modal="false">
+  <el-dialog v-model="dialogVisible" title="补费" width="80%" :close-on-click-modal="false">
     <div style="font-size: 16px; font-weight: bold; margin-bottom: 10px">
       患者信息：{{
         props.patientInfo.patientName +
@@ -252,7 +251,7 @@
     </div>
   </el-dialog>
   <!-- 划价组套选择对话框 -->
-  <el-dialog v-model="groupSetDialogVisible" title="划价组套选择" width="600px" :close-on-click-modal="false" append-to-body :z-index="3000" destroy-on-close>
+  <el-dialog v-model="groupSetDialogVisible" title="划价组套选择" width="600px" :close-on-click-modal="false" append-to-body :z-index="3000">
     <div style="margin-bottom: 15px; display: flex; align-items: center; gap: 10px">
       <el-input
         v-model="groupSetSearchText"
@@ -303,7 +302,6 @@
       <el-button type="primary" @click="applyGroupSet" :disabled="!selectedGroupSet">应用</el-button>
     </div>
   </el-dialog>
-  </div>
 </template>
 
 <script setup>
@@ -521,28 +519,31 @@ watch(
   }
 );
 
-// 加载科室选项（递归扁平化树形结构）
+// 加载科室选项（支持树形/扁平两种数据结构）
 function loadDepartmentOptions() {
   getOrgList()
     .then((res) => {
-      if (!res?.data?.records?.length) {
-        departmentOptions.value = [];
-        return;
-      }
-      // 递归扁平化树形结构，提取所有科室节点
-      const flattenTree = (nodes) => {
-        const result = [];
-        for (const node of nodes) {
-          if (node?.id && node?.name) {
-            result.push(node);
+      if (res.data) {
+        // 尝试从树形结构中取：records[0].children
+        if (res.data.records && res.data.records.length > 0) {
+          if (res.data.records[0].children && res.data.records[0].children.length > 0) {
+            departmentOptions.value = res.data.records[0].children;
+            return;
           }
-          if (node?.children?.length) {
-            result.push(...flattenTree(node.children));
+          // 如果 records[0] 有 id 和 name（非树根节点），直接用所有 records
+          if (res.data.records[0].id) {
+            departmentOptions.value = res.data.records;
+            return;
           }
         }
-        return result;
-      };
-      departmentOptions.value = flattenTree(res.data.records);
+        // 兜底：如果 records 不存在或为空，尝试直接使用 data 本身
+        if (Array.isArray(res.data)) {
+          departmentOptions.value = res.data;
+          return;
+        }
+      }
+      // 所有方式都失败，置空
+      departmentOptions.value = [];
     })
     .catch(() => {
       console.warn('科室列表加载失败（可能无权限）');
@@ -608,13 +609,13 @@ function getUnitCodeOptions(row) {
   const unitCodes = [];
   // 大单位：优先用 code，code 缺失时用字典文本兜底
   if (row.unitCode != null && String(row.unitCode) !== '') {
-    unitCodes.push({ code: String(row.unitCode), codeText: row.unitCode_dictText || String(row.unitCode) });
+    unitCodes.push({ code: String(row.unitCode), codeText: row.unitCode_dictText });
   } else if (row.unitCode_dictText) {
     unitCodes.push({ code: row.unitCode_dictText, codeText: row.unitCode_dictText });
   }
   // 小单位：同上
   if (row.minUnitCode != null && String(row.minUnitCode) !== '') {
-    unitCodes.push({ code: String(row.minUnitCode), codeText: row.minUnitCode_dictText || String(row.minUnitCode) });
+    unitCodes.push({ code: String(row.minUnitCode), codeText: row.minUnitCode_dictText });
   } else if (row.minUnitCode_dictText) {
     unitCodes.push({ code: row.minUnitCode_dictText, codeText: row.minUnitCode_dictText });
   }