From abd0858eae8b174f5e50cc7ebd57b8ab41d80d5f Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 14 Nov 2018 13:40:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=9B=E6=9F=A5=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/SieveFacade.java   | 81 +++++++++++-----------
 1 file changed, 40 insertions(+), 41 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
index 9b0e1f8..bb9d2df 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
@@ -1625,49 +1625,48 @@ public class SieveFacade {
     private List<Map<String, String>> getDiaDatas(List<String> hospitalIds, String[] dates) {
         List<Map<String, String>> list = new ArrayList<>();
 
-        int sieveCount = 0;
-        int st21Count = 0;
-        int st1813Count = 0;
-        int sjqxCount = 0;
-        int sieveExcCountAll = 0;
-        int disCount = 0;
-        int disExcCount = 0;
-        int disStopCount = 0;
-
-        //超声  诊断数	总唇裂	多指/趾	先听性心脏病	神经管缺陷	先天性脑积水	肢体短缩	其他	畸形小计
-        int csDiaCount = 0;
-        int csClCount = 0;
-        int csDzCount = 0;
-        int csXzbCount = 0;
-        int csSjgqxCount = 0;
-        int csNjsCount = 0;
-        int csZtdsCount = 0;
-        int csQtCount = 0;
-        int csJxCount = 0;
-        // 羊水 诊断数	异常数
-        int ysDiaCount = 0;
-        int ysDiaExcCount = 0;
-
-        // 绒毛 诊断数	异常数
-        int rmDiaCount = 0;
-        int rmDiaExcCount = 0;
-
-        // 胎儿血 诊断数	异常数
-        int teDiaCount = 0;
-        int teDiaExcCount = 0;
-
-        // 其他 诊断数	异常数
-        int qtDiaCount = 0;
-        int qtDiaExcCount = 0;
-
-        // 合计 诊断数	异常数	终止妊娠数
-        int hjDiaCount = 0;
-        int hjDiaExcCount = 0;
-        int hjStopCount = 0;
-
-
         for (String hid : hospitalIds)
         {
+
+            int sieveCount = 0;
+            int st21Count = 0;
+            int st1813Count = 0;
+            int sjqxCount = 0;
+            int sieveExcCountAll = 0;
+            int disCount = 0;
+            int disExcCount = 0;
+            int disStopCount = 0;
+
+            //超声  诊断数	总唇裂	多指/趾	先听性心脏病	神经管缺陷	先天性脑积水	肢体短缩	其他	畸形小计
+            int csDiaCount = 0;
+            int csClCount = 0;
+            int csDzCount = 0;
+            int csXzbCount = 0;
+            int csSjgqxCount = 0;
+            int csNjsCount = 0;
+            int csZtdsCount = 0;
+            int csQtCount = 0;
+            int csJxCount = 0;
+            // 羊水 诊断数	异常数
+            int ysDiaCount = 0;
+            int ysDiaExcCount = 0;
+
+            // 绒毛 诊断数	异常数
+            int rmDiaCount = 0;
+            int rmDiaExcCount = 0;
+
+            // 胎儿血 诊断数	异常数
+            int teDiaCount = 0;
+            int teDiaExcCount = 0;
+
+            // 其他 诊断数	异常数
+            int qtDiaCount = 0;
+            int qtDiaExcCount = 0;
+
+            // 合计 诊断数	异常数	终止妊娠数
+            int hjDiaCount = 0;
+            int hjDiaExcCount = 0;
+            int hjStopCount = 0;
             Map<String, String> dataMap = new LinkedHashMap<>();
 
             dataMap.put("areaName",organizationService.getOrganization(Integer.parseInt(hid)).getName());
-- 
1.8.3.1