diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java index 864c36f..bbdc0f5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java @@ -359,6 +359,12 @@ public class RiskReportFacade { //权限和筛选条件不未空的时候就查询孕妇高危数量 if (CollectionUtils.isNotEmpty(hids)) { + + if (StringUtils.isNotEmpty(countRequest.getTimeStart()) && StringUtils.isNotEmpty(countRequest.getTimeEnd())) { + patientsQuery.setBookbuildingDateStart(DateUtil.parseYMD(countRequest.getTimeStart())); + patientsQuery.setBookbuildingDateEnd(DateUtil.parseYMD(countRequest.getTimeEnd())); + } + //权限 patientsQuery.setHospitalList(hids); @@ -420,6 +426,13 @@ public class RiskReportFacade { if (currentUserHospPermissions.contains(String.valueOf(org.getId()))) { + + if (StringUtils.isNotEmpty(countRequest.getTimeStart()) && StringUtils.isNotEmpty(countRequest.getTimeEnd())) + { + patientsQuery.setBookbuildingDateStart(DateUtil.parseYMD(countRequest.getTimeStart())); + patientsQuery.setBookbuildingDateEnd(DateUtil.parseYMD(countRequest.getTimeEnd())); + } + List hids = new ArrayList<>(); hids.add(String.valueOf(org.getId())); //权限 @@ -453,7 +466,7 @@ public class RiskReportFacade { int index = addrType < 3 ? 4 : 3; - for (int i = index ; i <= (times == null ? 0+index : times.size()+index) ; i++) + for (int i = index ; i <= (times == null ? index : times.size()+index) ; i++) { int total = 0; for (List items : result) @@ -472,6 +485,12 @@ public class RiskReportFacade { //统计柱状图数据封装-------------------------------- + + if (StringUtils.isNotEmpty(countRequest.getTimeStart()) && StringUtils.isNotEmpty(countRequest.getTimeEnd())) { + patientsQuery.setBookbuildingDateStart(DateUtil.parseYMD(countRequest.getTimeStart())); + patientsQuery.setBookbuildingDateEnd(DateUtil.parseYMD(countRequest.getTimeEnd())); + } + //图标数据 List> series = new ArrayList<>();