From afa904bd833bb7a374f6ab8ebbda35eccaf3f11d Mon Sep 17 00:00:00 2001
From: wzk <2438381872@qq.com>
Date: Tue, 18 Nov 2025 10:09:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E5=98=B1=E7=B1=BB=E5=88=AB=E8=80=97?=
 =?UTF-8?q?=E6=9D=90=E9=A1=B9=E7=9B=AE=E4=BB=8E=E8=80=97=E6=9D=90=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E8=8E=B7=E5=8F=96=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/adviceBaseList.vue             | 155 +++++++++++++-----
 .../src/views/doctorstation/components/api.js |  11 ++
 2 files changed, 125 insertions(+), 41 deletions(-)

diff --git a/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue b/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
index 3e7e2d46..284c4525 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
@@ -61,7 +61,7 @@
 
 <script setup>
 import { nextTick } from 'vue';
-import { getAdviceBaseInfo } from './api';
+import { getAdviceBaseInfo, getDeviceList } from './api';
 import { throttle } from 'lodash-es';
 
 const props = defineProps({
@@ -136,49 +136,122 @@ function getList() {
   
   console.log('发送API请求:', queryParams.value);
   
-  getAdviceBaseInfo(queryParams.value).then((res) => {
-    if (res.data.records && res.data.records.length > 0) {
-      let filteredRecords = res.data.records.filter((item) => {
-        // 后端已经根据adviceTypes参数进行了筛选，这里只需要进行前端补充筛选
+  // 判断是否是耗材类型（adviceType = 2 表示耗材）
+  const isConsumables = queryParams.value.adviceTypes === '2' || queryParams.value.adviceTypes === 2;
+  
+  if (isConsumables) {
+    // 调用耗材目录接口
+    const deviceQueryParams = {
+      pageNo: queryParams.value.pageNum || 1,
+      pageSize: queryParams.value.pageSize || 100,
+      searchKey: queryParams.value.searchKey || '',
+      statusEnum: 2, // 只查询启用状态的耗材
+    };
+    
+    console.log('调用耗材目录接口:', deviceQueryParams);
+    
+    getDeviceList(deviceQueryParams).then((res) => {
+      if (res.data && res.data.records && res.data.records.length > 0) {
+        // 将耗材目录数据转换为医嘱基础信息格式
+        const convertedRecords = res.data.records.map((item) => {
+          return {
+            adviceName: item.name || item.busNo, // 器材名称
+            adviceType: 2, // 耗材类型（后端接口中耗材的adviceType是2，但前端显示为4）
+            unitCode: item.unitCode || '', // 包装单位
+            unitCode_dictText: item.unitCode_dictText || '',
+            minUnitCode: item.minUnitCode || item.unitCode || '',
+            minUnitCode_dictText: item.minUnitCode_dictText || item.unitCode_dictText || '',
+            volume: item.size || item.totalVolume || '', // 规格
+            partPercent: item.partPercent || 1, // 拆零比
+            priceList: item.price ? [{ price: item.price }] : (item.retailPrice ? [{ price: item.retailPrice }] : []),
+            inventoryList: [], // 耗材可能没有库存列表，需要根据实际情况处理
+            adviceDefinitionId: item.id,
+            chargeItemDefinitionId: item.id,
+            positionId: item.locationId,
+            positionName: item.locationId_dictText || '',
+            // 其他可能需要的字段
+            dose: 0,
+            doseUnitCode: item.minUnitCode || item.unitCode || '',
+            doseUnitCode_dictText: item.minUnitCode_dictText || item.unitCode_dictText || '',
+            injectFlag: 0,
+            injectFlag_enumText: '否',
+            skinTestFlag: 0,
+            skinTestFlag_enumText: '否',
+            categoryCode: item.categoryCode || '',
+            // 耗材特有字段
+            deviceId: item.id, // 耗材ID
+            deviceName: item.name, // 耗材名称
+            // 保留原始数据以便后续使用
+            ...item,
+          };
+        });
         
-        // 过滤库存（药品和耗材需要检查库存，诊疗不需要检查库存）
-        if (item.adviceType == 1 || item.adviceType == 2) {
-          if (handleQuantity(item) == 0) {
-            return false;
+        adviceBaseList.value = convertedRecords;
+        total.value = res.data.total || convertedRecords.length;
+        
+        console.log('耗材目录数据转换后:', adviceBaseList.value.length, '条');
+        
+        nextTick(() => {
+          currentIndex.value = 0;
+          if (adviceBaseList.value.length > 0) {
+            adviceBaseRef.value.setCurrentRow(adviceBaseList.value[0]);
           }
-        }
-        
-        // 如果设置了categoryCode筛选条件，进行筛选（用于区分西药和中成药）
-        // categoryCode = '1' 表示中成药，categoryCode = '2' 表示西药
-        // 注意：只有药品类型(adviceType=1)才需要根据categoryCode筛选
-        if (queryParams.value.categoryCode && item.adviceType == 1) {
-          // 只筛选药品类型
-          if (item.categoryCode != queryParams.value.categoryCode) {
-            return false;
-          }
-        }
-        
-        return true;
-      });
-      
-      adviceBaseList.value = filteredRecords;
-      
-      console.log('过滤后数据显示:', adviceBaseList.value.length, '条');
-      
-      total.value = res.data.total;
-      nextTick(() => {
-        currentIndex.value = 0;
-        if (adviceBaseList.value.length > 0) {
-          adviceBaseRef.value.setCurrentRow(adviceBaseList.value[0]);
-        }
-      });
-    } else {
+        });
+      } else {
+        adviceBaseList.value = [];
+        total.value = 0;
+      }
+    }).catch(error => {
+      console.error('获取耗材目录数据失败:', error);
       adviceBaseList.value = [];
-    }
-  }).catch(error => {
-    console.error('获取数据失败:', error);
-    adviceBaseList.value = [];
-  });
+      total.value = 0;
+    });
+  } else {
+    // 调用医嘱基础信息接口（药品、诊疗等）
+    getAdviceBaseInfo(queryParams.value).then((res) => {
+      if (res.data.records && res.data.records.length > 0) {
+        let filteredRecords = res.data.records.filter((item) => {
+          // 后端已经根据adviceTypes参数进行了筛选，这里只需要进行前端补充筛选
+          
+          // 过滤库存（药品和耗材需要检查库存，诊疗不需要检查库存）
+          if (item.adviceType == 1 || item.adviceType == 2) {
+            if (handleQuantity(item) == 0) {
+              return false;
+            }
+          }
+          
+          // 如果设置了categoryCode筛选条件，进行筛选（用于区分西药和中成药）
+          // categoryCode = '1' 表示中成药，categoryCode = '2' 表示西药
+          // 注意：只有药品类型(adviceType=1)才需要根据categoryCode筛选
+          if (queryParams.value.categoryCode && item.adviceType == 1) {
+            // 只筛选药品类型
+            if (item.categoryCode != queryParams.value.categoryCode) {
+              return false;
+            }
+          }
+          
+          return true;
+        });
+        
+        adviceBaseList.value = filteredRecords;
+        
+        console.log('过滤后数据显示:', adviceBaseList.value.length, '条');
+        
+        total.value = res.data.total;
+        nextTick(() => {
+          currentIndex.value = 0;
+          if (adviceBaseList.value.length > 0) {
+            adviceBaseRef.value.setCurrentRow(adviceBaseList.value[0]);
+          }
+        });
+      } else {
+        adviceBaseList.value = [];
+      }
+    }).catch(error => {
+      console.error('获取数据失败:', error);
+      adviceBaseList.value = [];
+    });
+  }
 }
 // 处理键盘事件
 const handleKeyDown = (event) => {
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/api.js b/openhis-ui-vue3/src/views/doctorstation/components/api.js
index 476cd2f4..6d7ccb8a 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/api.js
+++ b/openhis-ui-vue3/src/views/doctorstation/components/api.js
@@ -223,6 +223,17 @@ export function getAdviceBaseInfo(queryParams) {
     params: queryParams
   })
 }
+
+/**
+ * 获取耗材目录列表
+ */
+export function getDeviceList(queryParams) {
+  return request({
+    url: '/data-dictionary/device/information-page',
+    method: 'get',
+    params: queryParams
+  })
+}
 /**
  * 保存处方(单条)
  */