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 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 dataPermissionsModelList = dataPermissionService.queryPermission(dataPermissionsModelQuery); - if (CollectionUtils.isNotEmpty(dataPermissionsModelList)) { - Set set = dataPermissionsModelList.get(0).getData().keySet(); - Iterator 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 dataPermissionsModelList = dataPermissionService.queryPermission(dataPermissionsModelQuery); + if (CollectionUtils.isNotEmpty(dataPermissionsModelList)) { + Set set = dataPermissionsModelList.get(0).getData().keySet(); + Iterator 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