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 ccea6e3..4869e51 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 @@ -1561,11 +1561,13 @@ public class BookbuildingFacade { */ public BaseResponse updatePregnantById(String id, YunBookbuildingAddRequest yunRequest, Integer userId, boolean isSync) { + String hospitalId = autoMatchFacade.getHospitalId(userId); + BaseResponse br = new BaseResponse(); PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setYn(YnEnums.YES.getId()); patientsQuery.setType(1); - patientsQuery.setHospitalId(yunRequest.getHospitalId()); + patientsQuery.setHospitalId(hospitalId); patientsQuery.setBuildTypeEq(0); patientsQuery.setDueStatus(0); @@ -1685,7 +1687,7 @@ public class BookbuildingFacade { //如果建档医生是空则创建医生 if (StringUtils.isEmpty(patient.getLastCheckEmployeeId())){ - Integer dockerId= usersService.getUserId(patient.getHospitalId(),yunRequest.getLastCheckEmployeeName()); + Integer dockerId= usersService.getUserId(hospitalId,yunRequest.getLastCheckEmployeeName()); if (dockerId!=null){ patient.setLastCheckEmployeeId(String.valueOf(dockerId)); }else { @@ -1694,7 +1696,7 @@ public class BookbuildingFacade { Users users = new Users(); users.setType(UserTypeEnum.NORMAL_USER.getId()); //1普通用户 //users.setDeptId(deptId); - users.setOrgId(Integer.valueOf(patient.getHospitalId())); + users.setOrgId(Integer.valueOf(StringUtils.isNotEmpty(patient.getHospitalId())?patient.getHospitalId():hospitalId)); users.setName(yunRequest.getLastCheckEmployeeName()); users.setAccount(yunRequest.getLastCheckEmployeeName()); //users.setPhone(phone);