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 414b8ec..e49e327 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,9 +99,8 @@ public class AnnualReportFacade { Map> map = new LinkedHashMap<>(); for (String area : listArea) { List hospitalIds = this.getCurrentUserHospPermissions(userId, provinceId, cityId, area); - if (CollectionUtils.isNotEmpty(hospitalIds)) - { - System.out.println("hospitalIds="+ hospitalIds); + if (CollectionUtils.isNotEmpty(hospitalIds)) { + System.out.println("hospitalIds=" + hospitalIds); map.put(area, hospitalIds); } @@ -109,7 +108,7 @@ public class AnnualReportFacade { List> mapList = this.getDates(map, organizationService, time, babyService, matDeliverService, antExRecordService, antenatalExaminationService, sieveService, matDeliverFollowService, patientsService, mongoTemplate); - System.out.println("mapList="+mapList); + System.out.println("mapList=" + mapList); this.sum(mapList); httpServletResponse.setContentType("application/force-download"); httpServletResponse.setHeader("Content-Disposition", "attachment;filename=" + new String(("年报表.xls").getBytes("UTF-8"), "ISO-8859-1")); @@ -124,7 +123,6 @@ public class AnnualReportFacade { public List getCurrentUserHospPermissions(Integer userId, String provinceId, String cityId, String areaId) { List hospitalList = new ArrayList<>(); - //权限所有的医院 List allHospitalList = new ArrayList<>(); DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java index 7c1cdbd..2c83889 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java @@ -346,6 +346,66 @@ public class AntenatalExaminationResult implements IBasicResultConvert