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 4fd926f..5185828 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 @@ -354,15 +354,15 @@ public class TrackDownFacade { isPatient = true; } - if (downQueryRequest.getStartNextCheckTime() != null) {//下次产检开始日期 - patientsQuery.setNextCheckTimeStart(downQueryRequest.getStartNextCheckTime()); - isPatient = true; - } - - if (downQueryRequest.getEndNextCheckTime() != null) {//下次产检结束日期 - patientsQuery.setNextCheckTimeEnd(downQueryRequest.getEndNextCheckTime()); - isPatient = true; - } +// if (downQueryRequest.getStartNextCheckTime() != null) {//下次产检开始日期 +// patientsQuery.setNextCheckTimeStart(downQueryRequest.getStartNextCheckTime()); +// isPatient = true; +// } +// +// if (downQueryRequest.getEndNextCheckTime() != null) {//下次产检结束日期 +// patientsQuery.setNextCheckTimeEnd(downQueryRequest.getEndNextCheckTime()); +// isPatient = true; +// } /**2019-07 需求搜索条件添加*/ if (StringUtils.isNotEmpty(downQueryRequest.getFmType())) {//分泌方式 @@ -652,6 +652,15 @@ public class TrackDownFacade { downRecordQuery.setHospitalId(hospitalId); + + if (downQueryRequest.getStartNextCheckTime() != null) {//下次产检开始日期 + downRecordQuery.setNextCheckTimeStart(downQueryRequest.getStartNextCheckTime()); + } + + if (downQueryRequest.getEndNextCheckTime() != null) {//下次产检结束日期 + downRecordQuery.setNextCheckTimeEnd(downQueryRequest.getEndNextCheckTime()); + } + return downRecordQuery; }