From 669be8fbdc2c3ccbb3d51dcfd75b0f63273494f6 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 2 Nov 2022 11:30:12 +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/operate/web/facade/SmnFacade.java | 1 +
 .../main/java/com/lyms/platform/operate/web/result/SmnResult.java | 8 ++++++++
 2 files changed, 9 insertions(+)

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 f881ddb..0ac4db6 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
@@ -348,6 +348,7 @@ public class SmnFacade {
                 re.setSendHospital(organizationService.getOrganizationName(model.getSendHospitalId()));
                 re.setApplyWeek(DateUtil.getWeekDesc(model.getLastMenses(),model.getSendDate()));
                 re.setCurrentWeek(DateUtil.getWeekDesc(model.getLastMenses(),new Date()));
+                re.setCurrentWeekInt(DateUtil.getWeek(model.getLastMenses(),new Date()));
                 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 3eac612..2151a93 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
@@ -10,11 +10,19 @@ public class SmnResult extends SmnModel {
     private String addressRegisterStr; //居住地址
     private String applyWeek; //申请孕周
     private String currentWeek; //当前孕周
+    private Integer currentWeekInt; //当前孕周数字
     private String pnationStr; //民族
     private String sendHospital;//送检医院
     private String reviceDateStr;//接收时间
     private String ysfDateStr;//应随访日期
 
+    public Integer getCurrentWeekInt() {
+        return currentWeekInt;
+    }
+
+    public void setCurrentWeekInt(Integer currentWeekInt) {
+        this.currentWeekInt = currentWeekInt;
+    }
 
     public String getYsfDateStr() {
         return ysfDateStr;
-- 
1.8.3.1