diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java index 9849b93..f25f3c4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MatDeliverListResult.java @@ -46,9 +46,18 @@ public class MatDeliverListResult { // 胎数 private String tireNumber1; + private String status="0"; private List data = new ArrayList(); + public String getStatus() { + return status; + } + + public void setStatus(String status) { + this.status = status; + } + public String getDueType() { return dueType; } @@ -85,16 +94,19 @@ public class MatDeliverListResult { setName(patients.getUsername()); setPhone(patients.getPhone()); setRemarks(patients.getMremark()); - setRiskScore("60"); - int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); - String week = (days / 7) + ""; - int day = (days % 7); + + if(null != patients.getFmDate()){ + status="1"; + } if (patients.getDueStatus() == 1) { this.dueWeek = "终止妊娠"; } else if (null != patients.getFmDate()) { dueWeek = "已分娩"; } else { + int days = DateUtil.daysBetween(patients.getLastMenses(), new Date()); + String week = (days / 7) + ""; + int day = (days % 7); this.dueWeek = "孕" + week + "周" + (day > 0 ? "+" + day + "天" : ""); } if (CollectionUtils.isNotEmpty(destList)) {