diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java index d4cba14b6..0a55610b0 100755 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/inhospitalnursestation/appservice/impl/AdviceProcessAppServiceImpl.java @@ -178,7 +178,8 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService { inpatientAdviceParam.setEncounterIds(null); Integer exeStatus = inpatientAdviceParam.getExeStatus(); inpatientAdviceParam.setExeStatus(null); - // requestStatus由前端tab控制,后端SQL已通过CASE条件处理校对状态过滤,无需再作为SQL条件 + // requestStatus由前端tab控制,需在后端过滤 + Integer requestStatus = inpatientAdviceParam.getRequestStatus(); inpatientAdviceParam.setRequestStatus(null); // 构建查询条件 QueryWrapper queryWrapper @@ -292,6 +293,16 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService { inpatientAdvicePage.setTotal(filteredList.size()); } } + + // 按请求状态(tab切换)过滤医嘱 + if (requestStatus != null) { + List statusFilteredList = inpatientAdvicePage.getRecords().stream() + .filter(advice -> requestStatus.equals(advice.getRequestStatus())) + .collect(Collectors.toList()); + inpatientAdvicePage.setRecords(statusFilteredList); + inpatientAdvicePage.setTotal(statusFilteredList.size()); + } + return R.ok(inpatientAdvicePage); }