From 5bafbe9a9a87a20e934afcda0397c781ceadfbe9 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 8 Nov 2018 16:47:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=AD=9B=E7=BB=9F=E8=AE=A1=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/SieveFacade.java   | 60 ++++++++++++++--------
 1 file changed, 38 insertions(+), 22 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 6700af2..cc87777 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
@@ -1158,16 +1158,33 @@ public class SieveFacade {
         //图标数据
         List<Map<String, Object>> series = new LinkedList<>();
 
+        if (CollectionUtils.isNotEmpty(configList)) {
+            Map<String, Object> map = new HashMap();
+            map.put("name", "产筛人数");
+            map.put("type", "bar");
 
+            Map<String, Object> dMap = new HashMap();
+            dMap.put("name", "诊断人数");
+            dMap.put("type", "bar");
 
-        List<List<String>> result = new ArrayList<>();
-
-        int num = 1;
-        if (CollectionUtils.isNotEmpty(configList))
-        {
+            List<String> csItems = new ArrayList<>();
+            List<String> dItems = new ArrayList<>();
             for (BasicConfig c : configList) {
+
+                OrganizationQuery idQuery = new OrganizationQuery();
+                idQuery.setYn(YnEnums.YES.getId());
+
+                //查询机构数
+                if (addrType == 1) {
+                    idQuery.setCityId(c.getId());
+                } else if (addrType == 2) {
+                    idQuery.setAreaId(c.getId());
+                }
+                List<Organization> orgs = organizationService.queryOrganization(idQuery);
+                List<String> hids = getConditionHospitalIds(currentUserHospPermissions, orgs);
+
                 SieveQuery sieveQuery = new SieveQuery();
-                sieveQuery.setHospitalIds(currentUserHospPermissions);
+                sieveQuery.setHospitalIds(hids);
                 sieveQuery.setYn(YnEnums.YES.getId());
                 sieveQuery.setStatus(3);
                 if (dates != null) {
@@ -1176,36 +1193,35 @@ public class SieveFacade {
                         sieveQuery.setResultTimeEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
                     }
                 }
-
                 int sieveFinishCount = sieveService.queryListCount(sieveQuery);
-                List<String> csItems = new ArrayList<>();
                 csItems.add(String.valueOf(sieveFinishCount));
-                Map<String, Object> map = new HashMap();
-                map.put("name", "产筛人数");
-                map.put("type", "bar");
-                map.put("data", csItems);
-                series.add(map);
 
                 DiagnosisQuery diagnosisQuery = new DiagnosisQuery();
-                diagnosisQuery.setHospitalIds(currentUserHospPermissions);
-
+                diagnosisQuery.setHospitalIds(hids);
                 if (dates != null) {
                     diagnosisQuery.setResultDateStart(DateUtil.parseYMD(dates[0]));
                     if (dates.length == 2) {
                         diagnosisQuery.setResultDateEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
                     }
                 }
-
                 int diagnosisCount = diagnosisService.queryDiagnosisCount(diagnosisQuery);
-                List<String> dItems = new ArrayList<>();
                 dItems.add(String.valueOf(diagnosisCount));
-                Map<String, Object> dMap = new HashMap();
-                dMap.put("name", "诊断人数");
-                dMap.put("type", "bar");
-                dMap.put("data", dItems);
-                series.add(dMap);
+            }
+
+            map.put("data", csItems);
+            series.add(map);
+
+            dMap.put("data", dItems);
+            series.add(dMap);
+        }
 
 
+        List<List<String>> result = new ArrayList<>();
+
+        int num = 1;
+        if (CollectionUtils.isNotEmpty(configList))
+        {
+            for (BasicConfig c : configList) {
 
                 List<String> items = new ArrayList<>();
                 items.add(String.valueOf(num));
-- 
1.8.3.1