diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 9760a13..a2d128e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -273,7 +273,7 @@ public class BookbuildingFacade { AreaCodeModel areaCode = null; - String groupId= groupsFacade.findByCurrentUserId(autoMatchFacade.getHospitalId(userId)); + String groupId= groupsFacade.findItemIdByCurrentUserId(autoMatchFacade.getHospitalId(userId)); if(org.apache.commons.lang.StringUtils.isNotEmpty(groupId)){ OrganizationGroupsItems groupsItems = groupsFacade.findById(groupId); if(null!=groupsItems){ diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OrganizationGroupsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OrganizationGroupsFacade.java index 6da6bae..8936de5 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OrganizationGroupsFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/OrganizationGroupsFacade.java @@ -107,6 +107,19 @@ public class OrganizationGroupsFacade { return findAllGroup(groupId); } + public String findItemIdByCurrentUserId(String hospital) { + OrganizationGroupsItemQuery organizationGroupsItemQuery = new OrganizationGroupsItemQuery(); + List hId = new ArrayList<>(); + hId.add(Integer.valueOf(hospital)); + organizationGroupsItemQuery.sethId(hId); + List groupsItemses = groupsItemService.queryList(organizationGroupsItemQuery); + if (CollectionUtils.isNotEmpty(groupsItemses)) { + return groupsItemses.get(0).getId(); + } + return null; + } + + /** * 获取当前医院所在组 * diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCheckTicketFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCheckTicketFacade.java index 59f9e33..3205175 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCheckTicketFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientCheckTicketFacade.java @@ -211,7 +211,7 @@ public class PatientCheckTicketFacade return; } - String groupId = groupsFacade.findByCurrentUserId(p.getHospitalId()); + String groupId = groupsFacade.findItemIdByCurrentUserId(p.getHospitalId()); if (org.apache.commons.lang.StringUtils.isNotEmpty(groupId)) { OrganizationGroupsItems groupsItems = groupsFacade.findById(groupId);