From 1d4b65c48371c259c25f6e71772afff193f39bff Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 26 Aug 2022 10:34:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=A6=E7=9A=87=E5=B2=9B=E5=BB=BA=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/BookbuildingFacade.java | 22 +++++++++++++++++++++- .../web/request/YunBookbuildingAddRequest.java | 10 ++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) 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 99cc42a..cefdb59 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 @@ -227,7 +227,27 @@ public class BookbuildingFacade { * @return */ public BaseObjectResponse addPregnantBookbuilding( - YunBookbuildingAddRequest yunRequest, final Integer userId, boolean isSync) { + YunBookbuildingAddRequest yunRequest, Integer uId, boolean isSync) { + + if (StringUtils.isNotEmpty(yunRequest.getOrgName())) + { + OrganizationQuery organizationQuery = new OrganizationQuery(); + organizationQuery.setYn(YnEnums.YES.getId()); + organizationQuery.setName(yunRequest.getOrgName()); + List organizations = organizationService.queryOrganization(organizationQuery); + if (CollectionUtils.isNotEmpty(organizations)) + { + yunRequest.setHospitalId(String.valueOf(organizations.get(0).getId())); + UsersQuery usersQuery = new UsersQuery(); + usersQuery.setOrgId(organizations.get(0).getId()); + List users = usersService.queryUsers(usersQuery); + if (CollectionUtils.isNotEmpty(users)) + { + uId = users.get(0).getId(); + } + } + } + final Integer userId = uId; BaseObjectResponse br = new BaseObjectResponse(); PatientsQuery patientsQuery = new PatientsQuery(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java index 1f482ca..5009fd7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/YunBookbuildingAddRequest.java @@ -76,6 +76,16 @@ public class YunBookbuildingAddRequest { //秦皇岛-有居住证 填写字段 private String liveCardNo; + //归属卫生院名称 + private String orgName; + + public String getOrgName() { + return orgName; + } + + public void setOrgName(String orgName) { + this.orgName = orgName; + } public String getLiveCardNo() { return liveCardNo; -- 1.8.3.1