From 8de43fe1a1458fac96c39693dba04b7a5c78b4a7 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Sat, 1 Apr 2017 15:13:18 +0800
Subject: [PATCH] update

---
 .../operate/web/facade/AreaCountFacade.java        | 37 ++++++++++++++--------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
index 3062e8e..75c5c89 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AreaCountFacade.java
@@ -643,19 +643,30 @@ public class AreaCountFacade {
 
                 //权限所有的医院
                 List<String>  allHospitalList = new ArrayList<>();
-                DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
-                dataPermissionsModelQuery.setUserId(userId);
-                List<DataPermissionsModel> permissionsModels = dataPermissionService.queryPermission(dataPermissionsModelQuery);
-                if (CollectionUtils.isNotEmpty(permissionsModels)) {
-                        Set<String> set = permissionsModels.get(0).getData().keySet();
-                        Iterator<String> it = set.iterator();
-                        while (it.hasNext()) {
-                                String id = it.next();
-                                if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(id) && !hospitalList.contains(id)) {
-                                        allHospitalList.add(id);
-                                }
-                        }
-                }
+//                DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
+//                dataPermissionsModelQuery.setUserId(userId);
+//                List<DataPermissionsModel> permissionsModels = dataPermissionService.queryPermission(dataPermissionsModelQuery);
+//                if (CollectionUtils.isNotEmpty(permissionsModels)) {
+//                        Set<String> set = permissionsModels.get(0).getData().keySet();
+//                        Iterator<String> it = set.iterator();
+//                        while (it.hasNext()) {
+//                                String id = it.next();
+//                                if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(id) && !hospitalList.contains(id)) {
+//                                        allHospitalList.add(id);
+//                                }
+//                        }
+//                }
+               List<Integer> list =  autoMatchFacade.matchAreaOrgId(userId);
+               if (CollectionUtils.isNotEmpty(list))
+               {
+                   for(Integer id : list)
+                   {
+                       if (id != null && com.lyms.platform.common.utils.StringUtils.isNotEmpty(id.toString()) && !hospitalList.contains(id.toString())) {
+                               allHospitalList.add(id.toString());
+                      }
+                   }
+               }
+
 
                 //条件查询到的医院
                 List<String>  orgHospitalList = new ArrayList<>();
-- 
1.8.3.1