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 81e461b..0c423a7 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 @@ -96,7 +96,8 @@ public class ApplyOrderFacade { /* List list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); if (CollectionUtils.isEmpty(list)) {*/ - if (2 == type) { + String id=""; + if (2 == type) { //查询产妇信息 List patientses = patientsService.queryPatient(patientsQuery); Patients patients = null; @@ -122,11 +123,13 @@ public class ApplyOrderFacade { referralApplyOrderModel.setPid(patients.getPid()); referralApplyOrderModel.setDueWeek(days); referralApplyOrderModel.setServiceType(patients.getServiceType()); + id=patients.getId(); if (StringUtils.isNotEmpty(referralApplyOrderModel.getTransferredHospital()) && NumberUtils.isNumber(referralApplyOrderModel.getTransferredHospital())) { PatientsQuery patientsQuery1 = new PatientsQuery(); - patientsQuery1.setId(patients.getId()); + patientsQuery1.setPid(patients.getPid()); patientsQuery1.setYn(YnEnums.YES.getId()); + patientsQuery1.setType(patients.getType()); patientsQuery1.setHospitalId(referralApplyOrderModel.getTransferredHospital()); if (patientsService.queryPatientCount(patientsQuery1) == 0) { //在转入的医院建档 @@ -135,13 +138,15 @@ public class ApplyOrderFacade { patients.setBookbuildingDate(new Date()); patients.setBookbuildingDoctor(null); patients.setBuildType(2); - patientsService.addPatient(patients); + id=patientsService.addPatient(patients).getId(); } } } } else { + BabyModel babyModel = babyService.getOneBabyById(referralApplyOrderModel.getParentId()); if (null != babyModel) { + id=babyModel.getId(); if (null != babyModel.getBirth()) { referralApplyOrderModel.setAge(DateUtil.getAge(babyModel.getBirth())); referralApplyOrderModel.setDueWeek(DateUtil.getDays(babyModel.getBirth(), new Date())); @@ -162,7 +167,7 @@ public class ApplyOrderFacade { referralApplyOrderModel.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); if (StringUtils.isNotEmpty(referralApplyOrderModel.getTransferredHospital()) && NumberUtils.isNumber(referralApplyOrderModel.getTransferredHospital())) { BabyModelQuery babyModelQuery = new BabyModelQuery(); - babyModelQuery.setId(babyModel.getId()); + babyModelQuery.setPid(babyModel.getPid()); babyModelQuery.setHospitalId(referralApplyOrderModel.getTransferredHospital()); babyModelQuery.setYn(YnEnums.YES.getId()); //没有儿童档案的时候才建档 @@ -174,7 +179,7 @@ public class ApplyOrderFacade { babyModel.setBuildDate(new Date()); babyModel.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); babyModel.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); - babyService.addOneBaby(babyModel); + id =babyService.addOneBaby(babyModel).getId(); } } } @@ -187,6 +192,7 @@ public class ApplyOrderFacade { applyOrderService.addOneReferralApplyOrder(referralApplyOrderModel); referralApplyOrderModel.setId(null); + referralApplyOrderModel.setParentId(id); referralApplyOrderModel.setHospitalId(referralApplyOrderModel.getTransferredHospital()); applyOrderService.addOneReferralApplyOrder(referralApplyOrderModel);