From 974c42243c5f771870e1f54090bbbf30b259c4f9 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Tue, 12 Jul 2016 10:18:23 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E9=80=9A?=
 =?UTF-8?q?=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/result/QuanPatientsResult.java     | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

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 bee07dc..45df600 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
@@ -141,12 +141,19 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
         setAge(destModel.getAge());
         setDueWeek("孕周");
         setrLevel(destModel.getRiskLevelId());
-        setcTime(DateUtil.getyyyy_MM_dd(destModel.getNextCheckTime()));
-        setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate()));
+        if(null!=destModel.getNextCheckTime()) {
+            setcTime(DateUtil.getyyyy_MM_dd(destModel.getNextCheckTime()));
+        }
+        if(null!=destModel.getDueDate()){
+
+            setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate()));
+        }
         setPhone(destModel.getPhone());
         setCheckDoctor(destModel.getLastReportDoctorName());
         setlName("登记人");
-        setServiceType(ServiceTypeEnums.getTitleById(destModel.getServiceType()));
+        if(null!=destModel.getServiceType()){
+            setServiceType(ServiceTypeEnums.getTitleById(destModel.getServiceType()));
+        }
         return this;
     }
 }
-- 
1.8.3.1