From 50c167228543444fe08c2b7604ab1c015441448a Mon Sep 17 00:00:00 2001
From: wangbo <184677810@qq.com>
Date: Fri, 10 May 2019 16:31:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E6=8A=A5bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/operate/web/facade/annualReportFacade.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 c505370..e3db8fb 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
@@ -95,13 +95,13 @@ public class annualReportFacade {
 
 
         try {
-            Map<Object, List<String>> map = new HashMap<>();
+            Map<Object, List<String>> map = new LinkedHashMap<>();
             for (String area : listArea) {
                 List<String> hospitalIds = this.getCurrentUserHospPermissions(userId, provinceId, cityId, area);
+                System.out.println("==========>" + area);
                 map.put(area, hospitalIds);
             }
 
-
             List<Map<String, String>> mapList = this.getDates(map, organizationService, time, babyService, matDeliverService, antExRecordService, antenatalExaminationService, sieveService, matDeliverFollowService, patientsService, mongoTemplate);
             this.sum(mapList);
             httpServletResponse.setContentType("application/force-download");
@@ -110,8 +110,6 @@ public class annualReportFacade {
             System.out.println(path);
             String timeStr = DateUtil.getyyyy_MM_dd1(DateUtil.getSNDate(time)[0]) + "-" + DateUtil.getyyyy_MM_dd1(DateUtil.getSNDate(time)[1]);
             ExcelUtil.writeExcAnnualFile(path, httpServletResponse.getOutputStream(), areaNames, timeStr, mapList);
-
-
         } catch (Exception e) {
             ExceptionUtils.catchException(e, "queryAnnualReport error");
         }
@@ -347,6 +345,8 @@ public class annualReportFacade {
             //机构名称
             BasicConfig basicConfig = mongoTemplate.findOne(Query.query(Criteria.where("_id").is(entry.getKey())), BasicConfig.class);
             map.put("orgName", basicConfig.getName());
+            System.out.println("==============>id" + basicConfig.getId());
+
             //活产数
             BabyModelQuery babyModelQuery = new BabyModelQuery();
             babyModelQuery.setDataStatus(false);
-- 
1.8.3.1