From 6b63a20f0a35798f0ee8a3bd5a1457da630014b1 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 28 Dec 2016 17:13:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E6=A3=80=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/result/SieveListResult.java   | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java
index e2420dc..22cced0 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java
@@ -23,6 +23,17 @@ public class SieveListResult implements IBasicResultConvert<SieveListResult, Sie
     private String age;
     //当前孕周
     private String cDueWeek;
+    //当前孕周
+    private String cDueWeek2;
+
+    public String getcDueWeek2() {
+        return cDueWeek2;
+    }
+
+    public void setcDueWeek2(String cDueWeek2) {
+        this.cDueWeek2 = cDueWeek2;
+    }
+
     //胎数
     private String tireNumber=SPIT;
 
@@ -274,6 +285,13 @@ public class SieveListResult implements IBasicResultConvert<SieveListResult, Sie
         if(null!=destModel.getLastMenses()){
             int days= DateUtil.daysBetween(destModel.getLastMenses(), new Date());
             this.cDueWeek= StringUtils.dueWeek(days);
+
+
+
+            int week = (days / 7);
+            String    str = week + "周";
+            int day = (days % 7);
+             this.cDueWeek2="孕" + str + (day > 0 ? "+" + day + "天" : "");
         }
         if(null!=destModel.getTireNumber()){
             setTireNumber(TaiShuEnums.getTitle(destModel.getTireNumber() + ""));
-- 
1.8.3.1