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 @@ org.wltea.analyzer IKAnalyzer 2012_u6 - system - - ${project.basedir}/../platform-operate-api/src/main/webapp/WEB-INF/lib/IKAnalyzer2012_u6.jar - org.apache.lucene lucene-core 3.6.0 - system - - ${project.basedir}/../platform-operate-api/src/main/webapp/WEB-INF/lib/lucene-core-3.6.0.jar - com.aspose aspose-words 15.8.0 - system - - ${project.basedir}/../platform-operate-api/src/main/webapp/WEB-INF/lib/aspose-words-15.8.0-jdk16.jar - net.java.dev.jna jna 4.4.0 - system - - ${project.basedir}/../platform-operate-api/src/main/webapp/WEB-INF/lib/jna-4.4.0.jar - @@ -603,12 +587,27 @@ fastjson 1.2.8 - +