From 324eada728de828a5ae62365923c667f3db0e7ec Mon Sep 17 00:00:00 2001
From: wangbo <184677810@qq.com>
Date: Fri, 10 May 2019 09:43:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=B4=E6=8A=A5bug=E7=AC=AC=E4=B8=80?=
 =?UTF-8?q?=E6=B3=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/annualReportFacade.java     | 31 +++++++++++++---------
 1 file changed, 18 insertions(+), 13 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 f72939f..36874c4 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
@@ -73,6 +73,8 @@ public class annualReportFacade {
     @Autowired
     private MongoTemplate mongoTemplate;
 
+    private Map<String, String> mapCout = new HashMap<>();
+
     public void queryAnnualReport(Integer userId, String time, String provinceId, String cityId, HttpServletResponse httpServletResponse) {
 
         //本市户籍
@@ -218,8 +220,8 @@ public class annualReportFacade {
         int bigBoyCount = 0;//巨大儿人数
         int zcBabyCount = 0;//早产儿数
         int babySiChanSiTaiCount = 0;//死胎人数
-        int patientCount = 0;//
-        int babyCount = 0;//产儿总数
+      /*  int patientCount = 0;//
+        int babyCount = 0;//产儿总数*/
         if (CollectionUtils.isNotEmpty(list)) {
             for (Map<String, String> map : list) {
                 huoChanCount += Integer.parseInt(map.get("huoChanCount"));  //分娩方式 剖宫产
@@ -256,8 +258,8 @@ public class annualReportFacade {
                 bigBoyCount += Integer.parseInt(map.get("bigBoyCount"));
                 zcBabyCount += Integer.parseInt(map.get("zcBabyCount"));
                 babySiChanSiTaiCount += Integer.parseInt(map.get("babySiChanSiTaiCount"));
-                patientCount += Integer.parseInt(map.get("patientCount"));
-                babyCount += Integer.parseInt(map.get("babyCount"));
+                /*patientCount += Integer.parseInt(map.get("patientCount"));
+                babyCount += Integer.parseInt(map.get("babyCount"));*/
             }
         }
         Map<String, String> totalMap = new LinkedHashMap<>();
@@ -265,12 +267,12 @@ public class annualReportFacade {
         totalMap.put("huoChanCount", String.valueOf(huoChanCount));
         totalMap.put("boyCount", String.valueOf(boyCount));
         totalMap.put("girlCount", String.valueOf(girlCount));
-        totalMap.put("chanCount", String.valueOf(chanCount));
         totalMap.put("sexNo", "0");
+        totalMap.put("chanCount", String.valueOf(chanCount));
         totalMap.put("maternalCount", String.valueOf(maternalCount));
         totalMap.put("maternalPercent", this.division(maternalCount, chanCount));
         totalMap.put("antexCount", String.valueOf(antexCount));
-        totalMap.put("antexPercent", this.division(antexCount, patientCount));
+        totalMap.put("antexPercent", this.division(antexCount, Integer.parseInt(mapCout.get("patientCount"))));
         totalMap.put("fiveCount", String.valueOf(fiveCount));
         totalMap.put("fivePercent", this.division(fiveCount, antexCount));
         totalMap.put("antexcCout", String.valueOf(antexcCout));
@@ -303,9 +305,9 @@ public class annualReportFacade {
         totalMap.put("gravidaCount", String.valueOf(gravidaCount));
         totalMap.put("gravidaPervent", this.division(gravidaCount, chanCount));
         totalMap.put("fmZuYuanCount", String.valueOf(fmZuYuanCount));
-        totalMap.put("fmZuYuanPervent", this.division(fmZuYuanCount, babyCount));
+        totalMap.put("fmZuYuanPervent", this.division(fmZuYuanCount, Integer.parseInt(mapCout.get("babyCount"))));
         totalMap.put("fmPoGongCount", String.valueOf(fmPoGongCount));
-        totalMap.put("fmPogongPervent", this.division(fmPoGongCount, babyCount));
+        totalMap.put("fmPogongPervent", this.division(fmPoGongCount, Integer.parseInt(mapCout.get("babyCount"))));
         totalMap.put("killCount", String.valueOf(killCount));
         Double killPervent = (double) killCount != 0.0 ? (double) killCount / 100000 : 0;
         totalMap.put("killPervent", String.valueOf(killPervent));
@@ -341,6 +343,8 @@ public class annualReportFacade {
         List<String> hivList = new ArrayList<>();
         hivList.add("yang");
         hivList.add("yin");
+        Integer patientCountSum = 0;
+        Integer babyCountSum = 0;
         for (Map.Entry<Object, List<String>> entry : hospitalIdMap.entrySet()) {
             Map<String, String> map = new LinkedHashMap<>();
             //机构名称
@@ -494,7 +498,8 @@ public class annualReportFacade {
             List<AntExChuModel> antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery3);
             int j = 0;
             for (AntExChuModel antExChu : antExChuModels) {
-                if (null != antExChu.getXhdb()) {
+                if (StringUtils.isNotEmpty(antExChu.getXhdb())) {
+                    System.out.println(antExChu.getXhdb());
                     if (Integer.valueOf(antExChu.getXhdb()).intValue() > 100) {
                         ++j;
                     }
@@ -883,12 +888,12 @@ public class annualReportFacade {
             babySiWangList.clear();
             map.put("babySiChanSiTaiCount", String.valueOf(babySiChanCount + babySiTaiCount));
 
-            map.put("patientCount", String.valueOf(patientCount));
-            map.put("babyCount", String.valueOf(babyCount));
-
+            patientCountSum += patientCount;
+            babyCountSum += babyCount;
             list.add(map);
         }
-
+        mapCout.put("patientCount", String.valueOf(patientCountSum));
+        mapCout.put("babyCount", String.valueOf(babyCountSum));
         return list;
     }
 
-- 
1.8.3.1