diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue index f7891dc1b..b2cbc6d82 100755 --- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue +++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue @@ -910,9 +910,8 @@ function handleFocus(row, index) { // 用 adviceType + categoryCode 组合查找匹配的选项 const selectValue = (adviceType == 1 && row.categoryCode) ? '1-' + row.categoryCode : adviceType; const selectedItem = adviceTypeList.value.find(item => item.value === selectValue) || adviceTypeList.value.find(item => item.adviceType === adviceType); - // 修复Bug #486:当行没有显式选择医嘱类型时(row.adviceType为undefined), - // 不传categoryCode,让搜索在全药库中进行;只有行已选择类型时才用对应categoryCode过滤 - const categoryCode = row.adviceType !== undefined ? (selectedItem ? selectedItem.categoryCode : '') : ''; + // 当行没有显式选择医嘱类型时,使用已配置的默认categoryCode,确保后端能返回结果 + const categoryCode = row.adviceType !== undefined ? (selectedItem ? selectedItem.categoryCode : '') : (adviceQueryParams.value.categoryCode || ''); const searchKey = row.adviceName || ''; nextTick(() => { @@ -949,9 +948,8 @@ function handleChange(value) { // 用 adviceType + categoryCode 组合查找匹配的选项 const selectValue = (adviceType == 1 && row?.categoryCode) ? '1-' + row.categoryCode : adviceType; const selectedItem = adviceTypeList.value.find(item => item.value === selectValue) || adviceTypeList.value.find(item => item.adviceType === adviceType); - // 修复Bug #486:当行没有显式选择医嘱类型时(row?.adviceType为undefined), - // 不传categoryCode,让搜索在全药库中进行;只有行已选择类型时才用对应categoryCode过滤 - const categoryCode = row?.adviceType !== undefined ? (selectedItem ? selectedItem.categoryCode : '') : ''; + // 当行没有显式选择医嘱类型时,使用已配置的默认categoryCode,确保后端能返回结果 + const categoryCode = row?.adviceType !== undefined ? (selectedItem ? selectedItem.categoryCode : '') : (adviceQueryParams.value.categoryCode || ''); // 修复Bug #453:当adviceType为空字符串或NaN时,不传具体类型,让refresh函数根据searchKey决定搜索范围 const effectiveAdviceType = (adviceType && !isNaN(Number(adviceType))) ? adviceType : ''; tableRef.refresh(effectiveAdviceType, categoryCode, value);