From 455138842ea895f23fc8f4536271859f85b5db3d Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 3 Aug 2016 17:45:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E9=BE=84=E8=AE=A1=E7=AE=97?= 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 +++--- .../lyms/platform/operate/web/facade/BabyBookbuildingFacade.java | 2 +- 2 files changed, 4 insertions(+), 4 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 95bdd60..4443365 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 @@ -412,7 +412,7 @@ public class DateUtil { int month = getMonthSpace(birth,rightNow.getTime()); - return year+"岁"+ (month == 0 ? "" : month+"月"); + return year+"岁"+ (month == 0 ? "" : month+"月龄"); } public static int daysBetween(Date smdate,Date bdate) @@ -451,7 +451,7 @@ public class DateUtil { result = c2.get(Calendar.MONDAY) - c1.get(Calendar.MONTH); - return result == 0 ? 1 : Math.abs(result); + return result == 0 ? 1 : Math.abs(result)-1; } @@ -559,7 +559,7 @@ public class DateUtil { System.out.println(new DateTime().minusDays(77));*/ // System.out.println(getDaySeconds()); - String s = getBabyMonthAge(parseYMD("2016-06-26"), new Date()); + String s = getBabyMonthAge(parseYMD("2016-05-16"), new Date()); System.out.println(s); // SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd "); // System.out.println(getBabyAgeMonth(parseYMD("2016-05-23"), new Date())); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 8f223a4..50bd459 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -260,7 +260,7 @@ public class BabyBookbuildingFacade { Date dueDate = patients.getDueDate(); if (dueDate != null && request.getBabyBirthday() != null) { Date brith = DateUtil.parseYMD(request.getBabyBirthday()); - Date tempDate = DateUtil.addDay(dueDate, -60); + Date tempDate = DateUtil.addMonth(dueDate, -2); if (brith.getTime() > tempDate.getTime()) { //设置孕妇已分娩 Patients patientUpdate = new Patients(); -- 1.8.3.1