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 5cabc96..7ba2eae 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 @@ -98,6 +98,27 @@ public class AntExChuModel extends BaseModel { //丈夫健康情况 private String hHealthInfo; + //自然流产 + private Integer abortionZR; + //人工流产 + private Integer abortionRG; + + public Integer getAbortionZR() { + return abortionZR; + } + + public void setAbortionZR(Integer abortionZR) { + this.abortionZR = abortionZR; + } + + public Integer getAbortionRG() { + return abortionRG; + } + + public void setAbortionRG(Integer abortionRG) { + this.abortionRG = abortionRG; + } + public String getPid() { return pid; } 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 23bd03b..4f8e6f3 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 @@ -194,6 +194,27 @@ public class AntExcAddRequest implements IBasicRequestConvert { //实验结果 private String syjg; + //自然流产 + private Integer abortionZR; + //人工流产 + private Integer abortionRG; + + public Integer getAbortionZR() { + return abortionZR; + } + + public void setAbortionZR(Integer abortionZR) { + this.abortionZR = abortionZR; + } + + public Integer getAbortionRG() { + return abortionRG; + } + + public void setAbortionRG(Integer abortionRG) { + this.abortionRG = abortionRG; + } + public String getBg() { return bg; } @@ -939,6 +960,9 @@ public class AntExcAddRequest implements IBasicRequestConvert { antExChuModel.setDueDate(DateUtil.parseYMD(dueDate)); } + antExChuModel.setAbortionRG(abortionRG); + antExChuModel.setAbortionZR(abortionZR); + 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 b86ef35..9fadf18 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 @@ -213,6 +213,27 @@ public class AntexChuResult { //是否有产筛 private int hasSieve; + //自然流产 + private Integer abortionZR; + //人工流产 + private Integer abortionRG; + + public Integer getAbortionZR() { + return abortionZR; + } + + public void setAbortionZR(Integer abortionZR) { + this.abortionZR = abortionZR; + } + + public Integer getAbortionRG() { + return abortionRG; + } + + public void setAbortionRG(Integer abortionRG) { + this.abortionRG = abortionRG; + } + public String getIsSieve() { return isSieve; } @@ -991,6 +1012,9 @@ public class AntexChuResult { setLastMenses(DateUtil.getyyyy_MM_dd(antExChuModel.getLastMenses())); } setcDueWeek(antExChuModel.getcDueWeek()); + + setAbortionZR(abortionZR); + setAbortionRG(abortionRG); } return this; }