From 79cedc686323875b5a33b22fdcdf261ab44d0a2a Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 21 Jul 2016 17:04:49 +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/ReferralApplyOrderResult.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 62810d8..df53acd 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 @@ -236,9 +236,7 @@ public class ReferralApplyOrderResult { int day = (days%7); this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":""); } - if(null!=patients.getDueDate()){ - setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); - } + setCardNo(destModel.getCardNo()); setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate())); setrLevel(destModel.getrLevel()); @@ -256,7 +254,9 @@ public class ReferralApplyOrderResult { setPhone(patients.getPhone()); setRemarks(patients.getMremark()); setRiskScore("60"); - + if(null!=patients.getDueDate()){ + setyChanQi(DateUtil.getyyyy_MM_dd(patients.getDueDate())); + } int days= DateUtil.daysBetween(patients.getLastMenses(),new Date()); String week= (days/7)+""; int day = (days%7); -- 1.8.3.1