From aa5120bf3cc5a862184ad393dc5d04e5bf122ef5 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Tue, 14 Nov 2017 11:30:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index 3f1fc00..be2ac45 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -751,7 +751,7 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService if(p.getId().equals(patientId)) { for (Map map : entry.getValue()) { System.out.println(DateUtil.getyyyy_MM_dd_hms(p.getCreated()) + " >> " + DateUtil.getyyyy_MM_dd_hms(((Date) map.get("create_date")))); - if(p.getFmDate() != null && p.getFmDate().getTime() > ((Date) map.get("create_date")).getTime()) { // 如果手动终止妊娠了， 那么fmDate应该小于优惠券发放的时间 + if(p.getFmDate() != null && p.getFmDate().getTime() < ((Date) map.get("create_date")).getTime()) { // 如果手动终止妊娠了， 那么fmDate应该小于优惠券发放的时间 continue; } if(p.getCreated().getTime() > ((Date) map.get("create_date")).getTime()) { // 同一个产程中 patient的创建时间肯定小于优惠券的创建时间 -- 1.8.3.1