jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 98d18ccf6e0904ed805b6cd5331a5666e09c3025

Authored by mengfanqiang
1 parent 173ad020aa
Exists in fengning2023-06-06

update 产后访视新增产后天数筛选条件

Showing 3 changed files with 38 additions and 18 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java View file @ 98d18cc
... ... @@ -2171,6 +2171,12 @@
2171 2171  
2172 2172  
2173 2173 matDeliverQuery.setYn(YnEnums.YES.getId());
  2174 +
  2175 + //产后天数=当前时间-分娩时间
  2176 + if(matdeliverFollowRequest.getCountDay()>0){
  2177 + matdeliverFollowRequest.setBirthDate(DateUtil.getyyyy_MM_dd_hms(DateUtil.addDay(new Date(), -matdeliverFollowRequest.getCountDay())));
  2178 + }
  2179 +
2174 2180 //分娩日期
2175 2181 if (StringUtils.isNotEmpty(matdeliverFollowRequest.getBirthDate())) {
2176 2182 matDeliverQuery.setCreatedStart(DateUtil.getSNDate(matdeliverFollowRequest.getBirthDate())[0]);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatdeliverFollowRequest.java View file @ 98d18cc
... ... @@ -8,7 +8,13 @@
8 8 * @discription 随访列查询条件
9 9 */
10 10 public class MatdeliverFollowRequest extends BasePageQueryRequest{
  11 +
11 12 /**
  13 + * 产后天数
  14 + */
  15 + private Integer countDay;
  16 +
  17 + /**
12 18 * 当前用户
13 19 */
14 20 private Integer operatorId;
... ... @@ -29,6 +35,7 @@
29 35 * 访视时间结束
30 36 */
31 37 private Date followEndDate;
  38 +
32 39 /**
33 40 * @discription 是否区域
34 41 */
... ... @@ -147,6 +154,14 @@
147 154  
148 155 //空表示查询的是原来的追访模式，即根据建档选择的访视机构来访视，1，市， 2 区
149 156 private Integer flag;
  157 +
  158 + public Integer getCountDay() {
  159 + return countDay;
  160 + }
  161 +
  162 + public void setCountDay(Integer countDay) {
  163 + this.countDay = countDay;
  164 + }
150 165  
151 166 public String getStreetPostRestId() {
152 167 return streetPostRestId;
pom.xml View file @ 98d18cc
... ... @@ -61,39 +61,23 @@
61 61 <groupId>org.wltea.analyzer</groupId>
62 62 <artifactId>IKAnalyzer</artifactId>
63 63 <version>2012_u6</version>
64   - <scope>system</scope>
65   - <systemPath>
66   - ${project.basedir}/../platform-operate-api/src/main/webapp/WEB-INF/lib/IKAnalyzer2012_u6.jar
67   - </systemPath>
68 64 </dependency>
69 65 <dependency>
70 66 <groupId>org.apache.lucene</groupId>
71 67 <artifactId>lucene-core</artifactId>
72 68 <version>3.6.0</version>
73   - <scope>system</scope>
74   - <systemPath>
75   - ${project.basedir}/../platform-operate-api/src/main/webapp/WEB-INF/lib/lucene-core-3.6.0.jar
76   - </systemPath>
77 69 </dependency>
78 70  
79 71 <dependency>
80 72 <groupId>com.aspose</groupId>
81 73 <artifactId>aspose-words</artifactId>
82 74 <version>15.8.0</version>
83   - <scope>system</scope>
84   - <systemPath>
85   - ${project.basedir}/../platform-operate-api/src/main/webapp/WEB-INF/lib/aspose-words-15.8.0-jdk16.jar
86   - </systemPath>
87 75 </dependency>
88 76  
89 77 <dependency>
90 78 <groupId>net.java.dev.jna</groupId>
91 79 <artifactId>jna</artifactId>
92 80 <version>4.4.0</version>
93   - <scope>system</scope>
94   - <systemPath>
95   - ${project.basedir}/../platform-operate-api/src/main/webapp/WEB-INF/lib/jna-4.4.0.jar
96   - </systemPath>
97 81 </dependency>
98 82  
99 83 <dependency>
100 84  
... ... @@ -603,13 +587,28 @@
603 587 <artifactId>fastjson</artifactId>
604 588 <version>1.2.8</version>
605 589 </dependency>
606   -
  590 +<!--
607 591 <dependency>
608 592 <groupId>com.aspose</groupId>
609 593 <artifactId>aspose-words</artifactId>
610 594 <version>15.8.0</version>
611 595 </dependency>
612   -
  596 + <dependency>
  597 + <groupId>org.wltea.analyzer</groupId>
  598 + <artifactId>IKAnalyzer</artifactId>
  599 + <version>2012_u6</version>
  600 + </dependency>
  601 + <dependency>
  602 + <groupId>org.apache.lucene</groupId>
  603 + <artifactId>lucene-core</artifactId>
  604 + <version>3.6.0</version>
  605 + </dependency>
  606 + <dependency>
  607 + <groupId>net.java.dev.jna</groupId>
  608 + <artifactId>jna</artifactId>
  609 + <version>4.4.0</version>
  610 + </dependency>
  611 + -->
613 612 </dependencies>
614 613 </project>