From 2090a69cb9ea93821d9ed6f8c4a0e4b64fd7b78b Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 25 Mar 2020 13:44:35 +0800 Subject: [PATCH] update --- .../lyms/platform/operate/web/facade/AntExRecordFacade.java | 11 +++++++++++ .../lyms/platform/operate/web/facade/HealthChargeFacade.java | 3 ++- .../operate/web/request/AntExManagerQueryRequest.java | 10 ++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index 15870f5..63a9a3d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -165,6 +165,17 @@ public class AntExRecordFacade { antExRecordQuery.setCheckTimeEnd(DateUtil.parseYMD(dates[1])); } } + + //预约产检日期 + if (StringUtils.isNotEmpty(antExManagerQueryRequest.getNextTime())) { + String nextTimestr = antExManagerQueryRequest.getNextTime(); + String[] dates = nextTimestr.split(" - "); + antExRecordQuery.setNextCheckTimeStart(DateUtil.parseYMD(dates[0])); + if (dates.length == 2) { + antExRecordQuery.setNextCheckTimeEnd(DateUtil.parseYMD(dates[1])); + } + } + //建档日期 if (org.apache.commons.lang.StringUtils.isNotEmpty(antExManagerQueryRequest.getbTime())) { String nextDateStr = antExManagerQueryRequest.getbTime(); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java index d58a98f..e0e37b7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/HealthChargeFacade.java @@ -273,7 +273,8 @@ public class HealthChargeFacade { return null; } map.put("userName",babyModel.getName()); - map.put("age", DateUtil.getBabyMonthAge(babyModel.getBirth(), model.getCreated())); + map.put("age", DateUtil.getBabyMonthAge(babyModel.getBirth(), new Date())); + map.put("checkMonth", DateUtil.getBabyMonthAge(babyModel.getBirth(), model.getCreated())); } else { diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java index f742040..2c8f19c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExManagerQueryRequest.java @@ -94,6 +94,16 @@ public class AntExManagerQueryRequest extends BasePageQueryRequest { private boolean isCurrent; + private String nextTime; + + public String getNextTime() { + return nextTime; + } + + public void setNextTime(String nextTime) { + this.nextTime = nextTime; + } + public boolean isCurrent() { return isCurrent; } -- 1.8.3.1