From 259f09fb4c2989b0d80dffeb728ee779f317ae2a Mon Sep 17 00:00:00 2001 From: yangfei Date: Wed, 30 May 2018 11:38:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=8D=B1=E8=BD=AC=E8=AF=8A=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/query/ReferralApplyOrderQuery.java | 1 + .../web/facade/AntenatalExaminationFacade.java | 120 +++++++++++---------- 2 files changed, 66 insertions(+), 55 deletions(-) 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 74a1102..ca64e8d 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; + // //申请单状态 0 已接收 1 已转出 2 建议转诊 private Integer status; /** * 生日 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 45325e2..bd2891a 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 @@ -269,7 +269,7 @@ public class AntenatalExaminationFacade { /** - * 增加一条产前检查 + * 增加一条产前检查(复诊) * * @param antExAddRequest * @return @@ -341,7 +341,7 @@ public class AntenatalExaminationFacade { return new BaseResponse().setErrorcode(ErrorCodeConstants.DATA_EXIST).setErrormsg("同一天只能建一次复诊"); } - //修改申请单状态 + //修改转诊申请单状态 updateApplyOrder(model, antExAddRequest.getParentId()); final Patients patients = patientsService.findOnePatientById(antExAddRequest.getParentId()); @@ -401,34 +401,6 @@ public class AntenatalExaminationFacade { operateLogFacade.addAddOptLog(userId, Integer.parseInt(hospitalId), model, OptActionEnums.ADD.getId(), "添加复诊"); - if (null != patients.getBuildType() && patients.getBuildType() == 3) { - ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); - referralApplyOrderQuery.setParentId(patients.getId()); - referralApplyOrderQuery.setHospitalId(hospitalId); - 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(hospitalId); - referralApplyOrderQuery1.setPid(patients.getPid()); - referralApplyOrderQuery1.setStatus(1); - ReferralApplyOrderModel model1 = new ReferralApplyOrderModel(); - //设置接收时间 - model1.setReceived(model.getCheckDate()); - model1.setRecDoctor(model.getCheckDoctor()); - model1.setModified(new Date()); - model1.setStatus(2); - applyOrderService.updateByParentId(referralApplyOrderQuery1, model1); - ReferralApplyOrderQuery referralApplyOrderQuery2 = new ReferralApplyOrderQuery(); - referralApplyOrderQuery2.setOutHospitalId(hospitalId); - referralApplyOrderQuery2.setTransferredHospital(outHospitalId); - referralApplyOrderQuery2.setPid(patients.getPid()); - referralApplyOrderQuery2.setStatus(1); - applyOrderService.updateByParentId(referralApplyOrderQuery2, model1); - } - } //添加复诊时添加追访信息 addTrackDownInfo(userId, patients); } @@ -439,39 +411,77 @@ public class AntenatalExaminationFacade { } + + //修改转诊单高危及诊断信息 public void updateApplyOrder(final AntenatalExaminationModel antenatalExamination, final String parentId) { commonThreadPool.execute(new Runnable() { @Override public void run() { + Patients patients = patientsService.findOnePatientById(parentId); + //建档类型 0 未分娩建档 1儿童建档时建档 2 自动分娩类型 3 转诊自动建档 + if (null != patients.getBuildType() && patients.getBuildType() == 3) { + ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); + referralApplyOrderQuery.setParentId(patients.getId()); + //申请单状态 1 已转出 2 接收转诊 + //转诊单状态为待接收状态 + List orderModelList = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); + if (CollectionUtils.isNotEmpty(orderModelList)) { + ReferralApplyOrderModel referralApplyOrderModel = orderModelList.get(0); + String outHospitalId = referralApplyOrderModel.getOutHospitalId(); + //查询转入申请单 + ReferralApplyOrderQuery referralApplyOrderQuery1 = new ReferralApplyOrderQuery(); + referralApplyOrderQuery1.setOutHospitalId(outHospitalId); + referralApplyOrderQuery1.setTransferredHospital(patients.getHospitalId()); + referralApplyOrderQuery1.setPid(patients.getPid()); + ReferralApplyOrderModel model1 = new ReferralApplyOrderModel(); + if(referralApplyOrderModel.getStatus()==1) { + //设置接收时间 + model1.setReceived(antenatalExamination.getCheckDate()); + model1.setRecDoctor(antenatalExamination.getCheckDoctor()); + model1.setStatus(2); + model1.setModified(new Date()); + } - ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); - referralApplyOrderQuery.setParentId(parentId); - - ReferralApplyOrderModel referralApplyOrderModel = new ReferralApplyOrderModel(); - referralApplyOrderModel.setScore(NumberUtils.toInt(antenatalExamination.getRiskScore())); - //其他诊断 - referralApplyOrderModel.setOtherDiagn(antenatalExamination.getDiagnosisOther()); - referralApplyOrderModel.setDiagnosis(antenatalExamination.getDiagnosis()); - List rlevel=Collections.emptyList(); - //风险等级颜色 - if(StringUtils.isNotEmpty(patients.getRiskLevelId())&&!"[]".equals(patients.getRiskLevelId())){ - rlevel= JsonUtil.jkstr2Obj(patients.getRiskLevelId(), List.class); - com.lyms.platform.operate.web.utils.CollectionUtils.removeDuplicate(rlevel,true); - } - referralApplyOrderModel.setrLevel(rlevel); - try { - //风险名称 - referralApplyOrderModel.setrRisk(queryRiskName(patients.getRiskFactorId())); - //高危集合ID - referralApplyOrderModel.setRiskFactorId(patients.getRiskFactorId()); - System.out.println("待修改转诊信息："+referralApplyOrderModel.toString()); - } catch (Exception e) { - e.printStackTrace(); + model1.setScore(NumberUtils.toInt(antenatalExamination.getRiskScore())); + //其他诊断 + model1.setOtherDiagn(antenatalExamination.getDiagnosisOther()); + model1.setDiagnosis(antenatalExamination.getDiagnosis()); + List rlevel=Collections.emptyList(); + //风险等级颜色 + if(StringUtils.isNotEmpty(patients.getRiskLevelId())&&!"[]".equals(patients.getRiskLevelId())){ + rlevel= JsonUtil.jkstr2Obj(patients.getRiskLevelId(), List.class); + com.lyms.platform.operate.web.utils.CollectionUtils.removeDuplicate(rlevel,true); + } + model1.setrLevel(rlevel); + try { + //风险名称 + model1.setrRisk(queryRiskName(patients.getRiskFactorId())); + //高危集合ID + model1.setRiskFactorId(patients.getRiskFactorId()); + System.out.println("待修改转诊信息："+model1.toString()); + } catch (Exception e) { + e.printStackTrace(); + } + //设置转入申请单的状态为接收 + applyOrderService.updateByParentId(referralApplyOrderQuery1, model1); + + //查询转出申请单 + ReferralApplyOrderQuery referralApplyOrderQuery2 = new ReferralApplyOrderQuery(); + referralApplyOrderQuery2.setOutHospitalId(patients.getHospitalId()); + referralApplyOrderQuery2.setTransferredHospital(outHospitalId); + referralApplyOrderQuery2.setPid(patients.getPid()); + //设置转出申请单的状态为接收 + applyOrderService.updateByParentId(referralApplyOrderQuery2, model1); + System.out.println("查询转诊条件："+referralApplyOrderQuery.convertToQuery().convertToMongoQuery()); + + } } - System.out.println("查询转诊条件："+referralApplyOrderQuery.convertToQuery().convertToMongoQuery()); - applyOrderService.updateByParentId(referralApplyOrderQuery, referralApplyOrderModel); + + + + } }); -- 1.8.3.1