From 2995b3bb443971758e083d65175a5346f1cdf940 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 2 Sep 2016 10:58:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E7=97=85=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/operate/web/facade/PatientFacade.java  |  4 ++--
 .../lyms/platform/operate/web/result/QuanPatientsResult.java | 11 +++++------
 .../lyms/platform/operate/web/result/RiskPatientsResult.java | 12 +++++-------
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index 1eee6a6..73608f6 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -407,7 +407,7 @@ public class PatientFacade {
             }
             HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getPid(), true);
             quanPatientsResult.setcTime(nextCheckTime);
-            quanPatientsResult.setrLevel(highScoreResult.getLevelStr());
+            quanPatientsResult.setrLevel(highScoreResult.getLevel());
             data.add(quanPatientsResult);
         }
         return data;
@@ -482,7 +482,7 @@ public class PatientFacade {
             }
             riskPatientsResult.setcTime(nextCheckTime);
             riskPatientsResult.setrFactor(highScoreResult.gethighRiskStr());
-            riskPatientsResult.setrLevel(highScoreResult.getLevelStr());
+            riskPatientsResult.setrLevel(highScoreResult.getLevel());
             riskPatientsResult.sethScore(highScoreResult.getScore());
             data.add(riskPatientsResult);
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java
index 3639bc6..c85be50 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java
@@ -8,6 +8,8 @@ import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.pojo.Patients;
 
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 全部孕妇管理
@@ -24,7 +26,7 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
     //孕周
     private String dueWeek;
     //风险等级
-    private String rLevel;
+    private List<Map> rLevel;
 
     //产检次数
     private int cTimes;
@@ -162,14 +164,11 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
         this.phone = phone;
     }
 
-    public String getrLevel() {
-        if(org.apache.commons.lang.StringUtils.isEmpty(rLevel)){
-            return SPIT;
-        }
+    public List<Map> getrLevel() {
         return rLevel;
     }
 
-    public void setrLevel(String rLevel) {
+    public void setrLevel(List<Map> rLevel) {
         this.rLevel = rLevel;
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java
index 0323583..89b9332 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java
@@ -11,6 +11,8 @@ import com.lyms.platform.pojo.Patients;
 import com.lyms.platform.pojo.PuerperaModel;
 
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 高危孕妇管理查询
@@ -29,7 +31,7 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
     //孕周
     private String dueWeek;
     //风险等级
-    private String rLevel;
+    private List<Map> rLevel;
     //风险因素
     private String rFactor;
     //高危评分
@@ -149,14 +151,11 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
         this.rFactor = rFactor;
     }
 
-    public String getrLevel() {
-        if(org.apache.commons.lang.StringUtils.isEmpty(rLevel)){
-            return SPIT;
-        }
+    public List<Map> getrLevel() {
         return rLevel;
     }
 
-    public void setrLevel(String rLevel) {
+    public void setrLevel(List<Map> rLevel) {
         this.rLevel = rLevel;
     }
 
@@ -208,7 +207,6 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
         setId(destModel.getId());
         setName(destModel.getUsername());
         setAge(destModel.getAge());
-        setrLevel(destModel.getRiskLevelId());
 //        setrFactor(destModel.getRiskFactorId() == null ? "" : JsonUtil.array2JsonString(destModel.getRiskFactorId()));
         sethScore(destModel.getRiskScore());
         setcTime(DateUtil.getyyyy_MM_dd(destModel.getNextCheckTime()));
-- 
1.8.3.1