From 0a9c6e1eec55285d208e020e2c70cfeadb905402 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 5 Feb 2018 09:14:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BF=AB=E9=80=9F=E6=B5=8B=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/common/utils/DateUtil.java | 6 ++++-- .../main/java/com/lyms/platform/msg/remote/AmsMessageService.java | 6 +++--- .../com/lyms/platform/operate/web/facade/MeasureInfoFacade.java | 3 ++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index da5960d..8f6a3c5 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -1471,8 +1471,10 @@ public class DateUtil { System.out.println(date.getTime());*/ - Date date = parseDate("2018-01-05"); - System.out.println(date.getTime()); +// Date baby = parseDate("2018-02-01"); +// int weeks = daysBetween(baby, new Date()) / 7; +// String weekAge = String.valueOf(weeks); +// System.out.print(weekAge); } } diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java index e311650..ae64bf3 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/remote/AmsMessageService.java @@ -154,9 +154,9 @@ public class AmsMessageService { } public static void main(String[] args) { - Map> list = getMessageTemplateMap("1000000126", - AmsServiceTypeEnum.YUN_GUIDE); - List msgs = list.get("年龄≥35岁"); + Map> list = getMessageTemplateMap("204", + AmsServiceTypeEnum.CHILD_GUIDE); + List msgs = list.get("0周"); System.out.println(list); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java index 32d4e28..f0a210e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MeasureInfoFacade.java @@ -124,7 +124,7 @@ public class MeasureInfoFacade { result.setCertNo(model.getMeasureUserInfoModel().getCertNo()); result.setHospitalId(model.getMeasureUserInfoModel().getHospitalId()); result.setRecordCount(model.getRecordCount()); - result.setRecordTime(DateUtil.getyyyy_MM_dd(model.getCreated())); + result.setRecordTime(DateUtil.getyyyy_MM_dd(model.getModified())); result.setSex(SexEnum.getTextById(model.getMeasureUserInfoModel().getSex())); result.setAge(model.getMeasureUserInfoModel().getAge() == null ? "--" : String.valueOf(model.getMeasureUserInfoModel().getAge())); result.setValueOne(model.getValueOne()); @@ -495,6 +495,7 @@ public class MeasureInfoFacade { if (CollectionUtils.isNotEmpty(models)) { MeasureUserInfoModel userInfoModel = models.get(0); + result.setUserName(userInfoModel.getUserName()); result.setCertNo(userInfoModel.getCertNo()); result.setCertType(userInfoModel.getCertType()); result.setAge(userInfoModel.getAge()); -- 1.8.3.1