diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java index 8c57b46..3c5b1b9 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexListResult.java @@ -39,6 +39,7 @@ public class AntexListResult { private Integer age; //孕周 private String dueWeek; + private Integer currentWeek; //预产期 private String yChanQi; //手机号 @@ -404,12 +405,15 @@ public class AntexListResult { setVcCardNo(patients.getVcCardNo()); if (null != patients.getDueStatus() && 1 == patients.getDueStatus()) { this.dueWeek = "终止妊娠"; + this.currentWeek = -1; } else if (3 == patients.getType()) { this.dueWeek = "已分娩"; + this.currentWeek = -2; } else { if (null != patients.getLastMenses()) { int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); this.dueWeek = StringUtils.dueWeek(days); + this.currentWeek = DateUtil.getWeek(patients.getLastMenses(), new Date()); } } if (null != patients.getLastMenses()) { @@ -436,6 +440,14 @@ public class AntexListResult { private String mensStopStartDay; private String mensStopEndDay; + public Integer getCurrentWeek() { + return currentWeek; + } + + public void setCurrentWeek(Integer currentWeek) { + this.currentWeek = currentWeek; + } + public String getMensStopStartDay() { return mensStopStartDay; }