From 0efbcc602af417dc6cdd3af606cd2846e18872ca Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 23 Nov 2017 21:04:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/RiskReportFacade.java       | 58 +++++++++-------------
 1 file changed, 23 insertions(+), 35 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
index 22f24f4..75720cb 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/RiskReportFacade.java
@@ -543,7 +543,6 @@ public class RiskReportFacade {
             }
         }
 
-
         if (addrType < 3)
         {
             if (CollectionUtils.isNotEmpty(list))
@@ -564,7 +563,6 @@ public class RiskReportFacade {
                     List<String> items = new ArrayList<>();
                     for (Map<String, Object> addr : list)
                     {
-                        List<String> hids = new ArrayList<>();
                         String id = String.valueOf(addr.get("id"));
                         if (addrType == 1)
                         {
@@ -577,30 +575,18 @@ public class RiskReportFacade {
 
                         //查询机构数
                         List<Organization> orgs = organizationService.queryOrganization(idQuery);
-
-                        if (CollectionUtils.isNotEmpty(orgs))
+                        List<String> hids = getConditionHospitalIds(currentUserHospPermissions, orgs);
+                        Integer count = 0;
+                        if (CollectionUtils.isNotEmpty(hids))
                         {
-                            for (Organization org : orgs)
-                            {
-                                hids.add(String.valueOf(org.getId()));
-                            }
+                            patientsQuery.setHospitalList(hids);
+                            //高危等级
+                            patientsQuery.setrLevel(config.getId());
+                            count = patientsService.queryPatientCount(patientsQuery);
                         }
-
-                        PatientsQuery query1 = new PatientsQuery();
-                        query1.setHospitalList(hids);
-                        query1.setYn(YnEnums.YES.getId());
-                        query1.setType(1);
-                        //高危等级
-                        query1.setrLevel(config.getId());
-                        List buildType = new ArrayList();
-                        buildType.add(0);
-                        buildType.add(2);
-                        query1.setBuildTypeList(buildType);
-                        Integer count = patientsService.queryPatientCount(query1);
                         items.add(count == null ? "0" : String.valueOf(count));
                     }
                     map.put("data",items);
-
                     series.add(map);
                 }
             }
@@ -611,11 +597,19 @@ public class RiskReportFacade {
             organizationQuery.setYn(YnEnums.YES.getId());
             organizationQuery.setAreaId(countRequest.getAreaId());
 
-            //TODO权限
-            // List<Organization> press = getCurrentOrgs( countRequest,  userId);
+            List<Integer> ids = new ArrayList<>();
+
+            if (CollectionUtils.isNotEmpty(currentUserHospPermissions))
+            {
+                for (String key : currentUserHospPermissions)
+                {
+                    ids.add(Integer.parseInt(key));
+                }
+            }
+            organizationQuery.setIdList(ids);
             List<Organization> orgs = organizationService.queryOrganization(organizationQuery);
 
-            if (CollectionUtils.isNotEmpty(list))
+            if (CollectionUtils.isNotEmpty(orgs))
             {
                 for (Organization org : orgs)
                 {
@@ -627,17 +621,12 @@ public class RiskReportFacade {
                     List<String> items = new ArrayList<>();
                     for (BasicConfig config : riskLevelConfig)
                     {
-                        PatientsQuery query1 = new PatientsQuery();
-                        query1.setHospitalId(String.valueOf(org.getId()));
-                        query1.setYn(YnEnums.YES.getId());
-                        query1.setType(1);
+
+                        patientsQuery.setHospitalId(String.valueOf(org.getId()));
+                        patientsQuery.setHospitalList(null);
                         //高危等级
-                        query1.setrLevel(config.getId());
-                        List buildType = new ArrayList();
-                        buildType.add(0);
-                        buildType.add(2);
-                        query1.setBuildTypeList(buildType);
-                        Integer count = patientsService.queryPatientCount(query1);
+                        patientsQuery.setrLevel(config.getId());
+                        Integer count = patientsService.queryPatientCount(patientsQuery);
                         items.add(count == null ? "0" : String.valueOf(count));
                         map.put("data",items);
                     }
@@ -645,7 +634,6 @@ public class RiskReportFacade {
                 }
             }
         }
-
         datas.put("series",series);
         datas.put("xAxis",xAxis);
         datas.put("legend",titleItems);
-- 
1.8.3.1