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 eac916e..eb0b2b6 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 @@ -30,11 +30,13 @@ public class AntexListResult { //手机号 private String phone; //高危因素 - private String riskFactor; + private List riskFactor; //高危评分 private String riskScore; //备注 private String remarks; + //末次月经 + private String lastMenses; // private List data = new ArrayList(); @@ -87,13 +89,7 @@ public class AntexListResult { this.remarks = remarks; } - public String getRiskFactor() { - return riskFactor; - } - public void setRiskFactor(String riskFactor) { - this.riskFactor = riskFactor; - } public String getRiskScore() { return riskScore; @@ -123,8 +119,12 @@ public class AntexListResult { setPhone(patients.getPhone()); setRemarks("产妇备注"); setRiskScore("60"); - setRiskFactor("高危因素"); + /* List list=new ArrayList<>(); + setRiskFactor();*/ setDueWeek(""); + if(null!=patients.getLastMenses()){ + setLastMenses(DateUtil.getYmd(patients.getLastMenses())); + } if(CollectionUtils.isNotEmpty(destModel)){ List dataList = new ArrayList<>(); if(null!=antExChuModel){ @@ -183,4 +183,12 @@ public class AntexListResult { public void setData(List data) { this.data = data; } + + public String getLastMenses() { + return lastMenses; + } + + public void setLastMenses(String lastMenses) { + this.lastMenses = lastMenses; + } }