From 4dc4d054223b851e03b2d8c56a0b0b5c9d74bfbf Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 12 Aug 2016 09:56:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AEparentid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/operate/web/facade/PatientFacade.java    | 6 ++++++
 .../java/com/lyms/platform/operate/web/result/QuanChanResult.java   | 1 -
 2 files changed, 6 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 11cd336..e87b524 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
@@ -305,6 +305,12 @@ public class PatientFacade {
             if (CollectionUtils.isNotEmpty(withList)) {
                 chanResult.setcTimes(withList.size());
                 nextCheckTime = withList.get(0).getNextCheckTime();
+                if(StringUtils.isNotEmpty(withList.get(0).getProdDoctor())){
+                    Users users = usersService.getUsers(NumberUtils.toInt(withList.get(0).getProdDoctor()));
+                    if(null!=users){
+                        chanResult.setCheckDoctor(users.getName());
+                    }
+                }
             }
             chanResult.setNextCheckTime(nextCheckTime);
             data.add(chanResult);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
index d18d782..21595dc 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
@@ -146,7 +146,6 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
     public QuanChanResult convertToResult(Patients destModel) {
         setId(destModel.getId());
         setAge(destModel.getAge());
-        setCheckDoctor(destModel.getLastReportDoctorName());
         setName(destModel.getUsername());
         setPhone(StringUtils.encryPhone(destModel.getPhone()));
         if (null != destModel.getFmDate()) {
-- 
1.8.3.1