From 9949a66ac7a785e5ca7f83248d644db9090153cb Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 9 Aug 2016 12:26:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=88=86=E5=A8=A9=E5=90=8E?=
 =?UTF-8?q?=20=E5=8F=98=E6=88=90=E4=BA=A7=E5=A6=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lyms/platform/operate/web/facade/PatientFacade.java   | 2 ++
 .../java/com/lyms/platform/operate/web/result/QuanPatientsResult.java   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

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 fd29f9a..5ce45a0 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
@@ -369,7 +369,9 @@ public class PatientFacade {
                     nextCheckTime = DateUtil.getyyyy_MM_dd(list.get(0).getNextCheckTime());
                 }
             }
+            HighScoreResult highScoreResult = antenatalExaminationFacade.findLastRisk(patients.getId(), true);
             quanPatientsResult.setcTime(nextCheckTime);
+            quanPatientsResult.setrLevel(highScoreResult.getLevelStr());
             data.add(quanPatientsResult);
         }
         return data;
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 6f0387b..945e33c 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
@@ -156,7 +156,7 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
             this.dueWeek=StringUtils.dueWeek(days);
         }
 
-        setrLevel(destModel.getRiskLevelId());
+//        setrLevel(destModel.getRiskLevelId());
         if(null!=destModel.getNextCheckTime()) {
             setcTime(DateUtil.getyyyy_MM_dd(destModel.getNextCheckTime()));
         }
-- 
1.8.3.1