From a6923e47e2cead0766c3bf8cd678496275bd6b4c Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Sun, 10 Jul 2016 16:03:28 +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 --- .../web/result/ReferralApplyOrderResult.java | 36 ++++++++++++---------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java index f6ab3ae..b2eb3b4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ReferralApplyOrderResult.java @@ -221,24 +221,28 @@ public class ReferralApplyOrderResult { setTransferMode(destModel.getTransferMode()); setApplyDoctor(destModel.getApplyDoctor()); - try { - if(null!=patients.getBirth()){ - setAge(DateUtil.getAge(patients.getBirth())); + + if(null!=patients){ + setName(patients.getUsername()); + setPhone(patients.getPhone()); + setRemarks(patients.getMremark()); + setRiskScore("60"); + + int days= DateUtil.daysBetween(patients.getLastMenses(),new Date()); + String week= (days/7)+""; + int day = (days%7); + this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":""); + if(null!=patients.getLastMenses()){ + setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses())); + } + try { + if(null!=patients.getBirth()){ + setAge(DateUtil.getAge(patients.getBirth())); + } + }catch (Exception e){ } - }catch (Exception e){ - } - setName(patients.getUsername()); - setPhone(patients.getPhone()); - setRemarks(patients.getMremark()); - setRiskScore("60"); - - int days= DateUtil.daysBetween(patients.getLastMenses(),new Date()); - String week= (days/7)+""; - int day = (days%7); - this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":""); - if(null!=patients.getLastMenses()){ - setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses())); } + return this; } -- 1.8.3.1