From 17a24c6fb76b18c7891df31d1f1125e2622265f1 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 15 Sep 2022 08:57:15 +0800
Subject: [PATCH] =?UTF-8?q?=E8=82=8C=E8=90=8E=E7=BC=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lyms/platform/common/utils/DateUtil.java    |  2 +-
 .../java/com/lyms/platform/operate/web/facade/SmnFacade.java  |  2 ++
 .../java/com/lyms/platform/operate/web/result/SmnResult.java  | 11 ++++++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
index 221843e..24f84ca 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java
@@ -1357,7 +1357,7 @@ public class DateUtil {
      */
     public static String getWeekDesc(Date start, Date end) {
         if (start == null || end == null) {
-            return "孕0周+0天";
+            return "-";
         }
         Integer betweenDay = DateUtil.getDays(start, end);
         Integer week = betweenDay / 7;
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java
index d9f337c..f9cf835 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java
@@ -203,6 +203,8 @@ public class SmnFacade {
             {
                 SmnResult re = new SmnResult();
                 BeanUtils.copyProperties(model, re);
+
+                re.setApplyWeek(DateUtil.getWeekDesc(model.getLastMenses(),model.getSendDate()));
                 re.setAddressRegisterStr(CommonsHelper.getResidence(model.getProvinceRegisterId(),
                         model.getCityRegisterId(),
                         model.getAreaRegisterId(),
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmnResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmnResult.java
index d6dd1be..7502a6b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmnResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SmnResult.java
@@ -7,7 +7,16 @@ import com.lyms.platform.pojo.SmnModel;
 public class SmnResult extends SmnModel {
 
 
-    private String addressRegisterStr;
+    private String addressRegisterStr; //居住地址
+    private String applyWeek; //申请孕周
+
+    public String getApplyWeek() {
+        return applyWeek;
+    }
+
+    public void setApplyWeek(String applyWeek) {
+        this.applyWeek = applyWeek;
+    }
 
     public String getAddressRegisterStr() {
         return addressRegisterStr;
-- 
1.8.3.1