From 58f3f3d1cc88c4546e8d39090fd79204022e039b Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 29 May 2018 18:26:48 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=8A=E6=96=AD=E7=BB=93=E6=9E=9C=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=90=8C=E6=AD=A5=E5=88=B0=E8=BD=AC=E8=AF=8A=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/pojo/ReferralApplyOrderModel.java | 10 +++++++- .../ResidentArchivesRegionController.java | 2 -- .../web/facade/AntenatalExaminationFacade.java | 27 +++++++++++++++++-- .../operate/web/facade/ApplyOrderFacade.java | 30 +++++++++++++++------- 4 files changed, 55 insertions(+), 14 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java index 1110827..89fe24d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java @@ -49,8 +49,10 @@ public class ReferralApplyOrderModel extends BaseModel { private Date dueDate; //高危分级 private List rLevel; - //高危风险因素 + //高危风险因素名称 private List rRisk; + //高危风险因素Id集合 + private List riskFactorId; //高危评分 private Integer score; //转入医院 @@ -93,7 +95,13 @@ public class ReferralApplyOrderModel extends BaseModel { //其他诊断 private String otherDiagn; + public List getRiskFactorId() { + return riskFactorId; + } + public void setRiskFactorId(List riskFactorId) { + this.riskFactorId = riskFactorId; + } public String getDiagnosis() { return diagnosis; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentArchivesRegionController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentArchivesRegionController.java index e8854ab..1956518 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentArchivesRegionController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/ResidentArchivesRegionController.java @@ -60,6 +60,4 @@ public class ResidentArchivesRegionController extends BaseController{ LoginContext loginState = (LoginContext) request.getAttribute("loginContext"); residentsFacade.regionaResidentsExport(queryRequest,loginState.getId(),response); } - - } 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 69aebc8..45325e2 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 @@ -455,14 +455,17 @@ public class AntenatalExaminationFacade { 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 { - List l = JsonUtil.toList(antenatalExamination.getRiskFactor(), List.class); - referralApplyOrderModel.setrRisk(queryRiskName(l)); + //风险名称 + referralApplyOrderModel.setrRisk(queryRiskName(patients.getRiskFactorId())); + //高危集合ID + referralApplyOrderModel.setRiskFactorId(patients.getRiskFactorId()); System.out.println("待修改转诊信息："+referralApplyOrderModel.toString()); } catch (Exception e) { e.printStackTrace(); @@ -634,6 +637,26 @@ public class AntenatalExaminationFacade { referralApplyOrderQuery1.setPid(patients.getPid()); ReferralApplyOrderModel model = new ReferralApplyOrderModel(); + + model.setScore(patients.getRiskScore()); + //其他诊断 + model.setOtherDiagn(antExChuModel.getDiagnosisOther()); + model.setDiagnosis(antExChuModel.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); + } + model.setrLevel(rlevel); + try { + model.setrRisk(queryRiskName(patients.getRiskFactorId())); + //高危集合ID + model.setRiskFactorId(patients.getRiskFactorId()); + } catch (Exception e) { + e.printStackTrace(); + } + + //设置接收时间 model.setReceived(antExChuModel.getCheckTime()); model.setRecDoctor(antExChuModel.getProdDoctor()); 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 58a8e27..fd34efa 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 @@ -72,6 +72,7 @@ public class ApplyOrderFacade { ReferralApplyOrderModel referralApplyOrderModel = applyOrderService.findByIdReferralApplyOrder(referralReceipt.getId()); referralReceipt.convertToDataModel(referralApplyOrderModel); referralApplyOrderModel.setrRisk(queryRiskName(referralReceipt.getrRisk())); + referralApplyOrderModel.setRiskFactorId(referralReceipt.getrRisk()); if (StringUtils.isNotEmpty(referralApplyOrderModel.getId())) { ReferralApplyOrderQuery referralApplyOrderQuery1 = new ReferralApplyOrderQuery(); referralApplyOrderQuery1.setId(referralReceipt.getId()); @@ -496,6 +497,15 @@ public class ApplyOrderFacade { map.put("name", users.getName()); } } + try { + if (CollectionUtils.isNotEmpty(list.get(0).getRiskFactorId())) { + HighScoreResult highScoreResult = antenatalExaminationFacade.queryRisk(list.get(0).getRiskFactorId(), false); + referralApplyOrderResult.setRiskFactor(highScoreResult.getHighRisk()); + } + } catch (Exception e) { + e.printStackTrace(); + } + referralApplyOrderResult.setApplyDoctor(map); List> screenList = antenatalExaminationFacade.getscreenResult(patients.getScreenResult()); referralApplyOrderResult.setScreenResult(screenList); @@ -875,15 +885,17 @@ public class ApplyOrderFacade { } applyOrderResult.setrLevel(rLevel); Patients patients = patientsService.findOnePatientById(orderModel.getParentId()); - //筛查结果数据 - String screenStr = basicConfigService.getScreenResult(patients.getScreenResult()); - applyOrderResult.setScreenResult(screenStr); - if (null != patients) { - applyOrderResult.setIsGravida(patients.getType() == 3 ? "0" : "1"); - if (1 == patients.getDueStatus()) - applyOrderResult.setcDueWeek("终止妊娠"); - else if (patients.getType() == 3) - applyOrderResult.setcDueWeek("已分娩"); + if(patients!=null){ + //筛查结果数据 + String screenStr = basicConfigService.getScreenResult(patients.getScreenResult()); + applyOrderResult.setScreenResult(screenStr); + if (null != patients) { + applyOrderResult.setIsGravida(patients.getType() == 3 ? "0" : "1"); + if (1 == patients.getDueStatus()) + applyOrderResult.setcDueWeek("终止妊娠"); + else if (patients.getType() == 3) + applyOrderResult.setcDueWeek("已分娩"); + } } data.add(applyOrderResult); } -- 1.8.3.1