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 d437639..a85f8c0 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 @@ -35,23 +35,23 @@ public class AntExChuModel implements Serializable { // 叶酸服用 private String ysfyHistory ; //孕次 - private String pregnancyTimes; + private Integer pregnancyTimes; // 产次 - private String prodTime; + private Integer prodTime; // 顺产 - private String delivery; + private Integer delivery; //刨宫产 - private String planedProd; + private Integer planedProd; //流产 - private String abortion; + private Integer abortion; //死胎 - private String stillbirth; + private Integer stillbirth; //死产 - private String stillChan ; + private Integer stillChan ; //新生儿死亡 - private String neoDeath; + private Integer neoDeath; //出生缺陷 - private String birthDefect; + private Integer birthDefect; // 身高 private String height; //体重 @@ -167,29 +167,7 @@ public class AntExChuModel implements Serializable { // 阴道清洁度 private String ydqjd; - public String getAbortion() { - return abortion; - } - - public void setAbortion(String abortion) { - this.abortion = abortion; - } - - public String getBaricIndex() { - return baricIndex; - } - public void setBaricIndex(String baricIndex) { - this.baricIndex = baricIndex; - } - - public String getBirthDefect() { - return birthDefect; - } - - public void setBirthDefect(String birthDefect) { - this.birthDefect = birthDefect; - } public String getCestationInfo() { return cestationInfo; @@ -207,13 +185,7 @@ public class AntExChuModel implements Serializable { this.checkTime = checkTime; } - public String getDelivery() { - return delivery; - } - public void setDelivery(String delivery) { - this.delivery = delivery; - } public String getDiagnosis() { return diagnosis; @@ -295,13 +267,7 @@ public class AntExChuModel implements Serializable { this.id = id; } - public String getNeoDeath() { - return neoDeath; - } - public void setNeoDeath(String neoDeath) { - this.neoDeath = neoDeath; - } public String getNextCheckTime() { return nextCheckTime; @@ -351,53 +317,6 @@ public class AntExChuModel implements Serializable { this.placentas = placentas; } - public String getPlanedProd() { - return planedProd; - } - - public void setPlanedProd(String planedProd) { - this.planedProd = planedProd; - } - - public String getPregnancyTimes() { - return pregnancyTimes; - } - - public void setPregnancyTimes(String pregnancyTimes) { - this.pregnancyTimes = pregnancyTimes; - } - - public String getProdDoctor() { - return prodDoctor; - } - - public void setProdDoctor(String prodDoctor) { - this.prodDoctor = prodDoctor; - } - - public String getProdTime() { - return prodTime; - } - - public void setProdTime(String prodTime) { - this.prodTime = prodTime; - } - - public String getStillbirth() { - return stillbirth; - } - - public void setStillbirth(String stillbirth) { - this.stillbirth = stillbirth; - } - - public String getStillChan() { - return stillChan; - } - - public void setStillChan(String stillChan) { - this.stillChan = stillChan; - } public String getTireNumber1() { return tireNumber1; @@ -543,6 +462,94 @@ public class AntExChuModel implements Serializable { this.mdxqsy = mdxqsy; }*/ + public Integer getAbortion() { + return abortion; + } + + public void setAbortion(Integer abortion) { + this.abortion = abortion; + } + + public String getBaricIndex() { + return baricIndex; + } + + public void setBaricIndex(String baricIndex) { + this.baricIndex = baricIndex; + } + + public Integer getBirthDefect() { + return birthDefect; + } + + public void setBirthDefect(Integer birthDefect) { + this.birthDefect = birthDefect; + } + + public Integer getDelivery() { + return delivery; + } + + public void setDelivery(Integer delivery) { + this.delivery = delivery; + } + + public Integer getNeoDeath() { + return neoDeath; + } + + public void setNeoDeath(Integer neoDeath) { + this.neoDeath = neoDeath; + } + + public Integer getPlanedProd() { + return planedProd; + } + + public void setPlanedProd(Integer planedProd) { + this.planedProd = planedProd; + } + + public Integer getPregnancyTimes() { + return pregnancyTimes; + } + + public void setPregnancyTimes(Integer pregnancyTimes) { + this.pregnancyTimes = pregnancyTimes; + } + + public String getProdDoctor() { + return prodDoctor; + } + + public void setProdDoctor(String prodDoctor) { + this.prodDoctor = prodDoctor; + } + + public Integer getProdTime() { + return prodTime; + } + + public void setProdTime(Integer prodTime) { + this.prodTime = prodTime; + } + + public Integer getStillbirth() { + return stillbirth; + } + + public void setStillbirth(Integer stillbirth) { + this.stillbirth = stillbirth; + } + + public Integer getStillChan() { + return stillChan; + } + + public void setStillChan(Integer stillChan) { + this.stillChan = stillChan; + } + public String getNcgOther() { return ncgOther; } 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 4a7a055..8cacbca 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 @@ -45,23 +45,23 @@ public class AntExcAddRequest implements IBasicRequestConvert { // 叶酸服用 private Map ysfyHistory ; //孕次 - private String pregnancyTimes; + private Integer pregnancyTimes; // 产次 - private String prodTime; + private Integer prodTime; // 顺产 - private String delivery; + private Integer delivery; //刨宫产 - private String planedProd; + private Integer planedProd; //流产 - private String abortion; + private Integer abortion; //死胎 - private String stillbirth; + private Integer stillbirth; //死产 - private String stillChan ; + private Integer stillChan ; //新生儿死亡 - private String neoDeath; + private Integer neoDeath; //出生缺陷 - private String birthDefect; + private Integer birthDefect; // 身高 private String height; //体重 @@ -449,14 +449,10 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.id = id; } - public String getAbortion() { + public Integer getAbortion() { return abortion; } - public void setAbortion(String abortion) { - this.abortion = abortion; - } - public String getBaricIndex() { return baricIndex; } @@ -465,14 +461,74 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.baricIndex = baricIndex; } - public String getBirthDefect() { + public void setAbortion(Integer abortion) { + this.abortion = abortion; + } + + public Integer getBirthDefect() { return birthDefect; } - public void setBirthDefect(String birthDefect) { + public void setBirthDefect(Integer birthDefect) { this.birthDefect = birthDefect; } + public Integer getDelivery() { + return delivery; + } + + public void setDelivery(Integer delivery) { + this.delivery = delivery; + } + + public Integer getNeoDeath() { + return neoDeath; + } + + public void setNeoDeath(Integer neoDeath) { + this.neoDeath = neoDeath; + } + + public Integer getPlanedProd() { + return planedProd; + } + + public void setPlanedProd(Integer planedProd) { + this.planedProd = planedProd; + } + + public Integer getPregnancyTimes() { + return pregnancyTimes; + } + + public void setPregnancyTimes(Integer pregnancyTimes) { + this.pregnancyTimes = pregnancyTimes; + } + + public Integer getProdTime() { + return prodTime; + } + + public void setProdTime(Integer prodTime) { + this.prodTime = prodTime; + } + + public Integer getStillbirth() { + return stillbirth; + } + + public void setStillbirth(Integer stillbirth) { + this.stillbirth = stillbirth; + } + + public Integer getStillChan() { + return stillChan; + } + + public void setStillChan(Integer stillChan) { + this.stillChan = stillChan; + } + public Map getCestationInfo() { return cestationInfo; } @@ -489,13 +545,6 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.checkTime = checkTime; } - public String getDelivery() { - return delivery; - } - - public void setDelivery(String delivery) { - this.delivery = delivery; - } public String getDiagnosis() { return diagnosis; @@ -554,14 +603,6 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.highriskSocre = highriskSocre; } - public String getNeoDeath() { - return neoDeath; - } - - public void setNeoDeath(String neoDeath) { - this.neoDeath = neoDeath; - } - public Map getNextCheckTime() { return nextCheckTime; } @@ -586,21 +627,7 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.placentas = placentas; } - public String getPlanedProd() { - return planedProd; - } - - public void setPlanedProd(String planedProd) { - this.planedProd = planedProd; - } - - public String getPregnancyTimes() { - return pregnancyTimes; - } - public void setPregnancyTimes(String pregnancyTimes) { - this.pregnancyTimes = pregnancyTimes; - } public String getProdDoctor() { return prodDoctor; @@ -610,29 +637,7 @@ public class AntExcAddRequest implements IBasicRequestConvert { this.prodDoctor = prodDoctor; } - public String getProdTime() { - return prodTime; - } - public void setProdTime(String prodTime) { - this.prodTime = prodTime; - } - - public String getStillbirth() { - return stillbirth; - } - - public void setStillbirth(String stillbirth) { - this.stillbirth = stillbirth; - } - - public String getStillChan() { - return stillChan; - } - - public void setStillChan(String stillChan) { - this.stillChan = stillChan; - } public String getTireNumber1() { return tireNumber1; 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 f9e3173..c6edecd 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 @@ -59,23 +59,23 @@ public class AntexChuResult { // 叶酸服用 private Map ysfyHistory; //孕次 - private String pregnancyTimes; + private Integer pregnancyTimes; // 产次 - private String prodTime; + private Integer prodTime; // 顺产 - private String delivery; + private Integer delivery; //刨宫产 - private String planedProd; + private Integer planedProd; //流产 - private String abortion; + private Integer abortion; //死胎 - private String stillbirth; + private Integer stillbirth; //死产 - private String stillChan; + private Integer stillChan; //新生儿死亡 - private String neoDeath; + private Integer neoDeath; //出生缺陷 - private String birthDefect; + private Integer birthDefect; // 身高 private String height; //体重 @@ -203,13 +203,7 @@ public class AntexChuResult { this.abo = abo; } - public String getAbortion() { - return abortion; - } - public void setAbortion(String abortion) { - this.abortion = abortion; - } public String getAlbumin() { @@ -236,13 +230,7 @@ public class AntexChuResult { this.bChao = bChao; } - public String getBirthDefect() { - return birthDefect; - } - public void setBirthDefect(String birthDefect) { - this.birthDefect = birthDefect; - } public String getBld() { return bld; @@ -292,13 +280,6 @@ public class AntexChuResult { this.chgOther = chgOther; } - public String getDelivery() { - return delivery; - } - - public void setDelivery(String delivery) { - this.delivery = delivery; - } public String getDiagnosis() { return diagnosis; @@ -407,13 +388,6 @@ public class AntexChuResult { this.ndb = ndb; } - public String getNeoDeath() { - return neoDeath; - } - - public void setNeoDeath(String neoDeath) { - this.neoDeath = neoDeath; - } public Map getNextCheckTime() { return nextCheckTime; @@ -447,13 +421,7 @@ public class AntexChuResult { this.placentas = placentas; } - public String getPlanedProd() { - return planedProd; - } - public void setPlanedProd(String planedProd) { - this.planedProd = planedProd; - } public String getPlatelet() { return platelet; @@ -463,13 +431,7 @@ public class AntexChuResult { this.platelet = platelet; } - public String getPregnancyTimes() { - return pregnancyTimes; - } - public void setPregnancyTimes(String pregnancyTimes) { - this.pregnancyTimes = pregnancyTimes; - } public String getProdDoctor() { return prodDoctor; @@ -479,28 +441,76 @@ public class AntexChuResult { this.prodDoctor = prodDoctor; } - public String getProdTime() { + + public Integer getAbortion() { + return abortion; + } + + public void setAbortion(Integer abortion) { + this.abortion = abortion; + } + + public Integer getBirthDefect() { + return birthDefect; + } + + public void setBirthDefect(Integer birthDefect) { + this.birthDefect = birthDefect; + } + + public Integer getDelivery() { + return delivery; + } + + public void setDelivery(Integer delivery) { + this.delivery = delivery; + } + + public Integer getNeoDeath() { + return neoDeath; + } + + public void setNeoDeath(Integer neoDeath) { + this.neoDeath = neoDeath; + } + + public Integer getPlanedProd() { + return planedProd; + } + + public void setPlanedProd(Integer planedProd) { + this.planedProd = planedProd; + } + + public Integer getPregnancyTimes() { + return pregnancyTimes; + } + + public void setPregnancyTimes(Integer pregnancyTimes) { + this.pregnancyTimes = pregnancyTimes; + } + + public Integer getProdTime() { return prodTime; } - public void setProdTime(String prodTime) { + public void setProdTime(Integer prodTime) { this.prodTime = prodTime; } - - public String getStillbirth() { + public Integer getStillbirth() { return stillbirth; } - public void setStillbirth(String stillbirth) { + public void setStillbirth(Integer stillbirth) { this.stillbirth = stillbirth; } - public String getStillChan() { + public Integer getStillChan() { return stillChan; } - public void setStillChan(String stillChan) { + public void setStillChan(Integer stillChan) { this.stillChan = stillChan; } @@ -798,8 +808,8 @@ public class AntexChuResult { } setSyjg(antExChuModel.getSyjg()); - setAbo(antExChuModel.getAbortion()); - setAlbumin(antExChuModel.getAbortion()); + setAbo(antExChuModel.getAbo()); + setAlbumin(antExChuModel.getAlbumin()); setXhdb(antExChuModel.getXhdb()); setBxbjs(antExChuModel.getBxbjs()); setPlatelet(antExChuModel.getPlatelet());