From d7f524f20a76707f1c55d142d252684c361f4a72 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Mon, 8 Aug 2016 15:43:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=BB=BA=E6=A1=A3?= 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 | 4 ++-- .../java/com/lyms/platform/data/service/impl/SmsServiceImpl.java | 6 +++--- .../com/lyms/platform/operate/web/facade/BookbuildingFacade.java | 2 +- 3 files changed, 6 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 4e154c8..52641be 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 @@ -606,8 +606,8 @@ public class DateUtil { System.out.println(new DateTime().minusDays(77));*/ // System.out.println(getDaySeconds()); - String s = getBabyMonthAge(parseYMD("2015-06-07"), new Date()); - System.out.println(s); +// String s = getBabyMonthAge(parseYMD("2015-06-07"), new Date()); +// System.out.println(s); // SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd "); // System.out.println(getBabyAgeMonth(parseYMD("2016-05-23"), new Date())); // System.out.println(DateUtil.getyyyy_MM_dd_hms(DateUtil.addDay(new Date(),-108))); diff --git a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java index dfffcc5..802c649 100644 --- a/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java +++ b/platform-data-api/src/main/java/com/lyms/platform/data/service/impl/SmsServiceImpl.java @@ -834,7 +834,7 @@ public class SmsServiceImpl implements SmsService{ */ Date endDate = DateUtil.getNewDate(-42, "周", 0); //把时间格式化成 yyyy_MM_dd 的日期 - endDate = DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(endDate)); + endDate = DateUtil.formatDate(endDate); patientsQuery.setYn(YnEnums.YES.getId()); //1孕妇 patientsQuery.setType(1); @@ -1001,6 +1001,7 @@ public class SmsServiceImpl implements SmsService{ } } } + //儿童月龄 else if (specialDateType == SpecialDateEnums.ETYL.getId()) { Integer start = template.getStart(); @@ -1173,7 +1174,7 @@ public class SmsServiceImpl implements SmsService{ babyModelQuery.setYn(YnEnums.YES.getId()); Date babyEndDate = DateUtil.getNewDate(-36, "月", 0); //把时间格式化成 yyyy_MM_dd 的日期 - babyEndDate = DateUtil.parseYMD(DateUtil.getyyyy_MM_dd(babyEndDate)); + babyEndDate = DateUtil.formatDate(babyEndDate); babyModelQuery.setBirthStart(babyEndDate); babyModelQuery.setBirthEnd(babyEndDate); @@ -1266,7 +1267,6 @@ public class SmsServiceImpl implements SmsService{ query.setId(orderModel.getParentId()); messages.addAll(getChanMessageRequestList(patientsQuery,config,template)); - } } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java index 45da4f8..66afe9d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java @@ -109,7 +109,7 @@ public class BookbuildingFacade { { Date date = DateUtil.addWeek(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()),42); Date currentDate = DateUtil.formatDate(new Date()); - if (date.getTime() >= currentDate.getTime()) + if (date.getTime() <= currentDate.getTime()) { type = 3; } -- 1.8.3.1