shiyang / regional-platform

Download as
Browse Code »

Commit 64ab8eb35344b2deaad8225b87f97f39ba5b7c2b

Authored by jiangjiazhi
1 parent d862c836d4
Exists in master and in 1 other branch nobuildprocess

修改产检删除

Showing 1 changed file with 3 additions and 2 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java View file @ 64ab8eb
... ... @@ -3,6 +3,7 @@
3 3 import com.lyms.platform.common.core.annotation.form.Form;
4 4 import com.lyms.platform.common.core.annotation.form.FormParam;
5 5 import com.lyms.platform.common.utils.DateUtil;
  6 +import com.lyms.platform.common.utils.StringUtils;
6 7 import org.apache.commons.lang.math.NumberUtils;
7 8  
8 9 import java.util.Date;
... ... @@ -302,7 +303,7 @@
302 303 }
303 304  
304 305 public Date capStart() {
305   - if (null != startDueWeek) {
  306 + if (StringUtils.isNotEmpty(startDueWeek) ) {
306 307 int start = NumberUtils.toInt(startDueWeek, 0);
307 308 Date endDate = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(start*7));
308 309 return endDate;
... ... @@ -311,7 +312,7 @@
311 312 }
312 313  
313 314 public Date capEnd() {
314   - if (null != endDueWeek) {
  315 + if (StringUtils.isNotEmpty(endDueWeek)) {
315 316 int end = NumberUtils.toInt(endDueWeek, 0);
316 317 Date endDate = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(end*7)-6);
317 318 return endDate;