diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java index c14591a..3176443 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java @@ -419,13 +419,13 @@ public class TrackDownFacade { downRecordQuery.setFoundStart(downQueryRequest.getFoundDateStart()); downRecordQuery.setFoundEnd(downQueryRequest.getFoundDateEnd()); //预约追访时间 - downRecordQuery.setAppointmentDateStart(downQueryRequest.getAppointmentDateStart()); - downRecordQuery.setAppointmentDateEnd(downQueryRequest.getAppointmentDateEnd()); + downRecordQuery.setAppointmentDateStart(DateUtil.parseYMD(downQueryRequest.getAppointmentDateStart())); + downRecordQuery.setAppointmentDateEnd(DateUtil.parseYMD(downQueryRequest.getAppointmentDateEnd()) ); //追访状态 downRecordQuery.setFollowupStatus(downQueryRequest.getFollowupStatus()); //追访时间 - downRecordQuery.setTrackDownDateStart(downQueryRequest.getTrackDownDateStart()); - downRecordQuery.setTrackDownDateEnd(downQueryRequest.getTrackDownDateEnd()); + downRecordQuery.setTrackDownDateStart(DateUtil.parseYMD(downQueryRequest.getTrackDownDateStart())); + downRecordQuery.setTrackDownDateEnd(DateUtil.parseYMD(downQueryRequest.getTrackDownDateEnd())); //逾期天数 if (null != downQueryRequest.getBeOverdueDays()) { @@ -816,7 +816,7 @@ public class TrackDownFacade { // 预约时间 temp.put("yyTime", trackDown == null ? "--" : DateUtil.getyyyy_MM_dd(downRecord.getAppointmentDate())); //孕妇建档日期 - temp.put("womanCreatedTime",downRecord.getCreated()); + temp.put("womanCreatedTime", downRecord.getCreated()); return temp; } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java index b74c2c4..754b166 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveAddRequest.java @@ -191,6 +191,8 @@ public class ResidentsArchiveAddRequest implements IBasicRequestConvert