测试合并v3

测试合并v2
测试合并v1
2026-01-15 15:43:38 +08:00 · 2026-01-15 15:41:50 +08:00 · 2026-01-15 15:39:42 +08:00 · 2026-01-15 07:25:25 +00:00 · 2026-01-15 15:24:11 +08:00 · 2026-01-15 14:04:33 +08:00
3 changed files with 2 additions and 18 deletions
--- a/md/test.html
+++ b/md/test.html
@@ -2,7 +2,7 @@
 <html lang="en">
 <head>
    <meta charset="UTF-8">
-    <title>测试合并11112</title>
+    <title>测试合并1，GO GO GO </title>
 </head>
 <body>

--- a/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
@@ -198,9 +198,6 @@ watch(
    // 直接更新查询参数
    queryParams.value.searchKey = newValue.searchKey || '';
    
-    // 更新categoryCode
-    queryParams.value.categoryCode = newValue.categoryCode || '';
-
    // 处理类型筛选
    if (newValue.adviceType !== undefined && newValue.adviceType !== null && newValue.adviceType !== '') {
      // 单个类型
--- a/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
@@ -782,19 +782,6 @@
                    // 当医嘱类型改变时，清空当前选择的项目名称，因为不同类型项目的数据结构可能不兼容
                    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="
Author	SHA1	Message	Date
玉狻猊	da0226af28	测试合并v3	2026-01-15 15:43:38 +08:00
玉狻猊	2bc40c8060	测试合并v2	2026-01-15 15:41:50 +08:00
玉狻猊	66a61b6d8e	测试合并v1	2026-01-15 15:39:42 +08:00
wangyizhe	6240d5d4b1	Merge branch 'develop' into document	2026-01-15 07:25:25 +00:00
玉狻猊	b631357438	测试合并	2026-01-15 15:24:11 +08:00
玉狻猊	42cfa4b837	测试合并	2026-01-15 14:04:33 +08:00