From 4600d759daf5bc43511ad175c139c20018aa67e8 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Mon, 25 Sep 2017 16:31:47 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E9=87=8D=E7=AE=A1=E7=90=86=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/common/utils/DateUtil.java | 15 +++++++++++++++ .../web/service/impl/PatientWeightServiceImpl.java | 2 +- 2 files changed, 16 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 dd0e6ac..d3e5daa 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 @@ -975,6 +975,21 @@ public class DateUtil { } /** + * 获取孕周 + * @param start + * @param end + * @return + */ + public static Integer getWeek2(Date start, Date end) { + if(start == null || end == null) { + return null; + } + Integer betweenDay = DateUtil.getDays(start, end); + Integer week = betweenDay / 7; + return week; + } + + /** * 获取两个日期相差几个月 * @param start * @param end diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java index 4f958d8..2706ae0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/PatientWeightServiceImpl.java @@ -222,7 +222,7 @@ public class PatientWeightServiceImpl extends BaseServiceImpl implements Patient map.put("phone", patients.getPhone()); map.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); map.put("age", DateUtil.getAge(patients.getBirth())); - week = DateUtil.getWeek(patients.getLastMenses(), new Date()); + week = DateUtil.getWeek2(patients.getLastMenses(), new Date()); String yunqi = ""; if(week <= 12) { yunqi = "孕早期"; -- 1.8.3.1