From b10f9273c5f50815fad8933315a7db84a0b69d20 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 29 Aug 2016 11:33:45 +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

---
 .../operate/web/result/AntexListResult.java        | 58 ++++++++++++----------
 1 file changed, 31 insertions(+), 27 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
index 259e767..9a86b5f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java
@@ -182,39 +182,43 @@ public class AntexListResult {
     }
 
     public AntexListResult convertToResult(List<AntenatalExaminationModel> destModel, Patients patients, List<AntExChuModel> antExChuModel) {
-        setId(patients.getId());
-        try {
-            if (null != patients.getBirth()) {
-                setAge(DateUtil.getAge(patients.getBirth()));
-                setBirth(DateUtil.getyyyy_MM_dd(patients.getBirth()));
+        if(null!=patients){
+            setId(patients.getId());
+            try {
+                if (null != patients.getBirth()) {
+                    setAge(DateUtil.getAge(patients.getBirth()));
+                    setBirth(DateUtil.getyyyy_MM_dd(patients.getBirth()));
+                }
+
+            } catch (Exception e) {
+            }
+            if (null != patients.getDueDate()) {
+                setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate()));
+            }
+            setBuildTime(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate()));
+            setName(patients.getUsername());
+            setPhone(patients.getPhone());
+            setRemarks(patients.getMremark());
+            setCardNo(patients.getCardNo());
+
+            setVcCardNo(patients.getVcCardNo());
+            if (null!=patients.getDueStatus() && 1 == patients.getDueStatus()) {
+                this.dueWeek = "终止妊娠";
+            } else if (3 == patients.getType()) {
+                this.dueWeek = "已分娩";
+            } else {
+                if (null != patients.getLastMenses()) {
+                    int days = DateUtil.daysBetween(patients.getLastMenses(), new Date());
+                    this.dueWeek = StringUtils.dueWeek(days);
+                }
             }
 
-        } catch (Exception e) {
-        }
-        if (null != patients.getDueDate()) {
-            setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate()));
-        }
-        setBuildTime(DateUtil.getyyyy_MM_dd(patients.getBookbuildingDate()));
-        setName(patients.getUsername());
-        setPhone(patients.getPhone());
-        setRemarks(patients.getMremark());
-        setCardNo(patients.getCardNo());
-
-        setVcCardNo(patients.getVcCardNo());
-        if (null!=patients.getDueStatus() && 1 == patients.getDueStatus()) {
-            this.dueWeek = "终止妊娠";
-        } else if (3 == patients.getType()) {
-            this.dueWeek = "已分娩";
-        } else {
             if (null != patients.getLastMenses()) {
-                int days = DateUtil.daysBetween(patients.getLastMenses(), new Date());
-                this.dueWeek = StringUtils.dueWeek(days);
+                setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
             }
         }
 
-        if (null != patients.getLastMenses()) {
-            setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses()));
-        }
+
         return this;
     }
 
-- 
1.8.3.1