wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

fix(#715): 临时耗材医嘱同步至护士站 + RequestFormDetailQueryDto 修正

Browse Source 
由 AI Agent (guanyu) 自动修复
This commit is contained in:
华佗
2026-06-10 08:37:14 +08:00
parent d405e9cb5e
commit e2510fe0dd
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
healthlink-his-server/.mvn/jvm.config Normal file
View File

@@ -0,0 +1 @@
--sun-misc-unsafe-memory-access=allow

7
healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java
View File

@@ -177,6 +177,9 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
// 初始化查询参数 // 初始化查询参数
String encounterIds = inpatientAdviceParam.getEncounterIds(); String encounterIds = inpatientAdviceParam.getEncounterIds();
inpatientAdviceParam.setEncounterIds(null); inpatientAdviceParam.setEncounterIds(null);
// Bug #715: 提取therapyEnum手动处理，避免自动条件排除therapy_enum为NULL的耗材医嘱
Integer therapyEnum = inpatientAdviceParam.getTherapyEnum();
inpatientAdviceParam.setTherapyEnum(null);
Integer exeStatus = inpatientAdviceParam.getExeStatus(); Integer exeStatus = inpatientAdviceParam.getExeStatus();
inpatientAdviceParam.setExeStatus(null); inpatientAdviceParam.setExeStatus(null);
// 提取requestStatus手动处理，支持COMPLETED(3)和CHECK_VERIFIED(10)同时查询 // 提取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(); = Arrays.stream(encounterIds.split(CommonConstants.Common.COMMA)).map(Long::parseLong).toList();
queryWrapper.in(CommonConstants.FieldName.EncounterId, encounterIdList); 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<InpatientAdviceDto> inpatientAdvicePage Page<InpatientAdviceDto> inpatientAdvicePage
= adviceProcessAppMapper.selectInpatientAdvicePage(new Page<>(pageNo, pageSize), queryWrapper, = adviceProcessAppMapper.selectInpatientAdvicePage(new Page<>(pageNo, pageSize), queryWrapper,

2
healthlink-his-server/healthlink-his-application/src/main/java/com/healthlink/his/web/regdoctorstation/dto/RequestFormDetailQueryDto.java
View File

@@ -14,7 +14,7 @@ import java.math.BigDecimal;
public class RequestFormDetailQueryDto { public class RequestFormDetailQueryDto {
/** /**
* 诊疗活动定义ID（wor_service_request.id，与开立检验时项目字典的 id / adviceDefinitionId 一致，用于编辑回显） * 诊疗活动定义ID（wor_service_request.activity_id，与开立检验时项目字典的 id / adviceDefinitionId 一致，用于编辑回显）
*/ */
private Long adviceDefinitionId; private Long adviceDefinitionId;