wangyizhe/his
2
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Compare commits

base: wangyizhe:1212
Branches Tags
wangyizhe:develop wangyizhe:1212 wangyizhe:test wangyizhe:merge_1.3 wangyizhe:master wangyizhe:wangjunping
wangyizhe:V1.3 wangyizhe:V1.2 wangyizhe:v1.1
..
compare: wangyizhe:6240d5d4b11f88d3ff79d06856d3a2a22282c4ff
Branches Tags
wangyizhe:develop wangyizhe:1212 wangyizhe:test wangyizhe:merge_1.3 wangyizhe:master wangyizhe:wangjunping
wangyizhe:V1.3 wangyizhe:V1.2 wangyizhe:v1.1

3 Commits
1212 ... 6240d5d4b1

Author SHA1 Message Date
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
3 changed files with 2 additions and 18 deletions
Expand all files Collapse all files

2
md/test.html
View File

@@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>测试合并11112</title> <title>测试合并1</title>
</head> </head>
<body> <body>

3
openhis-ui-vue3/src/views/doctorstation/components/adviceBaseList.vue
View File

@@ -198,9 +198,6 @@ watch(
// 直接更新查询参数 // 直接更新查询参数
queryParams.value.searchKey = newValue.searchKey || ''; queryParams.value.searchKey = newValue.searchKey || '';
// 更新categoryCode
queryParams.value.categoryCode = newValue.categoryCode || '';
// 处理类型筛选 // 处理类型筛选
if (newValue.adviceType !== undefined && newValue.adviceType !== null && newValue.adviceType !== '') { if (newValue.adviceType !== undefined && newValue.adviceType !== null && newValue.adviceType !== '') {
// 单个类型 // 单个类型

13
openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
View File

@@ -782,19 +782,6 @@
// 当医嘱类型改变时，清空当前选择的项目名称，因为不同类型项目的数据结构可能不兼容 // 当医嘱类型改变时，清空当前选择的项目名称，因为不同类型项目的数据结构可能不兼容
prescriptionList[scope.$index].adviceName = undefined; prescriptionList[scope.$index].adviceName = undefined;
adviceQueryParams.adviceType = value; 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=" @clear="