diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 24d2a90..8cb612b 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -137,27 +137,30 @@ public class ApplyOrderFacade { patientsQuery1.setHospitalId(referralApplyOrderModel.getTransferredHospital()); List patientsList = patientsService.queryPatient(patientsQuery1); - OrganizationQuery organizationQuery = new OrganizationQuery(); - organizationQuery.setYn(YnEnums.YES.getId()); - organizationQuery.setName(referralApplyOrderModel.getTransferredHospital()); - List organization = organizationService.queryOrganization(organizationQuery); + List organization =null; + try { + OrganizationQuery organizationQuery=new OrganizationQuery(); + organizationQuery.setId(Integer.valueOf(referralApplyOrderModel.getTransferredHospital())); + organization= organizationService.queryOrganization(organizationQuery); + if (CollectionUtils.isEmpty(patientsList)&&CollectionUtils.isNotEmpty(organization)) { + //在转入的医院建档 + patients.setId(null); + patients.setHospitalId(referralApplyOrderModel.getTransferredHospital()); + patients.setBookbuildingDate(new Date()); + patients.setBookbuildingDoctor(null); + patients.setBuildType(3); + patients.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); + patients.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); + patients.setExpVip(0); + id = patientsService.addPatient(patients).getId(); + } else { + Patients patients1 = patientsList.get(0); + id = patients1.getId(); + patients1.setBuildType(3); + patientsService.updatePatient(patients1); + } + }catch (Exception e){ - if (CollectionUtils.isEmpty(patientsList)&&CollectionUtils.isNotEmpty(organization)) { - //在转入的医院建档 - patients.setId(null); - patients.setHospitalId(referralApplyOrderModel.getTransferredHospital()); - patients.setBookbuildingDate(new Date()); - patients.setBookbuildingDoctor(null); - patients.setBuildType(3); - patients.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); - patients.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); - patients.setExpVip(0); - id = patientsService.addPatient(patients).getId(); - } else { - Patients patients1 = patientsList.get(0); - id = patients1.getId(); - patients1.setBuildType(3); - patientsService.updatePatient(patients1); } } }