From d05266b477ae5ff601670fd4fdd144b8c12c7a82 Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 29 May 2018 11:43:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E8=AF=8A=E5=8D=95=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E8=AF=8A=E6=96=AD=E7=BB=93=E6=9E=9C=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/AntenatalExaminationFacade.java | 12 +++++++++--- .../lyms/platform/operate/web/facade/ApplyOrderFacade.java | 8 ++++++++ .../platform/operate/web/request/ReferralReceiptRequest.java | 11 +++++++---- .../operate/web/result/ReferralApplyOrderResult.java | 9 +++------ 4 files changed, 27 insertions(+), 13 deletions(-) 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 c64fb7a..40f311a 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 @@ -290,7 +290,7 @@ public class AntenatalExaminationFacade { model.setHospitalId(hospitalId); model.setOperator(userId); antenatalExaminationService.updateOneAnt(model, antExAddRequest.getId()); - //修改申请单状态 + //修改转诊申请单状态 updateApplyOrder(model, antExAddRequest.getParentId()); commonThreadPool.execute(new Runnable() { @@ -447,6 +447,9 @@ public class AntenatalExaminationFacade { ReferralApplyOrderModel referralApplyOrderModel = new ReferralApplyOrderModel(); referralApplyOrderModel.setScore(NumberUtils.toInt(antenatalExamination.getRiskScore())); + //其他诊断 + referralApplyOrderModel.setOtherDiagn(antenatalExamination.getOtherRisk()); + referralApplyOrderModel.setDiagnosis(antenatalExamination.getDiagnosis()); try { List l = JsonUtil.toList(antenatalExamination.getRiskFactor(), List.class); referralApplyOrderModel.setrRisk(queryRiskName(l)); @@ -624,6 +627,8 @@ public class AntenatalExaminationFacade { model.setRecDoctor(antExChuModel.getProdDoctor()); model.setModified(new Date()); model.setStatus(2); + model.setDiagnosis(antExChuModel.getDiagnosis()); + model.setOtherDiagn(antExChuModel.getDiagnosisOther()); applyOrderService.updateByParentId(referralApplyOrderQuery1, model); ReferralApplyOrderQuery referralApplyOrderQuery2 = new ReferralApplyOrderQuery(); @@ -2563,7 +2568,7 @@ public class AntenatalExaminationFacade { antexChuResult.setDiagnosis(queryRisk(list, false).getHighRisk()); } } catch (Exception e) { - +e.printStackTrace(); } try { if (StringUtils.isNotEmpty(antExChuModel.getHighrisk())) { @@ -2571,6 +2576,7 @@ public class AntenatalExaminationFacade { antexChuResult.setHighrisk(queryRisk(list1, false).getHighRisk()); } } catch (Exception e) { + e.printStackTrace(); } String doctorId = antExChuModel.getProdDoctor(); Map map1 = new HashMap<>(); @@ -2639,7 +2645,7 @@ public class AntenatalExaminationFacade { } - public HighScoreResult queryRisk(List id, boolean n) { + public synchronized HighScoreResult queryRisk(List id, boolean n) { HighScoreResult highScoreResult = new HighScoreResult(); BasicConfigQuery basicConfigQuery = new BasicConfigQuery(); List data = new ArrayList(); 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 ff194a6..1b08ffb 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 @@ -464,6 +464,14 @@ public class ApplyOrderFacade { referralApplyOrderResult.convertToResult(list.get(0), patients, zhuanCName, zhuanRname); referralApplyOrderResult.setTransferredHospital(map1); + try { + if (StringUtils.isNotEmpty(list.get(0).getDiagnosis())) { + List diagnosis = JsonUtil.toList(list.get(0).getDiagnosis(), List.class); + referralApplyOrderResult.setDiagnosis(antenatalExaminationFacade.queryRisk(diagnosis, false).getHighRisk()); + } + } catch (Exception e) { + e.printStackTrace(); + } Map map = new HashMap(); if (StringUtils.isNotEmpty(list.get(0).getApplyDoctor())) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralReceiptRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralReceiptRequest.java index 7298cfb..07b3c6d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralReceiptRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ReferralReceiptRequest.java @@ -1,5 +1,6 @@ package com.lyms.platform.operate.web.request; +import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.pojo.ReferralApplyOrderModel; import java.util.List; @@ -14,7 +15,7 @@ public class ReferralReceiptRequest { //高危风险因素 private List rRisk; //目前诊断 - private String diagnosis; + private List diagnosis; //其他诊断 private String otherDiagn; //接收医生 @@ -44,11 +45,11 @@ public class ReferralReceiptRequest { this.rRisk = rRisk; } - public String getDiagnosis() { + public List getDiagnosis() { return diagnosis; } - public void setDiagnosis(String diagnosis) { + public void setDiagnosis(List diagnosis) { this.diagnosis = diagnosis; } @@ -68,7 +69,9 @@ public class ReferralReceiptRequest { public void convertToDataModel(ReferralApplyOrderModel referralApplyOrderModel) { referralApplyOrderModel.setId(id); referralApplyOrderModel.setrRisk(rRisk); - referralApplyOrderModel.setDiagnosis(diagnosis); + if (null != diagnosis) { + referralApplyOrderModel.setDiagnosis(JsonUtil.array2JsonString(diagnosis)); + } referralApplyOrderModel.setOtherDiagn(otherDiagn); referralApplyOrderModel.setRecDoctor(recDoctor); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java index fef78b7..1e168d6 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java @@ -69,15 +69,15 @@ public class ReferralApplyOrderResult { //转入医院 private String zhuanRname; //目前诊断 - private String diagnosis; + private List diagnosis; //其他诊断 private String otherDiagn; - public String getDiagnosis() { + public List getDiagnosis() { return diagnosis; } - public void setDiagnosis(String diagnosis) { + public void setDiagnosis(List diagnosis) { this.diagnosis = diagnosis; } @@ -266,12 +266,9 @@ public class ReferralApplyOrderResult { } public ReferralApplyOrderResult convertToResult(ReferralApplyOrderModel destModel,Patients patients,String zhuanCName ,String zhuanRname) { - //目前诊断 - setDiagnosis(destModel.getDiagnosis()); //其他诊断 setOtherDiagn(destModel.getOtherDiagn()); setId(destModel.getId()); - setDiagnosis(destModel.getDiagnosis()); setDiseaseDesc(destModel.getDiseaseDesc()); setParentId(destModel.getParentId()); setName(destModel.getName()); -- 1.8.3.1