diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java index 4fa1099..bbc5a08 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/AntExChuModel.java @@ -3,6 +3,7 @@ package com.lyms.platform.pojo; import org.springframework.data.mongodb.core.mapping.Document; import java.io.Serializable; +import java.util.Date; import java.util.List; /** @@ -15,7 +16,10 @@ public class AntExChuModel implements Serializable { private String id; private String parentId; - + //预产期 + private Date dueDate; + //末次月经 + private Date lastMenses; // 既往史 private String pastHistory ; // 家族史 @@ -689,4 +693,20 @@ public class AntExChuModel implements Serializable { public void setYghxkt(String yghxkt) { this.yghxkt = yghxkt; } + + public Date getDueDate() { + return dueDate; + } + + public void setDueDate(Date dueDate) { + this.dueDate = dueDate; + } + + public Date getLastMenses() { + return lastMenses; + } + + public void setLastMenses(Date lastMenses) { + this.lastMenses = lastMenses; + } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java index 5f8a02c..2b6dabf 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExcAddRequest.java @@ -3,8 +3,10 @@ package com.lyms.platform.operate.web.request; import com.lyms.platform.common.base.IBasicRequestConvert; import com.lyms.platform.common.core.annotation.form.FormParam; import com.lyms.platform.common.core.annotation.form.Form; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.pojo.AntExChuModel; +import org.apache.commons.lang.StringUtils; import org.hibernate.validator.constraints.NotEmpty; import java.util.Date; @@ -789,6 +791,13 @@ public class AntExcAddRequest implements IBasicRequestConvert { antExChuModel.setProdDoctor(prodDoctor); antExChuModel.setCheckTime(checkTime); antExChuModel.setNextCheckTime(JsonUtil.obj2JsonString(nextCheckTime)); + if(StringUtils.isNotEmpty(lastMenses)){ + antExChuModel.setLastMenses(DateUtil.parseYMD(lastMenses)); + } + if(StringUtils.isNotEmpty(dueDate)){ + antExChuModel.setDueDate(DateUtil.parseYMD(dueDate)); + } + return antExChuModel; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java index a8a199a..76a47ac 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java @@ -1,8 +1,10 @@ package com.lyms.platform.operate.web.result; +import com.lyms.platform.common.utils.DateUtil; import com.lyms.platform.common.utils.JsonUtil; import com.lyms.platform.operate.web.request.MatDeliverAddRequest; import com.lyms.platform.pojo.AntExChuModel; +import org.apache.commons.lang.StringUtils; import java.util.List; import java.util.Map; @@ -36,6 +38,8 @@ public class AntexChuResult { private String remarks;*/ //末次月经 private String lastMenses; + //预产期 + private String dueDate; /** * 初检信息 @@ -823,7 +827,21 @@ public class AntexChuResult { setHivkt(antExChuModel.getHivkt()); setYdfmw(JsonUtil.str2Obj(antExChuModel.getYdfmw(), Map.class)); setYdqjd(antExChuModel.getYdqjd()); + if(null!=antExChuModel.getDueDate()){ + setDueDate(DateUtil.getyyyy_MM_dd(antExChuModel.getDueDate())); + } + if(null!=antExChuModel.getLastMenses()) { + setLastMenses(DateUtil.getyyyy_MM_dd(antExChuModel.getLastMenses())); + } } return this; } + + public String getDueDate() { + return dueDate; + } + + public void setDueDate(String dueDate) { + this.dueDate = dueDate; + } }