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 3400984..9d2cdf5 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 @@ -314,15 +314,14 @@ public class TrackDownFacade { } /**2019-07 需求搜索条件添加*/ - if (downQueryRequest.getFmType() != null) {//分泌方式 + if (StringUtils.isNotEmpty(downQueryRequest.getFmType())) {//分泌方式 patientsQuery.setFmMode(downQueryRequest.getFmType()); isPatient = true; } - if (null != downQueryRequest.getPostpartumDays()) {//产后天数 Calendar instance = Calendar.getInstance(); instance.setTime(new Date()); - instance.add(Calendar.DATE, -downQueryRequest.getBeOverdueDays()); + instance.add(Calendar.DATE, -downQueryRequest.getPostpartumDays()); instance.set(Calendar.HOUR_OF_DAY, 23); instance.set(Calendar.MINUTE, 59); instance.set(Calendar.SECOND, 59); @@ -331,7 +330,7 @@ public class TrackDownFacade { patientsQuery.setFmDateEnd(end); instance.setTime(new Date()); - instance.add(Calendar.DATE, -downQueryRequest.getBeOverdueDays()); + instance.add(Calendar.DATE, -downQueryRequest.getPostpartumDays()); instance.set(Calendar.HOUR_OF_DAY, 00); instance.set(Calendar.MINUTE, 00); instance.set(Calendar.SECOND, 00);