From 7c4f4500201e2ac9df3d7f15f7b4a4d75de8dc03 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Tue, 9 Aug 2016 11:22:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=88=86=E5=A8=A9=E5=90=8E?= =?UTF-8?q?=20=E5=8F=98=E6=88=90=E4=BA=A7=E5=A6=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/result/PatientBaseResult.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java index 83ad7bb..a4e52b3 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatientBaseResult.java @@ -1,6 +1,7 @@ package com.lyms.platform.operate.web.result; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.StringUtils; import com.lyms.platform.pojo.Patients; import java.util.Date; @@ -95,6 +96,9 @@ public class PatientBaseResult { } public String getRiskScore() { + if(null==riskScore){ + return "0"; + } return riskScore; } @@ -128,9 +132,7 @@ public class PatientBaseResult { if(null!=patients.getLastMenses()){ setLastMenses(DateUtil.getyyyy_MM_dd(patients.getLastMenses())); int days= DateUtil.daysBetween(patients.getLastMenses(),new Date()); - String week= (days/7)+""; - int day = (days%7); - this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":""); + this.dueWeek=StringUtils.dueWeek(days); } return this; } -- 1.8.3.1