diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java index e057eb9..c54245d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyManagerFacade.java @@ -54,8 +54,8 @@ public class BabyManagerFacade { PatientsQuery patientsQuery = new PatientsQuery(); patientsQuery.setType(2); patientsQuery.setYn(YnEnums.YES.getId()); - patientsQuery.setBirthEnd(babyManagerRequest.getdEnd()); - patientsQuery.setBirthStart(babyManagerRequest.getdStart()); + patientsQuery.setBirthEnd(DateUtil.parseYMD(babyManagerRequest.getdEnd())); + patientsQuery.setBirthStart(DateUtil.parseYMD(babyManagerRequest.getdStart())); patientsQuery.setVisitstatus(babyManagerRequest.getVisitstatus()); patientsQuery.setPage(babyManagerRequest.getPage()); patientsQuery.setLimit(babyManagerRequest.getLimit()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PuerperaManagerFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PuerperaManagerFacade.java index d6c8401..594111d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PuerperaManagerFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PuerperaManagerFacade.java @@ -7,6 +7,7 @@ import com.lyms.platform.common.enums.YnEnums; import com.lyms.platform.common.result.BaseListResponse; import com.lyms.platform.common.result.BaseResponse; import com.lyms.platform.common.utils.Assert; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.operate.web.request.PuerperaManagerQueryRequest; import com.lyms.platform.operate.web.request.PuerperaManagerUpdateRequest; import com.lyms.platform.operate.web.request.PuerperaMatcherCommunityRequest; @@ -71,8 +72,8 @@ public class PuerperaManagerFacade { PuerperaModelQuery puerperaQuery = new PuerperaModelQuery(); puerperaQuery.setLimit(managerRequest.getLimit()); puerperaQuery.setPage(managerRequest.getPage()); - puerperaQuery.setDueDateEnd(managerRequest.getDueDateEnd()); - puerperaQuery.setDueDateStart(managerRequest.getDueDateStart()); + puerperaQuery.setDueDateEnd(DateUtil.parseYMD(managerRequest.getDueDateEnd())); + puerperaQuery.setDueDateStart(DateUtil.parseYMD(managerRequest.getDueDateStart())); puerperaQuery.setKeyword(managerRequest.getKeyword()); puerperaQuery.setCommunityId(managerRequest.getCommunityId()); puerperaQuery.setVisitstatus(managerRequest.getVisitstatus()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerQueryRequest.java index 031a8c4..3981ce1 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/BabyManagerQueryRequest.java @@ -34,13 +34,13 @@ public class BabyManagerQueryRequest extends BasePageQueryRequest { * 生日开始 */ @FormParam("dstart") - private Date dStart; + private String dStart; /** * 生日结束 */ @FormParam("dend") - private Date dEnd; + private String dEnd; public String getKeyword() { return keyword; @@ -58,20 +58,20 @@ public class BabyManagerQueryRequest extends BasePageQueryRequest { this.visitstatus = visitstatus; } - public Date getdStart() { + public String getdStart() { return dStart; } - public void setdStart(long dStart) { - this.dStart = new Date(dStart * 1000); + public void setdStart(String dStart) { + this.dStart = dStart; } - public Date getdEnd() { + public String getdEnd() { return dEnd; } - public void setdEnd(long dEnd) { - this.dEnd = new Date(dEnd * 1000); + public void setdEnd(String dEnd) { + this.dEnd = dEnd; } public void setPage(int page) { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerQueryRequest.java index d553045..f97c99f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PuerperaManagerQueryRequest.java @@ -40,13 +40,13 @@ public class PuerperaManagerQueryRequest extends BasePageQueryRequest { * 分娩日期开始 */ @FormParam("duedatestart") - private Date dueDateStart; + private String dueDateStart; /** * 分娩日期结束 */ @FormParam("duedateend") - private Date dueDateEnd; + private String dueDateEnd; public String getCommunityId() { return communityId; @@ -72,19 +72,19 @@ public class PuerperaManagerQueryRequest extends BasePageQueryRequest { this.visitstatus = visitstatus; } - public Date getDueDateStart() { + public String getDueDateStart() { return dueDateStart; } - public void setDueDateStart(long dueDateStart) { - this.dueDateStart = new Date(dueDateStart * 1000); + public void setDueDateStart(String dueDateStart) { + this.dueDateStart =dueDateStart; } - public Date getDueDateEnd() { + public String getDueDateEnd() { return dueDateEnd; } - public void setDueDateEnd(long dueDateEnd) { - this.dueDateEnd = new Date(dueDateEnd * 1000); + public void setDueDateEnd(String dueDateEnd) { + this.dueDateEnd = dueDateEnd; } } \ No newline at end of file