From 3b83d3aa8da86b0f2a7a50c93db5ed32031d314f Mon Sep 17 00:00:00 2001 From: zhaoyun Date: Thu, 28 May 2026 10:32:49 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20Bug=20#609=20-=20=E5=87=BA=E9=99=A2?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=20pricingFlag=20=E5=8F=82=E6=95=B0=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E6=9F=A5=E8=AF=A2=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Root Cause: saveLeaveHospitalOrders() 调用 getAdviceBaseInfo 时 传入 pricingFlag = Whether.NO.getValue() = 0，但数据库里 '出院'诊疗定义的 pricing_flag = 1。SQL 过滤条件 AND (pricing_flag = 0 OR pricing_flag IS NULL) 排除了出院子项。 Fix: 将 pricingFlag 改为 null，不设定价过滤条件。 --- .../appservice/impl/SpecialAdviceAppServiceImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java index 97c57aa63..aa719dfc0 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/regdoctorstation/appservice/impl/SpecialAdviceAppServiceImpl.java @@ -162,7 +162,7 @@ public class SpecialAdviceAppServiceImpl implements ISpecialAdviceAppService { adviceBaseDto.setAdviceDefinitionId(definitionId); // 医嘱定义id // 对应的诊疗医嘱信息 activityAdviceBaseDto = iDoctorStationAdviceAppService.getAdviceBaseInfo(adviceBaseDto, null, null, - null, null, 1, 1, Whether.NO.getValue(), List.of(3), null, null).getRecords().get(0); + null, null, 1, 1, null, List.of(3), null, null).getRecords().get(0); // 逻辑1---------------------直接新增 longServiceRequest.setStatusEnum(RequestStatus.DRAFT.getValue());// 请求状态 longServiceRequest.setOccurrenceStartTime(startTime); // 医嘱开始时间 @@ -209,7 +209,7 @@ public class SpecialAdviceAppServiceImpl implements ISpecialAdviceAppService { adviceBaseDto.setAdviceDefinitionId(definitionId); // 医嘱定义id // 对应的诊疗医嘱信息 activityAdviceBaseDto = iDoctorStationAdviceAppService - .getAdviceBaseInfo(adviceBaseDto, null, null, null, null, 1, 1, Whether.NO.getValue(), List.of(3), null, null) + .getAdviceBaseInfo(adviceBaseDto, null, null, null, null, 1, 1, null, List.of(3), null, null) .getRecords().get(0); longServiceRequest.setStatusEnum(RequestStatus.DRAFT.getValue());// 请求状态 @@ -349,7 +349,7 @@ public class SpecialAdviceAppServiceImpl implements ISpecialAdviceAppService { adviceBaseDto.setAdviceDefinitionId(transferOrganizationDefinitionId); // 医嘱定义id // 转科的医嘱信息 AdviceBaseDto activityAdviceBaseDto = iDoctorStationAdviceAppService - .getAdviceBaseInfo(adviceBaseDto, null, null, null, null, 1, 1, Whether.NO.getValue(), List.of(3), null, null) + .getAdviceBaseInfo(adviceBaseDto, null, null, null, null, 1, 1, null, List.of(3), null, null) .getRecords().get(0); // 保存转科医嘱请求 ServiceRequest serviceRequest = new ServiceRequest(); @@ -431,7 +431,7 @@ public class SpecialAdviceAppServiceImpl implements ISpecialAdviceAppService { // 出院的医嘱信息 List adviceList = iDoctorStationAdviceAppService.getAdviceBaseInfo(null, null, null, - List.of(transferOrganizationDefinitionId), null, 1, 1, Whether.NO.getValue(), List.of(3), null, null).getRecords(); + List.of(transferOrganizationDefinitionId), null, 1, 1, null, List.of(3), null, null).getRecords(); if (CollectionUtils.isEmpty(adviceList)) { return R.fail("未找到出院医嘱定义数据，请确认诊疗目录中已配置出院医嘱"); }