From 6684733142d5b9ad6a150a92c45c4d9a482f1de5 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 31 Aug 2016 17:58:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E7=97=85=E5=8E=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/ApplyOrderFacade.java | 89 ++++++++++++---------- 1 file changed, 49 insertions(+), 40 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 8cb612b..dbc053f 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 @@ -115,8 +115,8 @@ public class ApplyOrderFacade { referralApplyOrderModel.setSex(SexEnum.WOMAN.getId()); referralApplyOrderModel.setBirth(patients.getBirth()); referralApplyOrderModel.setExpVip(patients.getExpVip()); - int days=-1; - if(patients.getType()==1){ + int days = -1; + if (patients.getType() == 1) { days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); } referralApplyOrderModel.setLastMenses(patients.getLastMenses()); @@ -137,12 +137,12 @@ public class ApplyOrderFacade { patientsQuery1.setHospitalId(referralApplyOrderModel.getTransferredHospital()); List patientsList = patientsService.queryPatient(patientsQuery1); - List organization =null; + List organization = null; try { - OrganizationQuery organizationQuery=new OrganizationQuery(); + OrganizationQuery organizationQuery = new OrganizationQuery(); organizationQuery.setId(Integer.valueOf(referralApplyOrderModel.getTransferredHospital())); - organization= organizationService.queryOrganization(organizationQuery); - if (CollectionUtils.isEmpty(patientsList)&&CollectionUtils.isNotEmpty(organization)) { + organization = organizationService.queryOrganization(organizationQuery); + if (CollectionUtils.isEmpty(patientsList) && CollectionUtils.isNotEmpty(organization)) { //在转入的医院建档 patients.setId(null); patients.setHospitalId(referralApplyOrderModel.getTransferredHospital()); @@ -159,7 +159,7 @@ public class ApplyOrderFacade { patients1.setBuildType(3); patientsService.updatePatient(patients1); } - }catch (Exception e){ + } catch (Exception e) { } } @@ -193,24 +193,33 @@ public class ApplyOrderFacade { babyModelQuery.setHospitalId(referralApplyOrderModel.getTransferredHospital()); babyModelQuery.setYn(YnEnums.YES.getId()); List babyModels = babyService.queryBabyWithQuery(babyModelQuery); - //没有儿童档案的时候才建档 - if (CollectionUtils.isEmpty(babyModels)) { - ////在转入的医院新增儿童建档 - babyModel.setId(null); - babyModel.setHospitalId(referralApplyOrderModel.getTransferredHospital()); - babyModel.setBuildDoctor(null); - babyModel.setBuildDate(new Date()); - babyModel.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); - babyModel.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); - babyModel.setExpVip(0); - babyModel.setBuildType(3); - id = babyService.addOneBaby(babyModel).getId(); - } else { - BabyModel babyModel1 = babyModels.get(0); - id = babyModel1.getId(); - babyModel1.setModified(new Date()); - babyModel1.setBuildType(3); - babyService.updateOneBaby(babyModel1, babyModel1.getId()); + + List organization = null; + try { + OrganizationQuery organizationQuery = new OrganizationQuery(); + organizationQuery.setId(Integer.valueOf(referralApplyOrderModel.getTransferredHospital())); + organization = organizationService.queryOrganization(organizationQuery); + if (CollectionUtils.isEmpty(babyModels) && CollectionUtils.isNotEmpty(organization)) { + //没有儿童档案的时候才建档 + ////在转入的医院新增儿童建档 + babyModel.setId(null); + babyModel.setHospitalId(referralApplyOrderModel.getTransferredHospital()); + babyModel.setBuildDoctor(null); + babyModel.setBuildDate(new Date()); + babyModel.setServiceType(ServiceTypeEnums.STANDARD_SERVICE.getId()); + babyModel.setServiceStatus(ServiceStatusEnums.STANDARD_OPEN.getId()); + babyModel.setExpVip(0); + babyModel.setBuildType(3); + id = babyService.addOneBaby(babyModel).getId(); + } else { + BabyModel babyModel1 = babyModels.get(0); + id = babyModel1.getId(); + babyModel1.setModified(new Date()); + babyModel1.setBuildType(3); + babyService.updateOneBaby(babyModel1, babyModel1.getId()); + } + } catch (Exception e) { + } } } @@ -477,7 +486,7 @@ public class ApplyOrderFacade { } //根据孕周 if (null != applyOrderQueryRequest.getEndDueWeek() && NumberUtils.isNumber(applyOrderQueryRequest.getEndDueWeek())) { - int i = NumberUtils.toInt(applyOrderQueryRequest.getEndDueWeek()) * 7+6; + int i = NumberUtils.toInt(applyOrderQueryRequest.getEndDueWeek()) * 7 + 6; referralApplyOrderQuery.setDueDateEnd(i); } if (null != applyOrderQueryRequest.getStartDueWeek()) { @@ -508,17 +517,17 @@ public class ApplyOrderFacade { referralApplyOrderQuery.setHospitalName(organizationService.getOrganization(Integer.valueOf(hospital)).getName()); //1 转入 0转出 if ("1".equals(applyOrderQueryRequest.getAction())) { - if(StringUtils.isNotEmpty(applyOrderQueryRequest.getTransferredHospital())){ - if(NumberUtils.isNumber(applyOrderQueryRequest.getTransferredHospital())){ + if (StringUtils.isNotEmpty(applyOrderQueryRequest.getTransferredHospital())) { + if (NumberUtils.isNumber(applyOrderQueryRequest.getTransferredHospital())) { referralApplyOrderQuery.setOutHospitalId(applyOrderQueryRequest.getTransferredHospital()); - }else{ + } else { OrganizationQuery organizationQuery = new OrganizationQuery(); organizationQuery.setYn(YnEnums.YES.getId()); organizationQuery.setName(applyOrderQueryRequest.getTransferredHospital()); List organization = organizationService.queryOrganization(organizationQuery); if (CollectionUtils.isNotEmpty(organization)) { - referralApplyOrderQuery.setOutHospitalId(organization.get(0).getId()+""); - }else{ + referralApplyOrderQuery.setOutHospitalId(organization.get(0).getId() + ""); + } else { referralApplyOrderQuery.setOutHospitalId(applyOrderQueryRequest.getTransferredHospital()); } } @@ -526,17 +535,17 @@ public class ApplyOrderFacade { referralApplyOrderQuery.setTransferredHospital(hospital); } else if ("0".equals(applyOrderQueryRequest.getAction())) { - if(StringUtils.isNotEmpty(applyOrderQueryRequest.getTransferredHospital())){ - if(NumberUtils.isNumber(applyOrderQueryRequest.getTransferredHospital())){ + if (StringUtils.isNotEmpty(applyOrderQueryRequest.getTransferredHospital())) { + if (NumberUtils.isNumber(applyOrderQueryRequest.getTransferredHospital())) { referralApplyOrderQuery.setTransferredHospital(applyOrderQueryRequest.getTransferredHospital()); - }else{ + } else { OrganizationQuery organizationQuery = new OrganizationQuery(); organizationQuery.setYn(YnEnums.YES.getId()); organizationQuery.setName(applyOrderQueryRequest.getTransferredHospital()); List organization = organizationService.queryOrganization(organizationQuery); if (CollectionUtils.isNotEmpty(organization)) { - referralApplyOrderQuery.setTransferredHospital(organization.get(0).getId()+""); - }else{ + referralApplyOrderQuery.setTransferredHospital(organization.get(0).getId() + ""); + } else { referralApplyOrderQuery.setTransferredHospital(applyOrderQueryRequest.getTransferredHospital()); } } @@ -579,12 +588,12 @@ public class ApplyOrderFacade { } } HighScoreResult highScoreResult = antenatalExaminationFacade.queryRisk(orderModel.getrRisk(), true); - StringBuilder stringBuilder=new StringBuilder(highScoreResult.gethighRiskStr()); - if(StringUtils.isNotEmpty(orderModel.getOtherHighRisk())){ - if(stringBuilder.length()>0&&StringUtils.isNotEmpty(orderModel.getOtherHighRisk())){ + StringBuilder stringBuilder = new StringBuilder(highScoreResult.gethighRiskStr()); + if (StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) { + if (stringBuilder.length() > 0 && StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) { stringBuilder.append(","); } - if(StringUtils.isNotEmpty(orderModel.getOtherHighRisk())){ + if (StringUtils.isNotEmpty(orderModel.getOtherHighRisk())) { stringBuilder.append(orderModel.getOtherHighRisk()); } } -- 1.8.3.1