From 4751a3645e9c7ca8346de775ebd064e61b0028c3 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 1 Dec 2016 18:48:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E6=A3=80=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 fc62c88..f0a3f8c 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 @@ -114,9 +114,9 @@ public class AntExRecordFacade { Patients patients = patientsService.findOnePatientById(record.getParentId()); String dueWeek = ""; if (null != patients) { - if (patients.getDueStatus() == 1) { + if (patients.getDueStatus() == 1&&patients.getType()==3) { dueWeek = "终止妊娠"; - } else if (null != patients.getFmDate()) { + } else if (patients.getType()==3&&patients.getDueStatus() == 0) { dueWeek = "已分娩"; } else { int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); -- 1.8.3.1