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="