From 10a59e70c298f10f1ab091c5395c22c2473bb308 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 24 Oct 2017 14:37:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5=E5=8C=BA=E5=9F=9F=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/BabyBookbuildingFacade.java | 39 +++++++++++-----------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index c8de6f0..1ab763b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -1945,30 +1945,29 @@ public class BabyBookbuildingFacade {
                 for (Organization organization : organizationList) {
                     hospitalIdList.add(String.valueOf(organization.getId()));
                 }
-            }else{
-                // List<Organization> organizationList = organizationService.queryOrganization(organizationQuery);
-                // for (Organization organization : organizationList) {
-                //     hospitalIdList.add(String.valueOf(organization.getId()));
-                // }
-                String hospital = autoMatchFacade.getHospitalId(userId);
-                if(null!=hospital){
-                    hospitalIdList.add(hospital);
-                }
-                DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
-                dataPermissionsModelQuery.setUserId(userId);
-                List<DataPermissionsModel> dataPermissionsModelList = dataPermissionService.queryPermission(dataPermissionsModelQuery);
-                if (CollectionUtils.isNotEmpty(dataPermissionsModelList)) {
-                    Set<String> set = dataPermissionsModelList.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) && !hospitalIdList.contains(id)) {
-                            hospitalIdList.add(id);
-                        }
+            }
+
+            String hospital = autoMatchFacade.getHospitalId(userId);
+            if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(hospital) && !hospitalIdList.contains(hospital)) {
+                hospitalIdList.add(hospital);
+
+            }
+
+            DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery();
+            dataPermissionsModelQuery.setUserId(userId);
+            List<DataPermissionsModel> dataPermissionsModelList = dataPermissionService.queryPermission(dataPermissionsModelQuery);
+            if (CollectionUtils.isNotEmpty(dataPermissionsModelList)) {
+                Set<String> set = dataPermissionsModelList.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) && !hospitalIdList.contains(id)) {
+                        hospitalIdList.add(id);
                     }
                 }
             }
 
+
         }else{
             String hospitalId = "";
             //得到当前登录的医院id
-- 
1.8.3.1