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 7d3fd71..a440801 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,10 +3,12 @@ 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.JsonUtil; import com.lyms.platform.pojo.AntExChuModel; import org.hibernate.validator.constraints.NotEmpty; import java.util.List; +import java.util.Map; /** * @@ -22,19 +24,19 @@ public class AntExcAddRequest implements IBasicRequestConvert { private String id; // 既往史 - private String pastHistory ; + private Map pastHistory ; // 家族史 - private String familyHistory ; + private Map familyHistory ; //个人史 - private String personalHistory; + private Map personalHistory; //疫苗接种史 - private String ymjzHistory ; + private Map ymjzHistory ; //药物过敏史 - private String ywgmHistory ; + private Map ywgmHistory ; //妇科手术史 - private String fksxHistory ; + private Map fksxHistory ; // 叶酸服用 - private String ysfyHistory ; + private Map ysfyHistory ; //孕次 private String pregnancyTimes; // 产次 @@ -62,7 +64,7 @@ public class AntExcAddRequest implements IBasicRequestConvert { //体重指数 private String baricIndex; //本次妊娠情况 - private String cestationInfo; + private Map cestationInfo; // 宫高 private String gonggao; //腹围 @@ -84,7 +86,7 @@ public class AntExcAddRequest implements IBasicRequestConvert { //高危评分 private String highriskSocre; // 其他高危 - private String otherHighRisk; + private Map otherHighRisk; // 诊断 private String diagnosis; //处理意见 @@ -96,7 +98,7 @@ public class AntExcAddRequest implements IBasicRequestConvert { //产检日期 private String checkTime; //下次产检时间 - private String nextCheckTime; + private Map nextCheckTime; public String getParentId() { return parentId; } @@ -137,11 +139,11 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.birthDefect = birthDefect; } - public String getCestationInfo() { + public Map getCestationInfo() { return cestationInfo; } - public void setCestationInfo(String cestationInfo) { + public void setCestationInfo(Map cestationInfo) { this.cestationInfo = cestationInfo; } @@ -177,21 +179,6 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.dirOpinion = dirOpinion; } - public String getFamilyHistory() { - return familyHistory; - } - - public void setFamilyHistory(String familyHistory) { - this.familyHistory = familyHistory; - } - - public String getFksxHistory() { - return fksxHistory; - } - - public void setFksxHistory(String fksxHistory) { - this.fksxHistory = fksxHistory; - } public String getFuwei() { return fuwei; @@ -241,38 +228,22 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.neoDeath = neoDeath; } - public String getNextCheckTime() { + public Map getNextCheckTime() { return nextCheckTime; } - public void setNextCheckTime(String nextCheckTime) { + public void setNextCheckTime(Map nextCheckTime) { this.nextCheckTime = nextCheckTime; } - public String getOtherHighRisk() { + public Map getOtherHighRisk() { return otherHighRisk; } - public void setOtherHighRisk(String otherHighRisk) { + public void setOtherHighRisk(Map otherHighRisk) { this.otherHighRisk = otherHighRisk; } - public String getPastHistory() { - return pastHistory; - } - - public void setPastHistory(String pastHistory) { - this.pastHistory = pastHistory; - } - - public String getPersonalHistory() { - return personalHistory; - } - - public void setPersonalHistory(String personalHistory) { - this.personalHistory = personalHistory; - } - public List getPlacentas() { return placentas; } @@ -353,11 +324,43 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.weight = weight; } - public String getYmjzHistory() { + public Map getFamilyHistory() { + return familyHistory; + } + + public void setFamilyHistory(Map familyHistory) { + this.familyHistory = familyHistory; + } + + public Map getFksxHistory() { + return fksxHistory; + } + + public void setFksxHistory(Map fksxHistory) { + this.fksxHistory = fksxHistory; + } + + public Map getPastHistory() { + return pastHistory; + } + + public void setPastHistory(Map pastHistory) { + this.pastHistory = pastHistory; + } + + public Map getPersonalHistory() { + return personalHistory; + } + + public void setPersonalHistory(Map personalHistory) { + this.personalHistory = personalHistory; + } + + public Map getYmjzHistory() { return ymjzHistory; } - public void setYmjzHistory(String ymjzHistory) { + public void setYmjzHistory(Map ymjzHistory) { this.ymjzHistory = ymjzHistory; } @@ -369,19 +372,19 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.yqWeight = yqWeight; } - public String getYsfyHistory() { + public Map getYsfyHistory() { return ysfyHistory; } - public void setYsfyHistory(String ysfyHistory) { + public void setYsfyHistory(Map ysfyHistory) { this.ysfyHistory = ysfyHistory; } - public String getYwgmHistory() { + public Map getYwgmHistory() { return ywgmHistory; } - public void setYwgmHistory(String ywgmHistory) { + public void setYwgmHistory(Map ywgmHistory) { this.ywgmHistory = ywgmHistory; } @@ -390,13 +393,13 @@ public class AntExcAddRequest implements IBasicRequestConvert { AntExChuModel antExChuModel=new AntExChuModel(); antExChuModel.setId(id); antExChuModel.setParentId(parentId); - antExChuModel.setPastHistory(pastHistory); - antExChuModel.setFamilyHistory(familyHistory); - antExChuModel.setPersonalHistory(personalHistory); - antExChuModel.setYmjzHistory(ymjzHistory); - antExChuModel.setYwgmHistory(ywgmHistory); - antExChuModel.setFksxHistory(fksxHistory); - antExChuModel.setYsfyHistory(ysfyHistory); + antExChuModel.setPastHistory(JsonUtil.obj2JsonString(pastHistory)); + antExChuModel.setFamilyHistory(JsonUtil.obj2JsonString(familyHistory)); + antExChuModel.setPersonalHistory(JsonUtil.obj2JsonString(personalHistory)); + antExChuModel.setYmjzHistory(JsonUtil.obj2JsonString(ymjzHistory)); + antExChuModel.setYwgmHistory(JsonUtil.obj2JsonString(ywgmHistory)); + antExChuModel.setFksxHistory(JsonUtil.obj2JsonString(fksxHistory)); + antExChuModel.setYsfyHistory(JsonUtil.obj2JsonString(ysfyHistory)); antExChuModel.setPregnancyTimes(pregnancyTimes); antExChuModel.setProdTime(prodTime); antExChuModel.setDelivery(delivery); @@ -410,20 +413,20 @@ public class AntExcAddRequest implements IBasicRequestConvert { antExChuModel.setWeight(weight); antExChuModel.setYqWeight(yqWeight); antExChuModel.setBaricIndex(baricIndex); - antExChuModel.setCestationInfo(cestationInfo); + antExChuModel.setCestationInfo(JsonUtil.obj2JsonString(cestationInfo)); antExChuModel.setGonggao(gonggao); antExChuModel.setFuwei(fuwei); antExChuModel.setTireNumber1(tireNumber1); antExChuModel.setPlacentas(placentas); antExChuModel.setHighrisk(highrisk); antExChuModel.setHighriskSocre(highriskSocre); - antExChuModel.setOtherHighRisk(otherHighRisk); + antExChuModel.setOtherHighRisk(JsonUtil.obj2JsonString(otherHighRisk)); antExChuModel.setDiagnosis(diagnosis); antExChuModel.setTreatOpinion(treatOpinion); antExChuModel.setDirOpinion(dirOpinion); antExChuModel.setProdDoctor(prodDoctor); antExChuModel.setCheckTime(checkTime); - antExChuModel.setNextCheckTime(nextCheckTime); + antExChuModel.setNextCheckTime(JsonUtil.obj2JsonString(nextCheckTime)); return antExChuModel; }