From cbd98e5e5d918d347332e7aec6057d68260c5e71 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Wed, 15 Mar 2017 14:21:21 +0800 Subject: [PATCH] update code --- .../operate/web/facade/AntExRecordFacade.java | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java index fdeaf71..bd58f6c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java @@ -363,17 +363,25 @@ public class AntExRecordFacade { Patients patients = patientsService.findOnePatientById(record.getParentId()); String dueWeek = ""; if (null != patients) { - if (patients.getDueStatus() != null && patients.getDueStatus() == 1 && patients.getType() == 3) { - dueWeek = "终止妊娠"; - } else if (patients.getType() == 3) { - dueWeek = "已分娩"; - } else { - int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); +// if (patients.getDueStatus() != null && patients.getDueStatus() == 1 && patients.getType() == 3) { +// dueWeek = "终止妊娠"; +// } else if (patients.getType() == 3) { +// dueWeek = "已分娩"; +// } else { +// int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); +// String week = (days / 7) + ""; +// int day = (days % 7); +// dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); +// } + //2017-03-15 高帆说的改成这样 + if (patients.getLastMenses() != null && record.getCheckTime() != null) + { + int days = DateUtil.daysBetween(patients.getLastMenses(), record.getCheckTime()); String week = (days / 7) + ""; int day = (days % 7); dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); + cjStatisticsListResult.setDueWeek(dueWeek); } - cjStatisticsListResult.setDueWeek(dueWeek); } -- 1.8.3.1