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 2646713e8..e34baee4d 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 @@ -366,7 +366,15 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService { // 根据执行状态过滤医嘱列表 List 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())