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

Compare commits

base: wangyizhe:3b94d19199775d23f5cafef2ebd2945e2dc7a0f2
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: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

7 Commits
3b94d19199 ... 1212

Author SHA1 Message Date
玉狻猊
6d85686b06 测试合并v14 2026-01-15 17:06:32 +08:00
玉狻猊
b33cb6f9a1 测试合并v13 2026-01-15 17:04:46 +08:00
玉狻猊
072e71b025 测试合并v12 2026-01-15 16:58:14 +08:00
wangyizhe
47394de43c Merge pull request 'document' (#2) from document into develop 
Reviewed-on: #2
 2026-01-15 07:37:39 +00:00
玉狻猊
f0f1dde6b6 测试合并 2026-01-15 07:37:39 +00:00
玉狻猊
1ab1165697 测试合并 2026-01-15 07:37:39 +00:00
chenqi
a8f1b1fdfa feat(doctorstation): 添加医嘱类型对应的药品分类筛选功能 
- 在处方列表组件中根据医嘱类型自动设置categoryCode筛选条件
- 为西药类型设置categoryCode为'2'
- 为中成药类型设置categoryCode为'1'
- 为耗材和诊疗类型清空categoryCode筛选条件
- 更新基础医嘱列表组件以接收并应用categoryCode查询参数
- 实现医嘱类型改变时的联动筛选逻辑
 2026-01-15 15:34:34 +08:00
3 changed files with 27 additions and 1 deletions
Expand all files Collapse all files

10
md/test.html Normal file
View File

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

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

@@ -198,6 +198,9 @@ 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,6 +782,19 @@
// 当医嘱类型改变时，清空当前选择的项目名称，因为不同类型项目的数据结构可能不兼容 // 当医嘱类型改变时，清空当前选择的项目名称，因为不同类型项目的数据结构可能不兼容
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="