From c00909562087de4f60f1ba1d48ba95c786024ab0 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 1 Sep 2016 15:43:10 +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 --- .../platform/query/ReferralApplyOrderQuery.java | 12 ++++++++++ .../web/facade/AntenatalExaminationFacade.java | 26 ++++++++++++++++++++++ 2 files changed, 38 insertions(+) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java index 1f00690..9dca6a5 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java @@ -59,6 +59,7 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati //体验会员 0非会员 1会员 private Integer expVip; private Integer serviceType; + private Integer status; /** * 生日 */ @@ -86,6 +87,14 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati */ private Date lastMensesEnd; + public Integer getStatus() { + return status; + } + + public void setStatus(Integer status) { + this.status = status; + } + public Date getRevicedEnd() { return revicedEnd; } @@ -296,6 +305,9 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati if(null!=serviceStatus){ condition=condition.and("serviceStatus",serviceStatus, MongoOper.IS); } + if(null!=status){ + condition=condition.and("status",status, MongoOper.IS); + } if(null!=age){ condition=condition.and("age",age, MongoOper.IS); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 31c3c45..20a065c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -97,6 +97,31 @@ public class AntenatalExaminationFacade { updateApplyOrder(model, antExAddRequest.getParentId()); //修改孕妇高危等级 updatePatientRiskLevel(model, patients); + + + if (null != patients.getBuildType() && patients.getBuildType() == 3) { + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); + referralApplyOrderQuery.setParentId(patients.getId()); + String hospital = autoMatchFacade.getHospitalId(userId); + referralApplyOrderQuery.setHospitalId(hospital); + referralApplyOrderQuery.setStatus(1); + List orderModelList = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); + if (CollectionUtils.isNotEmpty(orderModelList)) { + String outHospitalId = orderModelList.get(0).getOutHospitalId(); + ReferralApplyOrderQuery referralApplyOrderQuery1 = new ReferralApplyOrderQuery(); + referralApplyOrderQuery1.setOutHospitalId(outHospitalId); + referralApplyOrderQuery1.setTransferredHospital(hospital); + referralApplyOrderQuery1.setPid(patients.getPid()); + + ReferralApplyOrderModel model1 = new ReferralApplyOrderModel(); + //设置接收时间 + model1.setReceived(new Date()); + model1.setRecDoctor(userId + ""); + model1.setModified(new Date()); + model1.setStatus(2); + applyOrderService.updateByParentId(referralApplyOrderQuery1, model1); + } + } } return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); @@ -172,6 +197,7 @@ public class AntenatalExaminationFacade { referralApplyOrderQuery.setParentId(patients.getId()); String hospital = autoMatchFacade.getHospitalId(userId); referralApplyOrderQuery.setHospitalId(hospital); + referralApplyOrderQuery.setStatus(1); List orderModelList = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); if (CollectionUtils.isNotEmpty(orderModelList)) { String outHospitalId = orderModelList.get(0).getOutHospitalId(); -- 1.8.3.1