From e2510fe0ddb0c6ec93fb46e52ef8d0827e76c418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=8E=E4=BD=97?= Date: Wed, 10 Jun 2026 08:37:14 +0800 Subject: [PATCH] =?UTF-8?q?fix(#715):=20=E4=B8=B4=E6=97=B6=E8=80=97?= =?UTF-8?q?=E6=9D=90=E5=8C=BB=E5=98=B1=E5=90=8C=E6=AD=A5=E8=87=B3=E6=8A=A4?= =?UTF-8?q?=E5=A3=AB=E7=AB=99=20+=20RequestFormDetailQueryDto=20=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 由 AI Agent (guanyu) 自动修复 --- healthlink-his-server/.mvn/jvm.config | 1 + .../appservice/impl/AdviceProcessAppServiceImpl.java | 7 +++++++ .../regdoctorstation/dto/RequestFormDetailQueryDto.java | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 healthlink-his-server/.mvn/jvm.config diff --git a/healthlink-his-server/.mvn/jvm.config b/healthlink-his-server/.mvn/jvm.config new file mode 100644 index 000000000..fecd9cc7f --- /dev/null +++ b/healthlink-his-server/.mvn/jvm.config @@ -0,0 +1 @@ +--sun-misc-unsafe-memory-access=allow diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java index 3d84e113f..220666c5e 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java @@ -177,6 +177,9 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService { // 初始化查询参数 String encounterIds = inpatientAdviceParam.getEncounterIds(); inpatientAdviceParam.setEncounterIds(null); + // Bug #715: 提取therapyEnum手动处理，避免自动条件排除therapy_enum为NULL的耗材医嘱 + Integer therapyEnum = inpatientAdviceParam.getTherapyEnum(); + inpatientAdviceParam.setTherapyEnum(null); Integer exeStatus = inpatientAdviceParam.getExeStatus(); inpatientAdviceParam.setExeStatus(null); // 提取requestStatus手动处理，支持COMPLETED(3)和CHECK_VERIFIED(10)同时查询 @@ -204,6 +207,10 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService { = Arrays.stream(encounterIds.split(CommonConstants.Common.COMMA)).map(Long::parseLong).toList(); queryWrapper.in(CommonConstants.FieldName.EncounterId, encounterIdList); } + // Bug #715: 手动拼接therapyEnum条件，耗材医嘱(DeviceRequest)无therapy_enum(NULL)，需兼容 + if (therapyEnum != null) { + queryWrapper.and(w -> w.eq("therapy_enum", therapyEnum).or().isNull("therapy_enum")); + } // 患者医嘱分页列表 Page inpatientAdvicePage = adviceProcessAppMapper.selectInpatientAdvicePage(new Page<>(pageNo, pageSize), queryWrapper, diff --git a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RequestFormDetailQueryDto.java b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RequestFormDetailQueryDto.java index ae7ff6f93..b257bebbc 100755 --- a/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RequestFormDetailQueryDto.java +++ b/healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RequestFormDetailQueryDto.java @@ -14,7 +14,7 @@ import java.math.BigDecimal; public class RequestFormDetailQueryDto { /** - * 诊疗活动定义ID（wor_service_request.id，与开立检验时项目字典的 id / adviceDefinitionId 一致，用于编辑回显） + * 诊疗活动定义ID（wor_service_request.activity_id，与开立检验时项目字典的 id / adviceDefinitionId 一致，用于编辑回显） */ private Long adviceDefinitionId;