From 39bdc2fe2c5b06363344e5e1bb9459966e715d45 Mon Sep 17 00:00:00 2001 From: "[wangbo]" Date: Sat, 13 Jul 2019 10:18:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E5=90=8E=E5=A4=8D?= =?UTF-8?q?=E6=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/operate/web/facade/TrackDownFacade.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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); -- 1.8.3.1