From 4ed89d82d4f70d144942e341f9fa82afd2c9e16c Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Mon, 12 Nov 2018 16:11:07 +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   | 54 +++++++++++-----------
 1 file changed, 27 insertions(+), 27 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 1a78cc7..374f494 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
@@ -1342,12 +1342,29 @@ public class SieveFacade {
         basicQuery.setParentId(cityId);
 
 
-        int ySieveCount = 0;
-        int sSieveCount = 0;
+
         //获取地址列表
         List<BasicConfig> configList = basicConfigService.queryBasicConfig(basicQuery);
         for (BasicConfig bc : configList)
         {
+            int ySieveCount = 0;
+            int sSieveCount = 0;
+
+            int st21Count = 0;
+            int st1813Count = 0;
+            int sjqxCount = 0;
+
+            int sieveCount=0;
+
+            int disCount = 0;
+            int disExcCount = 0;
+            int sjDisCount = 0;
+            int sjDisExcCount = 0;
+            //孕妇无创DNA检测
+            int dnaSieveCount = 0;
+            int dnaSieveLowCount = 0;
+            int dnaSieveHighCount = 0;
+
             Map<String,String> mapData = new LinkedHashMap<>();
             mapData.put("areaName", bc.getName());//县市区
 
@@ -1355,6 +1372,7 @@ public class SieveFacade {
             patientsQuery.setHospitalList(hospitalIds);
             patientsQuery.setYn(YnEnums.YES.getId());
             patientsQuery.setCityRegisterId(cityId);
+            patientsQuery.setAreaRegisterId(bc.getId());
             List<Patients> patientses = patientsService.queryPatient(patientsQuery);
             List<String> patientIds = new ArrayList<>();
             if (CollectionUtils.isNotEmpty(patientses))
@@ -1363,6 +1381,11 @@ public class SieveFacade {
                 {
                     patientIds.add(pat.getId());
                 }
+            }
+
+            if (CollectionUtils.isNotEmpty(patientIds))
+            {
+
                 SieveQuery ySieveQuery = new SieveQuery();
                 ySieveQuery.setParentIds(patientIds);
                 ySieveQuery.setHospitalIds(hospitalIds);
@@ -1376,34 +1399,11 @@ public class SieveFacade {
 
                 ySieveQuery.setStatus(3);
                 sSieveCount = sieveService.queryListCount(ySieveQuery);
-            }
-
-            mapData.put("ysiveCount", String.valueOf(ySieveCount));//应筛查户籍人数
-            mapData.put("sSieveCount", String.valueOf(sSieveCount));//实筛查户籍人数
 
-//        private String tszhz;//  唐氏综合症
-//        private String sjgjx;//  神经管畸形
-//        private String sbst;//   18-三体
-//        private String dzhpx;// 地中海贫血
-//        private String cspj;//  产筛评价
-//        private String stzhz13; //13-三体
-            int st21Count = 0;
-            int st1813Count = 0;
-            int sjqxCount = 0;
-
-            int sieveCount=0;
 
-            int disCount = 0;
-            int disExcCount = 0;
-            int sjDisCount = 0;
-            int sjDisExcCount = 0;
-            //孕妇无创DNA检测
-            int dnaSieveCount = 0;
-            int dnaSieveLowCount = 0;
-            int dnaSieveHighCount = 0;
+                mapData.put("ysiveCount", String.valueOf(ySieveCount));//应筛查户籍人数
+                mapData.put("sSieveCount", String.valueOf(sSieveCount));//实筛查户籍人数
 
-            if (CollectionUtils.isNotEmpty(patientIds))
-            {
                 SieveResultQuery sieveResultQuery = new SieveResultQuery();
                 if (dates != null) {
                     sieveResultQuery.setResultTimeStart(DateUtil.parseYMD(dates[0]));
-- 
1.8.3.1