From c8adca13359b6462281ca41121651c9aebbafdd1 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 9 Dec 2016 14:56:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=B6=E4=BB=96=E9=AB=98?=
 =?UTF-8?q?=E5=8D=B1=E5=9B=A0=E7=B4=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/lyms/platform/pojo/Patients.java        |  9 +++++++++
 .../operate/web/facade/AntenatalExaminationFacade.java        |  6 ++++--
 .../com/lyms/platform/operate/web/result/HighScoreResult.java | 11 +++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
index f3da3f9..e734f3e 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/Patients.java
@@ -198,6 +198,8 @@ public class Patients extends BaseModel {
     private List<String> riskFactorId;
     //建档时高危风险id
     private List<String> firstRiskFactorId;
+    //自定义的高危因素
+    private String oRiskFactor;
     //风险等级颜色
     private String riskLevelId;
     //高危评分值
@@ -232,6 +234,13 @@ public class Patients extends BaseModel {
     //操作人
     private Integer operator;
 
+    public String getoRiskFactor() {
+        return oRiskFactor;
+    }
+
+    public void setoRiskFactor(String oRiskFactor) {
+        this.oRiskFactor = oRiskFactor;
+    }
 
     public Date getLastCTime() {
         return lastCTime;
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 e2bace7..41cfb06 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
@@ -631,7 +631,7 @@ public class AntenatalExaminationFacade {
                     Object obj = map.get("fxysu");
                     if (null != obj && !"null".equals(obj.toString()) && !"".equals(obj.toString())) {
                         map1.put("name", map.get("fxysu"));
-
+                        highScoreResult.setOtherRisk(map.get("fxysu").toString());
                         Object idObj1 = map.get("fyyse");
                         if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) {
                             BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString());
@@ -709,6 +709,7 @@ public class AntenatalExaminationFacade {
                             Object obj = map.get("fxysu");
                             if (null != obj && !"null".equals(obj.toString()) && !"".equals(obj.toString())) {
                                 map1.put("name", map.get("fxysu"));
+                                highScoreResult.setOtherRisk(map.get("fxysu").toString());
                                 Object idObj1 = map.get("fyyse");
                                 if (null != idObj1 && !"null".equals(idObj1.toString()) && !"".equals(idObj1.toString())) {
                                     BasicConfig basicConfig = basicConfigService.getOneBasicConfigById(idObj1.toString());
@@ -1559,7 +1560,8 @@ public class AntenatalExaminationFacade {
         patients1.setRiskScore(highScoreResult.getScore());
         patients1.setRiskFactorId(highScoreResult.getHighId());
         patients1.setRiskLevelId(JsonUtil.array2JsonString(highScoreResult.getLevelId()));
-
+        //设置其他的高危因素
+        patients1.setoRiskFactor(highScoreResult.getOtherRisk());
         patientsService.findAndModify(patientsQuery1, patients1);
     }
 
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 5ae666b..446a6d4 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
@@ -15,6 +15,9 @@ public class HighScoreResult {
     private List highRisk = new ArrayList();
     //风险等级颜色
     private List level = new ArrayList();
+
+    private String otherRisk;
+
     //高危评分
     private Integer score = 0;
 
@@ -26,6 +29,14 @@ public class HighScoreResult {
         return /*filter(*/level/*)*/;
     }
 
+    public String getOtherRisk() {
+        return otherRisk;
+    }
+
+    public void setOtherRisk(String otherRisk) {
+        this.otherRisk = otherRisk;
+    }
+
     public static List filter(List<java.util.Map> level){
         List list = new ArrayList();
         List addEdList  = new ArrayList();
-- 
1.8.3.1