From 488573a51b85d96628565139518f0bacbc39db69 Mon Sep 17 00:00:00 2001 From: guanyu Date: Tue, 16 Jun 2026 13:37:38 +0800 Subject: [PATCH] =?UTF-8?q?fix(#663):=20guanyu=20(=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=88=E5=85=A5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appservice/impl/AdviceProcessAppServiceImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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())