From 4962a8975b8c7af603c0699e7d239d60aad82e0c Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 10 Aug 2016 17:54:54 +0800 Subject: [PATCH] 111 --- .../operate/web/facade/ApplyOrderFacade.java | 76 ++++++++++++---------- 1 file changed, 42 insertions(+), 34 deletions(-) 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 0b3cf1f..9f5b163 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 @@ -76,46 +76,54 @@ public class ApplyOrderFacade { referralApplyOrderModel.setStatus(0); PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setId(referralApplyOrderModel.getParentId()); - if (2 == type) { - //查询产妇信息 - List patientses = patientsService.queryPatient(patientsQuery); - Patients patients = null; - if (CollectionUtils.isNotEmpty(patientses)) { - patients = patientses.get(0); - } - if (null != patients) { - referralApplyOrderModel.setParentId(patients.getId()); - referralApplyOrderModel.setCardNo(patients.getCardNo()); - referralApplyOrderModel.setAge(patients.getAge()); - referralApplyOrderModel.setDueDate(patients.getDueDate()); - referralApplyOrderModel.setName(patients.getUsername()); - referralApplyOrderModel.setPhone(patients.getPhone()); - referralApplyOrderModel.setSex(SexEnum.WOMAN.getId()); - } - } else { - BabyModel babyModel = babyService.getOneBabyById(referralApplyOrderModel.getParentId()); - if (null != babyModel) { - referralApplyOrderModel.setCardNo(babyModel.getCardNo()); - if (null != babyModel.getBirth()) { + ReferralApplyOrderQuery referralApplyOrderQuery=new ReferralApplyOrderQuery(); + referralApplyOrderQuery.setParentId(referralApplyOrderModel.getParentId()); + + List list = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); + if(CollectionUtils.isEmpty(list)){ + if (2 == type) { + //查询产妇信息 + List patientses = patientsService.queryPatient(patientsQuery); + Patients patients = null; + if (CollectionUtils.isNotEmpty(patientses)) { + patients = patientses.get(0); + } + + if (null != patients) { + referralApplyOrderModel.setParentId(patients.getId()); + referralApplyOrderModel.setCardNo(patients.getCardNo()); + referralApplyOrderModel.setAge(patients.getAge()); + referralApplyOrderModel.setDueDate(patients.getDueDate()); + referralApplyOrderModel.setName(patients.getUsername()); + referralApplyOrderModel.setPhone(patients.getPhone()); + referralApplyOrderModel.setSex(SexEnum.WOMAN.getId()); + } + } else { + BabyModel babyModel = babyService.getOneBabyById(referralApplyOrderModel.getParentId()); + if (null != babyModel) { + referralApplyOrderModel.setCardNo(babyModel.getCardNo()); + if (null != babyModel.getBirth()) { + referralApplyOrderModel.setAge(DateUtil.getAge(babyModel.getBirth())); + } + Patients patients = patientsService.findOnePatientById(babyModel.getParentId()); + referralApplyOrderModel.setMname(patients.getUsername()); referralApplyOrderModel.setAge(DateUtil.getAge(babyModel.getBirth())); + referralApplyOrderModel.setBirth(babyModel.getBirth()); + referralApplyOrderModel.setDueDate(babyModel.getDueDate()); + referralApplyOrderModel.setName(babyModel.getName()); + referralApplyOrderModel.setPhone(patients.getPhone()); + referralApplyOrderModel.setSex(babyModel.getSex()); } - Patients patients = patientsService.findOnePatientById(babyModel.getParentId()); - referralApplyOrderModel.setMname(patients.getUsername()); - referralApplyOrderModel.setAge(DateUtil.getAge(babyModel.getBirth())); - referralApplyOrderModel.setBirth(babyModel.getBirth()); - referralApplyOrderModel.setDueDate(babyModel.getDueDate()); - referralApplyOrderModel.setName(babyModel.getName()); - referralApplyOrderModel.setPhone(patients.getPhone()); - referralApplyOrderModel.setSex(babyModel.getSex()); } + + //孕妇 + referralApplyOrderModel.setType(type); + List areaId = autoMatchFacade.matchOrgId(userId); + referralApplyOrderModel.setOutHospitalId(areaId.get(0) + ""); + applyOrderService.addOneReferralApplyOrder(referralApplyOrderModel); } - //孕妇 - referralApplyOrderModel.setType(type); - List areaId = autoMatchFacade.matchOrgId(userId); - referralApplyOrderModel.setOutHospitalId(areaId.get(0) + ""); - applyOrderService.addOneReferralApplyOrder(referralApplyOrderModel); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } -- 1.8.3.1