From 98d18ccf6e0904ed805b6cd5331a5666e09c3025 Mon Sep 17 00:00:00 2001
From: mengfanqiang <402653474@qq.com>
Date: Tue, 6 Jun 2023 17:36:15 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BA=A7=E5=90=8E=E8=AE=BF=E8=A7=86?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=BA=A7=E5=90=8E=E5=A4=A9=E6=95=B0=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/MatDeliverFacade.java       |  6 ++++
 .../web/request/MatdeliverFollowRequest.java       | 15 ++++++++++
 pom.xml                                            | 35 +++++++++++-----------
 3 files changed, 38 insertions(+), 18 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index b30dde4..b4908df 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -2171,6 +2171,12 @@ public class MatDeliverFacade {
 
 
         matDeliverQuery.setYn(YnEnums.YES.getId());
+
+        //产后天数=当前时间-分娩时间
+        if(matdeliverFollowRequest.getCountDay()>0){
+            matdeliverFollowRequest.setBirthDate(DateUtil.getyyyy_MM_dd_hms(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getCountDay())));
+        }
+
         //分娩日期
         if (StringUtils.isNotEmpty(matdeliverFollowRequest.getBirthDate())) {
             matDeliverQuery.setCreatedStart(DateUtil.getSNDate(matdeliverFollowRequest.getBirthDate())[0]);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java
index e02df5f..e6992c1 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java
@@ -8,6 +8,12 @@ import java.util.Date;
  * @discription 随访列查询条件
  */
 public class MatdeliverFollowRequest extends BasePageQueryRequest{
+
+    /**
+     * 产后天数
+     */
+    private Integer countDay;
+
     /**
      * 当前用户
      */
@@ -29,6 +35,7 @@ public class MatdeliverFollowRequest extends BasePageQueryRequest{
      * 访视时间结束
      */
     private Date followEndDate;
+
     /**
      * @discription 是否区域
      */
@@ -148,6 +155,14 @@ public class MatdeliverFollowRequest extends BasePageQueryRequest{
     //空表示查询的是原来的追访模式，即根据建档选择的访视机构来访视，1，市， 2 区
     private Integer flag;
 
+    public Integer getCountDay() {
+        return countDay;
+    }
+
+    public void setCountDay(Integer countDay) {
+        this.countDay = countDay;
+    }
+
     public String getStreetPostRestId() {
         return streetPostRestId;
     }
diff --git a/pom.xml b/pom.xml
index 67d6827..27e35b4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -61,39 +61,23 @@
                 <groupId>org.wltea.analyzer</groupId>
                 <artifactId>IKAnalyzer</artifactId>
                 <version>2012_u6</version>
-                <scope>system</scope>
-                <systemPath>
-                    ${project.basedir}/../platform-operate-api/src/main/webapp/WEB-INF/lib/IKAnalyzer2012_u6.jar
-                </systemPath>
             </dependency>
             <dependency>
                 <groupId>org.apache.lucene</groupId>
                 <artifactId>lucene-core</artifactId>
                 <version>3.6.0</version>
-                <scope>system</scope>
-                <systemPath>
-                    ${project.basedir}/../platform-operate-api/src/main/webapp/WEB-INF/lib/lucene-core-3.6.0.jar
-                </systemPath>
             </dependency>
 
             <dependency>
                 <groupId>com.aspose</groupId>
                 <artifactId>aspose-words</artifactId>
                 <version>15.8.0</version>
-                <scope>system</scope>
-                <systemPath>
-                    ${project.basedir}/../platform-operate-api/src/main/webapp/WEB-INF/lib/aspose-words-15.8.0-jdk16.jar
-                </systemPath>
             </dependency>
 
             <dependency>
                 <groupId>net.java.dev.jna</groupId>
                 <artifactId>jna</artifactId>
                 <version>4.4.0</version>
-                <scope>system</scope>
-                <systemPath>
-                    ${project.basedir}/../platform-operate-api/src/main/webapp/WEB-INF/lib/jna-4.4.0.jar
-                </systemPath>
             </dependency>
 
             <dependency>
@@ -603,12 +587,27 @@
             <artifactId>fastjson</artifactId>
             <version>1.2.8</version>
         </dependency>
-
+<!--
          <dependency>
             <groupId>com.aspose</groupId>
             <artifactId>aspose-words</artifactId>
             <version>15.8.0</version>
         </dependency>
-
+        <dependency>
+            <groupId>org.wltea.analyzer</groupId>
+            <artifactId>IKAnalyzer</artifactId>
+            <version>2012_u6</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.lucene</groupId>
+            <artifactId>lucene-core</artifactId>
+            <version>3.6.0</version>
+        </dependency>
+        <dependency>
+            <groupId>net.java.dev.jna</groupId>
+            <artifactId>jna</artifactId>
+            <version>4.4.0</version>
+        </dependency>
+        -->
     </dependencies>
 </project>
-- 
1.8.3.1