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 d98b334..adeab53 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 @@ -25,6 +25,10 @@ public class AntExChuModel extends BaseModel { private String neoDeathTodo; //出生缺陷儿备注 private String birthDefectTodo; + //新生儿死亡备注 + private Integer neoDeath; + //出生缺陷儿备注 + private Integer birthDefect; //预产期 private Date dueDate; //末次月经 @@ -59,10 +63,6 @@ public class AntExChuModel extends BaseModel { private Integer stillbirth; //死产 private Integer stillChan ; - //新生儿死亡 - private Integer neoDeath; - //出生缺陷 - private Integer birthDefect; // 身高 private String height; //体重 @@ -110,21 +110,6 @@ public class AntExChuModel extends BaseModel { */ private String diagnosisOther; - public String getNeoDeathTodo() { - return neoDeathTodo; - } - - public void setNeoDeathTodo(String neoDeathTodo) { - this.neoDeathTodo = neoDeathTodo; - } - - public String getBirthDefectTodo() { - return birthDefectTodo; - } - - public void setBirthDefectTodo(String birthDefectTodo) { - this.birthDefectTodo = birthDefectTodo; - } public String getDiagnosisOther() { return diagnosisOther; @@ -218,6 +203,38 @@ public class AntExChuModel extends BaseModel { return heart; } + public String getNeoDeathTodo() { + return neoDeathTodo; + } + + public void setNeoDeathTodo(String neoDeathTodo) { + this.neoDeathTodo = neoDeathTodo; + } + + public Integer getNeoDeath() { + return neoDeath; + } + + public void setNeoDeath(Integer neoDeath) { + this.neoDeath = neoDeath; + } + + public Integer getBirthDefect() { + return birthDefect; + } + + public void setBirthDefect(Integer birthDefect) { + this.birthDefect = birthDefect; + } + + public String getBirthDefectTodo() { + return birthDefectTodo; + } + + public void setBirthDefectTodo(String birthDefectTodo) { + this.birthDefectTodo = birthDefectTodo; + } + public void setHeart(String heart) { this.heart = heart; } @@ -696,13 +713,6 @@ public class AntExChuModel extends BaseModel { this.baricIndex = baricIndex; } - public Integer getBirthDefect() { - return birthDefect; - } - - public void setBirthDefect(Integer birthDefect) { - this.birthDefect = birthDefect; - } public Integer getDelivery() { return delivery; @@ -712,14 +722,6 @@ public class AntExChuModel extends BaseModel { this.delivery = delivery; } - public Integer getNeoDeath() { - return neoDeath; - } - - public void setNeoDeath(Integer neoDeath) { - this.neoDeath = neoDeath; - } - public Integer getPlanedProd() { return planedProd; } 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 6cfe5d5..a1dfdde 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 @@ -87,6 +87,10 @@ public class AntexChuResult { private Integer stillbirth; //死产 private Integer stillChan; + //新生儿死亡备注 + private String neoDeathTodo; + //出生缺陷备注 + private String birthDefectTodo; //新生儿死亡 private Integer neoDeath; //出生缺陷 @@ -230,6 +234,22 @@ public class AntexChuResult { return abortionZR; } + public Integer getNeoDeath() { + return neoDeath; + } + + public void setNeoDeath(Integer neoDeath) { + this.neoDeath = neoDeath; + } + + public Integer getBirthDefect() { + return birthDefect; + } + + public void setBirthDefect(Integer birthDefect) { + this.birthDefect = birthDefect; + } + public void setAbortionZR(Integer abortionZR) { this.abortionZR = abortionZR; } @@ -602,13 +622,6 @@ public class AntexChuResult { this.abortion = abortion; } - public Integer getBirthDefect() { - return birthDefect; - } - - public void setBirthDefect(Integer birthDefect) { - this.birthDefect = birthDefect; - } public Integer getDelivery() { return delivery; @@ -618,13 +631,6 @@ public class AntexChuResult { this.delivery = delivery; } - public Integer getNeoDeath() { - return neoDeath; - } - - public void setNeoDeath(Integer neoDeath) { - this.neoDeath = neoDeath; - } public Integer getPlanedProd() { return planedProd; @@ -899,6 +905,22 @@ public class AntexChuResult { this.hHealthInfo = hHealthInfo; } + public String getNeoDeathTodo() { + return neoDeathTodo; + } + + public void setNeoDeathTodo(String neoDeathTodo) { + this.neoDeathTodo = neoDeathTodo; + } + + public String getBirthDefectTodo() { + return birthDefectTodo; + } + + public void setBirthDefectTodo(String birthDefectTodo) { + this.birthDefectTodo = birthDefectTodo; + } + public AntexChuResult convertToResult(AntExChuModel antExChuModel) { if (null != antExChuModel) { setBarCode(antExChuModel.getBarCode()); @@ -939,8 +961,8 @@ public class AntexChuResult { if(null!=antExChuModel.getBp()){ setBp(JsonUtil.str2Obj(antExChuModel.getBp(),Map.class)); } - setNeoDeath(antExChuModel.getNeoDeath()); - setBirthDefect(antExChuModel.getBirthDefect()); + setNeoDeathTodo(antExChuModel.getNeoDeathTodo()); + setBirthDefectTodo(antExChuModel.getBirthDefectTodo()); setHeart(antExChuModel.getHeart()); setLungs(antExChuModel.getLungs()); setVulva(antExChuModel.getVulva());