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

fix(#663): guanyu (文件合入)

Browse Source
This commit is contained in:
关羽
2026-06-16 13:37:38 +08:00
committed by 华佗
parent 259a5946c2
commit 488573a51b
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -366,7 +366,15 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
// 根据执行状态过滤医嘱列表
List<InpatientAdviceDto> filteredList = new ArrayList<>();
if (EventStatus.COMPLETED.getValue().equals(exeStatus)) {
if (EventStatus.PREPARATION.getValue().equals(exeStatus)) {
// 待执行 - 过滤出没有已执行记录的医嘱（Bug #663修复）
filteredList = inpatientAdviceList.stream().filter(
advice -> advice.getExePerformRecordList() == null || advice.getExePerformRecordList().isEmpty())
.collect(Collectors.toList());
// 更新分页数据
inpatientAdvicePage.setRecords(filteredList);
inpatientAdvicePage.setTotal(filteredList.size());
} else if (EventStatus.COMPLETED.getValue().equals(exeStatus)) {
// 已执行 - 过滤出有执行记录的医嘱
filteredList = inpatientAdviceList.stream().filter(
advice -> advice.getExePerformRecordList() != null && !advice.getExePerformRecordList().isEmpty())