From a8f1b1fdfa9d8364f31c96474783490d9eb59963 Mon Sep 17 00:00:00 2001
From: chenqi <chen.qi@jin-group.cn>
Date: Thu, 15 Jan 2026 15:34:34 +0800
Subject: [PATCH] =?UTF-8?q?feat(doctorstation):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=8C=BB=E5=98=B1=E7=B1=BB=E5=9E=8B=E5=AF=B9=E5=BA=94=E7=9A=84?=
 =?UTF-8?q?=E8=8D=AF=E5=93=81=E5=88=86=E7=B1=BB=E7=AD=9B=E9=80=89=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在处方列表组件中根据医嘱类型自动设置categoryCode筛选条件
- 为西药类型设置categoryCode为'2'
- 为中成药类型设置categoryCode为'1'
- 为耗材和诊疗类型清空categoryCode筛选条件
- 更新基础医嘱列表组件以接收并应用categoryCode查询参数
- 实现医嘱类型改变时的联动筛选逻辑
---
 .../doctorstation/components/adviceBaseList.vue     |  5 ++++-
 .../components/prescription/prescriptionlist.vue    | 13 +++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue b/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
index b49ce2e7..64fa3f56 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
@@ -197,7 +197,10 @@ watch(
     
     // 直接更新查询参数
     queryParams.value.searchKey = newValue.searchKey || '';
-    
+
+    // 更新categoryCode
+    queryParams.value.categoryCode = newValue.categoryCode || '';
+
     // 处理类型筛选
     if (newValue.adviceType !== undefined && newValue.adviceType !== null && newValue.adviceType !== '') {
       // 单个类型
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
index f49f247f..901738aa 100644
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -782,6 +782,19 @@
                     // 当医嘱类型改变时，清空当前选择的项目名称，因为不同类型项目的数据结构可能不兼容
                     prescriptionList[scope.$index].adviceName = undefined;
                     adviceQueryParams.adviceType = value;
+
+                    // 根据选择的类型设置categoryCode，用于药品分类筛选
+                    if (value == 1) { // 西药
+                      adviceQueryParams.categoryCode = '2';
+                    } else if (value == 2) { // 中成药
+                      adviceQueryParams.categoryCode = '1';
+                    } else if (value == 3) { // 耗材
+                      adviceQueryParams.categoryCode = ''; // 耗材不需要categoryCode筛选
+                    } else if (value == 4) { // 诊疗
+                      adviceQueryParams.categoryCode = ''; // 诊疗不需要categoryCode筛选
+                    } else {
+                      adviceQueryParams.categoryCode = ''; // 全部类型
+                    }
                   }
                 "
                 @clear="