From f15be8ab2ad4d37f88cbfd576a58b9ac22ffc82c Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 27 Jun 2016 10:37:32 +0800 Subject: [PATCH] 1 --- .../lyms/platform/operate/web/result/MatDeliverListResult.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java index 966dee2..41eec58 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java @@ -7,6 +7,7 @@ import com.lyms.platform.pojo.Patients; import org.apache.commons.collections.CollectionUtils; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -51,9 +52,12 @@ public class MatDeliverListResult { } setName(patients.getUsername()); setPhone(patients.getPhone()); - setRemarks("产妇备注"); + setRemarks(patients.getMremark()); setRiskScore("60"); - setDueWeek(""); + int days= DateUtil.daysBetween(patients.getLastMenses(),new Date()); + String week= (days/7)+""; + int day = (days%7); + this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":""); if(CollectionUtils.isNotEmpty(destList)){ List list = new ArrayList<>(); for(MaternalDeliverModel model:destList){ -- 1.8.3.1