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 7ffd71b..ca69878 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 @@ -925,9 +925,9 @@ public class MatDeliverFacade { PatientsQuery patientsQuery = new PatientsQuery(); - if (StringUtils.isNotEmpty(childbirthManagerRequest.getDate())) { - patientsQuery.setBirthStart(DateUtil.getSNDate(childbirthManagerRequest.getDate())[0]); - patientsQuery.setBirthEnd(DateUtil.getSNDate(childbirthManagerRequest.getDate())[1]); + if (StringUtils.isNotEmpty(childbirthManagerRequest.getBirthDate())) { + patientsQuery.setBirthStart(DateUtil.getSNDate(childbirthManagerRequest.getBirthDate())[0]); + patientsQuery.setBirthEnd(DateUtil.getSNDate(childbirthManagerRequest.getBirthDate())[1]); } patientsQuery.setName(childbirthManagerRequest.getUserName()); @@ -1172,9 +1172,9 @@ public class MatDeliverFacade { BabyModelQuery babyModelQuery = new BabyModelQuery(); babyModelQuery.setYn(YnEnums.YES.getId()); babyModelQuery.setQueryNo(newBabyManagerRequest.getQueryNo()); - if (StringUtils.isNotEmpty(newBabyManagerRequest.getDate())) { - babyModelQuery.setBirthStart(DateUtil.getSNDate(newBabyManagerRequest.getDate())[0]); - babyModelQuery.setBirthEnd(DateUtil.getSNDate(newBabyManagerRequest.getDate())[1]); + if (StringUtils.isNotEmpty(newBabyManagerRequest.getBirthDate())) { + babyModelQuery.setBirthStart(DateUtil.getSNDate(newBabyManagerRequest.getBirthDate())[0]); + babyModelQuery.setBirthEnd(DateUtil.getSNDate(newBabyManagerRequest.getBirthDate())[1]); } babyModelQuery.setDueType(newBabyManagerRequest.getDueType()); babyModelQuery.setPage(newBabyManagerRequest.getPage()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java index 90486fe..6ab7274 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ChildbirthManagerRequest.java @@ -33,7 +33,7 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { * @createTime 2016年12月13日 17时13分 * @discription 分娩日期 */ - private String date; + private String birthDate; /** * @auther HuJiaqi @@ -77,12 +77,12 @@ public class ChildbirthManagerRequest extends BasePageQueryRequest { this.phone = phone; } - public String getDate() { - return date; + public String getBirthDate() { + return birthDate; } - public void setDate(String date) { - this.date = date; + public void setBirthDate(String birthDate) { + this.birthDate = birthDate; } public String getDeliveryMode() { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java index 154b685..c629b87 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/NewBabyManagerRequest.java @@ -19,7 +19,7 @@ public class NewBabyManagerRequest extends BasePageQueryRequest { * @createTime 2016年12月13日 16时54分 * @discription 分娩日期 */ - private String date; + private String birthDate; /** * @auther HuJiaqi @@ -40,12 +40,12 @@ public class NewBabyManagerRequest extends BasePageQueryRequest { this.queryNo = queryNo; } - public String getDate() { - return date; + public String getBirthDate() { + return birthDate; } - public void setDate(String date) { - this.date = date; + public void setBirthDate(String birthDate) { + this.birthDate = birthDate; } public String getDueType() {