From 7f98b76662a24090a530db81e625419dc2402971 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 10 May 2022 10:46:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E8=A1=80=E5=8E=8B=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= 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 | 5 +++++ .../operate/web/service/impl/TemporaryBloodServiceImpl.java | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) 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 feb8d8b..5d66a05 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 @@ -1735,6 +1735,11 @@ public class DateUtil { } public static void main(String[] args) { + + Date startDate = DateUtil.parseYMDHMS(DateUtil.getyyyy_MM_dd( DateUtil.addDay(new Date(), -3)) + " 00:00:00"); + Date endDate = DateUtil.addDay(new Date(), 1); + System.out.println(getyyyy_MM_dd_hms(startDate)); + System.out.println(getyyyy_MM_dd_hms(endDate)); // // Date bir = parseYMD("2021-05-29"); // int i = DateUtil.getBabyAgeMonth(bir, new Date()); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java index 0cb1412..ca002cb 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TemporaryBloodServiceImpl.java @@ -292,10 +292,17 @@ public class TemporaryBloodServiceImpl extends BaseServiceImpl implements ITempo paMap.put("username", temporaryUser.getUserName()); paMap.put("phone", temporaryUser.getPhone()); paMap.put("age", DateUtil.getAge(temporaryUser.getBirth())); - //paMap.put("dueDate", DateUtil.getyyyy_MM_dd(bloodModel.getDueDate())); + paMap.put("dueDate", DateUtil.getyyyy_MM_dd(DateUtil.addDay(DateUtil.addMonth(temporaryUser.getLastMenses(),9),7))); paMap.put("height", temporaryUser.getBeforeHeight()); paMap.put("beforWeight", temporaryUser.getBeforeWeight()); paMap.put("weeks", weeks); + + paMap.put("pulse", temporaryBloo.getPulse()); + paMap.put("ssy", temporaryBloo.getSsy()); + paMap.put("szy", temporaryBloo.getSzy()); + paMap.put("checkDate", DateUtil.getyyyy_MM_dd(temporaryBloo.getCreated())); + + datas.put("userInfo", paMap); Double bmiD = Double.valueOf(patientWeightService.getBmi(weight, height)).doubleValue(); String bmiStr = ""; -- 1.8.3.1