diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java index 7fda681..bef9e2c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/RiskPatientsQueryRequest.java @@ -3,6 +3,7 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.core.annotation.form.Form; import com.lyms.platform.common.core.annotation.form.FormParam; import com.lyms.platform.common.utils.DateUtil; +import com.lyms.platform.common.utils.StringUtils; import org.apache.commons.lang.math.NumberUtils; import java.util.Date; @@ -302,7 +303,7 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { } public Date capStart() { - if (null != startDueWeek) { + if (StringUtils.isNotEmpty(startDueWeek) ) { int start = NumberUtils.toInt(startDueWeek, 0); Date endDate = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(start*7)); return endDate; @@ -311,7 +312,7 @@ public class RiskPatientsQueryRequest extends BasePageQueryRequest { } public Date capEnd() { - if (null != endDueWeek) { + if (StringUtils.isNotEmpty(endDueWeek)) { int end = NumberUtils.toInt(endDueWeek, 0); Date endDate = DateUtil.addDay(DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(new Date())), -(end*7)-6); return endDate;