From f61707618a0b71edf9cae31eb8196daa97a0f632 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 11 Aug 2016 17:23:46 +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

---
 .../platform/operate/web/facade/ApplyOrderFacade.java   |  1 +
 .../operate/web/result/ApplyOrderOutResult.java         | 17 +++++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
index 6ec443d..2e284e4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
@@ -95,6 +95,7 @@ public class ApplyOrderFacade {
                     referralApplyOrderModel.setName(patients.getUsername());
                     referralApplyOrderModel.setPhone(patients.getPhone());
                     referralApplyOrderModel.setSex(SexEnum.WOMAN.getId());
+                    referralApplyOrderModel.setBirth(patients.getBirth());
                     int days= DateUtil.daysBetween(new Date(),patients.getDueDate());;
                     referralApplyOrderModel.setDueWeek(com.lyms.platform.common.utils.StringUtils.dueWeek(days));
                 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java
index 6a5e293..6d88069 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java
@@ -20,7 +20,7 @@ public class ApplyOrderOutResult {
     private String id;
     //名字
     private String name;
-    private Integer age;
+    private String age;
     //转入医院
     private String transferredHospital;
     //申请孕周
@@ -106,11 +106,15 @@ public class ApplyOrderOutResult {
         this.cardNo = cardNo;
     }
 
-    public Integer getAge() {
+    public String getAge() {
+        if(StringUtils.isEmpty(cardNo)){
+            return SPIT;
+        }
+
         return age;
     }
 
-    public void setAge(Integer age) {
+    public void setAge(String age) {
         this.age = age;
     }
 
@@ -305,7 +309,12 @@ public class ApplyOrderOutResult {
         setPotentialRisk(destModel.getPotentialRisk());
         setStatus(ApplyOrderStatusEnums.getTitle(destModel.getStatus()));
         setTransferredHospital(destModel.getTransferredHospital());
-        setAge(DateUtil.getAge(destModel.getBirth()));
+        if(null!=destModel.getBirth()){
+            Integer age = DateUtil.getAge(destModel.getBirth());
+            if(null!=age){
+                setAge(age+"");
+            }
+        }
         setCardNo(destModel.getCardNo());
         setPhone(destModel.getPhone());
         return this;
-- 
1.8.3.1