diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java index 26e7b4fbb..4fffefc0c 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java @@ -2107,11 +2107,9 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp CommonConstants.TableName.MED_MEDICATION_REQUEST, CommonConstants.TableName.WOR_DEVICE_REQUEST, CommonConstants.TableName.WOR_SERVICE_REQUEST, practitionerId, Whether.NO.getCode(), sourceEnum, sourceBillNo); - // 手术计费场景:sourceBillNo 不为空时,过滤掉药品(1),保留耗材(2)和诊疗(3/6) - if (sourceBillNo != null && !sourceBillNo.isEmpty()) { - requestBaseInfo.removeIf(dto -> dto.getAdviceType() != null - && dto.getAdviceType() == 1); - } + // 🔧 修复 Bug #444: 移除手术计费场景的药品过滤。 + // 原过滤会导致门诊手术医嘱界面无法获取手术计费创建的药品记录。 + // 前端各组件已根据自身业务逻辑做了正确的 adviceType 过滤。 for (RequestBaseDto requestBaseDto : requestBaseInfo) { // 请求状态 requestBaseDto diff --git a/openhis-ui-vue3/src/views/surgicalschedule/index.vue b/openhis-ui-vue3/src/views/surgicalschedule/index.vue index aa8b05c86..34e3c05fc 100755 --- a/openhis-ui-vue3/src/views/surgicalschedule/index.vue +++ b/openhis-ui-vue3/src/views/surgicalschedule/index.vue @@ -1535,8 +1535,8 @@ function handleMedicalAdvice(row) { temporarySigned.value = hasSubmittedAdvices; // 修复:根据已有数据状态设置,而非盲目重置 temporaryMedicalLoading.value = true // 🔧 新增:开始加载 - // 调用计费接口获取数据 - getPrescriptionList(row.visitId).then((res) => { + // 调用计费接口获取数据(使用手术计费来源参数,匹配 surgery billing 创建的记录) + getPrescriptionList(row.visitId, 6, row.operCode).then((res) => { console.log('=== 拉取计费数据返回结果 ===', res) if (res.code === 200 && res.data) { // 🔧 修复:显示所有药品请求数据,不管有没有计费项目