From 1bf3c86a1ff8fe412e1aafa8dda4581d3812c920 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 23 Jan 2018 15:08:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=8D=B1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/AntenatalExaminationFacade.java        |  6 +++++-
 .../java/com/lyms/platform/operate/web/facade/ViewFacade.java |  7 +++++++
 .../com/lyms/platform/operate/web/result/HighScoreResult.java | 11 +++++++++++
 3 files changed, 23 insertions(+), 1 deletion(-)

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 3f69681..4c4bee7 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
@@ -773,6 +773,7 @@ public class AntenatalExaminationFacade {
                 if (null != model && StringUtils.isNotEmpty(model.getRiskFactor()) && !"[]".equals(model.getRiskFactor())) {
                     List list1 = JsonUtil.toList(model.getRiskFactor(), List.class);
                     highScoreResult = queryRisk(list1, needLevel);
+                    highScoreResult.setHighriskDesc(model.getHighriskDesc());
                     next = false;
                 }
                 if (null != model && !"{}".equals(model.getOtherRisk()) && !"[]".equals(model.getOtherRisk())) {
@@ -821,6 +822,7 @@ public class AntenatalExaminationFacade {
                         }
                         if (null != antExChuModel && StringUtils.isNotEmpty(antExChuModel.getHighrisk()) && !"[]".equals(antExChuModel.getHighrisk())) {
                             List list2 = JsonUtil.toList(antExChuModel.getHighrisk(), List.class);
+                            highScoreResult.setHighriskDesc(antExChuModel.getHighriskDesc());
                             highScoreResult = queryRisk(list2, needLevel);
                             next = false;
                         }
@@ -1435,13 +1437,15 @@ public class AntenatalExaminationFacade {
 
     public BaseResponse getLastRisk(String patientId, Integer id) {
         List highRisk = new ArrayList();
+        String highriskDesc = "";
         Patients patients = patientsService.findOnePatientById(patientId);
         if (patients != null) {
             HighScoreResult highScoreResult = findLastRisk(patients.getPid(), true);
             highRisk = highScoreResult.getHighRisk();
+            highriskDesc =  highScoreResult.getHighriskDesc();
         }
 
-        return new BaseObjectResponse().setData(highRisk).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
+        return new BaseObjectResponse().setData(highRisk).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(highriskDesc);
     }
 
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
index 2937129..ec130a2 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
@@ -1784,6 +1784,9 @@ public class ViewFacade {
         //聊城东昌府区妇幼保健医院特有字段
         map.put("lisCheckItems", data.getLisCheckItems());
 
+        //补充高危因素
+        map.put("highriskDesc", data.getHighriskDesc());
+
         br.setErrorcode(ErrorCodeConstants.SUCCESS);
         br.setErrormsg("成功");
         br.setData(map);
@@ -2065,6 +2068,10 @@ public class ViewFacade {
         //诸城妇幼复诊特有字段 随机血糖单位mmol/L
         map.put("randomBloodSugar", StringUtils.isNotEmpty(data.getRandomBloodSugar()) ? data.getRandomBloodSugar() + UnitConstants.MMOLL : "");
 
+
+        //补充高危因素
+        map.put("highriskDesc", data.getHighriskDesc());
+
         br.setErrorcode(ErrorCodeConstants.SUCCESS);
         br.setErrormsg("成功");
         br.setData(map);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java
index 446a6d4..87483ff 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/HighScoreResult.java
@@ -21,6 +21,17 @@ public class HighScoreResult {
     //高危评分
     private Integer score = 0;
 
+    //补充高危因素
+    private String  highriskDesc;
+
+    public String getHighriskDesc() {
+        return highriskDesc;
+    }
+
+    public void setHighriskDesc(String highriskDesc) {
+        this.highriskDesc = highriskDesc;
+    }
+
     public List getHighRisk() {
         return highRisk;
     }
-- 
1.8.3.1