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());