From 15687c943329e14067f4d9f0500b85c9c5c08c9b Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 9 Aug 2016 10:25:20 +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

---
 .../platform/operate/web/facade/PatientFacade.java | 37 ++++++++++++++++++----
 1 file changed, 31 insertions(+), 6 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 9021553..8d77c99 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
@@ -270,7 +270,11 @@ public class PatientFacade {
             if (StringUtils.isNotEmpty(patients.getBookbuildingDoctor())) {
                 if (NumberUtils.isNumber(patients.getBookbuildingDoctor())) {
                     Users users = usersService.getUsers(NumberUtils.toInt(patients.getBookbuildingDoctor()));
-                    chanResult.setlName(users.getName());
+                    if (null!=users) {
+                        chanResult.setlName(users.getName());
+                    }else{
+                        chanResult.setlName(patients.getBookbuildingDoctor());
+                    }
                 } else {
                     chanResult.setlName(patients.getBookbuildingDoctor());
                 }
@@ -278,7 +282,11 @@ public class PatientFacade {
             if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) {
                 if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) {
                     Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId()));
-                    chanResult.setCheckDoctor(users.getName());
+                    if(null!=users){
+                        chanResult.setCheckDoctor(users.getName());
+                    }else{
+                        chanResult.setCheckDoctor(patients.getLastCheckEmployeeId());
+                    }
                 } else {
                     chanResult.setCheckDoctor(patients.getLastCheckEmployeeId());
                 }
@@ -320,7 +328,12 @@ public class PatientFacade {
             if (StringUtils.isNotEmpty(patients.getBookbuildingDoctor())) {
                 if (NumberUtils.isNumber(patients.getBookbuildingDoctor())) {
                     Users users = usersService.getUsers(NumberUtils.toInt(patients.getBookbuildingDoctor()));
-                    quanPatientsResult.setlName(users.getName());
+                    if(null!=users){
+                        quanPatientsResult.setlName(users.getName());
+                    }else{
+                        quanPatientsResult.setlName(patients.getBookbuildingDoctor());
+                    }
+
                 } else {
                     quanPatientsResult.setlName(patients.getBookbuildingDoctor());
                 }
@@ -328,7 +341,11 @@ public class PatientFacade {
             if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) {
                 if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) {
                     Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId()));
-                    quanPatientsResult.setCheckDoctor(users.getName());
+                    if(null!=users){
+                        quanPatientsResult.setCheckDoctor(users.getName());
+                    }else{
+                        quanPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId());
+                    }
                 } else {
                     quanPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId());
                 }
@@ -372,7 +389,11 @@ public class PatientFacade {
             if (StringUtils.isNotEmpty(patients.getBookbuildingDoctor())) {
                 if (NumberUtils.isNumber(patients.getBookbuildingDoctor())) {
                     Users users = usersService.getUsers(NumberUtils.toInt(patients.getBookbuildingDoctor()));
-                    riskPatientsResult.setlName(users.getName());
+                    if(null!=users){
+                        riskPatientsResult.setlName(users.getName());
+                    }else{
+                        riskPatientsResult.setlName(patients.getBookbuildingDoctor());
+                    }
                 } else {
                     riskPatientsResult.setlName(patients.getBookbuildingDoctor());
                 }
@@ -380,7 +401,11 @@ public class PatientFacade {
             if (StringUtils.isNotEmpty(patients.getLastCheckEmployeeId())) {
                 if (NumberUtils.isNumber(patients.getLastCheckEmployeeId())) {
                     Users users = usersService.getUsers(NumberUtils.toInt(patients.getLastCheckEmployeeId()));
-                    riskPatientsResult.setCheckDoctor(users.getName());
+                    if(null!=users){
+                        riskPatientsResult.setCheckDoctor(users.getName());
+                    }else{
+                        riskPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId());
+                    }
                 } else {
                     riskPatientsResult.setCheckDoctor(patients.getLastCheckEmployeeId());
                 }
-- 
1.8.3.1