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 2fcceeb..98f0581 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 @@ -111,6 +111,23 @@ public class AntExRecordFacade { for (AntExRecordModel record : list2) { CjStatisticsListResult cjStatisticsListResult = new CjStatisticsListResult(); cjStatisticsListResult.convertToResult(record); + Patients patients = patientsService.findOnePatientById(record.getParentId()); + String dueWeek = ""; + if (null != patients) { + if (patients.getDueStatus() == 1) { + dueWeek = "终止妊娠"; + } else if (null != patients.getFmDate()) { + dueWeek = "已分娩"; + } else { + int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); + String week = (days / 7) + ""; + int day = (days % 7); + dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); + } + cjStatisticsListResult.setDueWeek(dueWeek); + } + + Users users = usersService.getUsers(NumberUtils.toInt(record.getCheckDoctor())); if (null != users) { cjStatisticsListResult.setCheckDoctor(users.getName());