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 d185e0e..16c2343 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 @@ -8,6 +8,7 @@ import com.lyms.platform.pojo.Patients; import org.apache.commons.collections.CollectionUtils; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -127,9 +128,11 @@ public class AntexListResult { setPhone(patients.getPhone()); setRemarks("产妇备注"); setRiskScore("60"); - /* List list=new ArrayList<>(); - setRiskFactor();*/ - setDueWeek("孕3周"); + + int days= DateUtil.daysBetween(patients.getLastMenses(),new Date()); + String week= (days/7)+""; + int day = (days%7); + this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":""); if(null!=patients.getLastMenses()){ setLastMenses(DateUtil.getYmd(patients.getLastMenses())); } @@ -151,13 +154,16 @@ public class AntexListResult { private String checkTime; public AntData(AntenatalExaminationModel model){ this.id=model.getId(); - this.dueWeek=""; + this.dueWeek=model.getCurrentDueDate(); this.checkTime=model.getCheckDate(); } public AntData(AntExChuModel model){ this.id=model.getId(); - this.dueWeek=""; + int days= DateUtil.daysBetween(model.getLastMenses(),new Date()); + String week= (days/7)+""; + int day = (days%7); + this.dueWeek="孕"+week+"周" +(day>0?"+"+day+"天":""); this.checkTime=model.getCheckTime(); } public String getCheckTime() {