diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AnnualReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AnnualReportFacade.java index 155daa9..9f2609b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AnnualReportFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AnnualReportFacade.java @@ -99,10 +99,14 @@ public class AnnualReportFacade { Map> map = new LinkedHashMap<>(); for (String area : listArea) { List hospitalIds = this.getCurrentUserHospPermissions(userId, provinceId, cityId, area); + System.out.println(hospitalIds); + map.put(area, hospitalIds); } + List> mapList = this.getDates(map, organizationService, time, babyService, matDeliverService, antExRecordService, antenatalExaminationService, sieveService, matDeliverFollowService, patientsService, mongoTemplate); + System.out.println(mapList); this.sum(mapList); httpServletResponse.setContentType("application/force-download"); httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("年报表.xls").getBytes("UTF-8"), "ISO-8859-1")); @@ -117,10 +121,6 @@ public class AnnualReportFacade { public List getCurrentUserHospPermissions(Integer userId, String provinceId, String cityId, String areaId) { List hospitalList = new ArrayList<>(); -// String hospital = autoMatchFacade.getHospitalId(userId); -// if (null != hospital) { -// hospitalList.add(hospital); -// } //权限所有的医院 List allHospitalList = new ArrayList<>();