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 547b0f7..c92481b 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 @@ -43,7 +43,7 @@ public class AntexListResult { private String cardNo; private String vcCardNo; private String isSieve; - private String isH="0"; + private String isH = "0"; // @@ -190,12 +190,14 @@ public class AntexListResult { setCardNo(patients.getCardNo()); setVcCardNo(patients.getVcCardNo()); - if (3 == patients.getType()) { + if (null!=patients.getDueStatus() && 1 == patients.getDueStatus()) { + this.dueWeek = "终止妊娠"; + } else if (3 == patients.getType()) { this.dueWeek = "已分娩"; } else { if (null != patients.getLastMenses()) { int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); - this.dueWeek= StringUtils.dueWeek(days); + this.dueWeek = StringUtils.dueWeek(days); } }