jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 50c167228543444fe08c2b7604ab1c015441448a

Authored by wangbo
1 parent 13b6413491
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

年报bug修改

Showing 1 changed file with 4 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/annualReportFacade.java View file @ 50c1672
... ... @@ -95,13 +95,13 @@
95 95  
96 96  
97 97 try {
98   - Map<Object, List<String>> map = new HashMap<>();
  98 + Map<Object, List<String>> map = new LinkedHashMap<>();
99 99 for (String area : listArea) {
100 100 List<String> hospitalIds = this.getCurrentUserHospPermissions(userId, provinceId, cityId, area);
  101 + System.out.println("==========>" + area);
101 102 map.put(area, hospitalIds);
102 103 }
103 104  
104   -
105 105 List<Map<String, String>> mapList = this.getDates(map, organizationService, time, babyService, matDeliverService, antExRecordService, antenatalExaminationService, sieveService, matDeliverFollowService, patientsService, mongoTemplate);
106 106 this.sum(mapList);
107 107 httpServletResponse.setContentType("application/force-download");
... ... @@ -110,8 +110,6 @@
110 110 System.out.println(path);
111 111 String timeStr = DateUtil.getyyyy_MM_dd1(DateUtil.getSNDate(time)[0]) + "-" + DateUtil.getyyyy_MM_dd1(DateUtil.getSNDate(time)[1]);
112 112 ExcelUtil.writeExcAnnualFile(path, httpServletResponse.getOutputStream(), areaNames, timeStr, mapList);
113   -
114   -
115 113 } catch (Exception e) {
116 114 ExceptionUtils.catchException(e, "queryAnnualReport error");
117 115 }
... ... @@ -347,6 +345,8 @@
347 345 //机构名称
348 346 BasicConfig basicConfig = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(entry.getKey())), BasicConfig.class);
349 347 map.put("orgName", basicConfig.getName());
  348 + System.out.println("==============>id" + basicConfig.getId());
  349 +
350 350 //活产数
351 351 BabyModelQuery babyModelQuery = new BabyModelQuery();
352 352 babyModelQuery.setDataStatus(false);