diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveDetailResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveDetailResult.java index 9ae8222..510de9f 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveDetailResult.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveDetailResult.java @@ -36,13 +36,13 @@ public class SieveDetailResult { //末次月经 private String lastMenses; //产前诊断结果 - private Integer cqResult; + private Integer diaresult; - private String cqResultText; + private String diaresultText; //妊娠结局 - private Integer renShenResult; + private Integer pregnancyOutcome; - private String renShenResultText; + private String pregnancyOutcomeText; //1 待产筛 2 产筛中 3 完成产筛 4 完成产诊 private Integer status; @@ -53,8 +53,20 @@ public class SieveDetailResult { //录入人员 private String publishName; - public String getCqResultText() { - return cqResultText; + public Integer getDiaresult() { + return diaresult; + } + + public void setDiaresult(Integer diaresult) { + this.diaresult = diaresult; + } + + public String getDiaresultText() { + return diaresultText; + } + + public void setDiaresultText(String diaresultText) { + this.diaresultText = diaresultText; } public String getId() { @@ -73,16 +85,20 @@ public class SieveDetailResult { this.parentId = parentId; } - public void setCqResultText(String cqResultText) { - this.cqResultText = cqResultText; + public Integer getPregnancyOutcome() { + return pregnancyOutcome; + } + + public void setPregnancyOutcome(Integer pregnancyOutcome) { + this.pregnancyOutcome = pregnancyOutcome; } - public String getRenShenResultText() { - return renShenResultText; + public String getPregnancyOutcomeText() { + return pregnancyOutcomeText; } - public void setRenShenResultText(String renShenResultText) { - this.renShenResultText = renShenResultText; + public void setPregnancyOutcomeText(String pregnancyOutcomeText) { + this.pregnancyOutcomeText = pregnancyOutcomeText; } public Integer getAge() { @@ -93,13 +109,6 @@ public class SieveDetailResult { this.age = age; } - public Integer getCqResult() { - return cqResult; - } - - public void setCqResult(Integer cqResult) { - this.cqResult = cqResult; - } public String getDiaTime() { return diaTime; @@ -165,13 +174,6 @@ public class SieveDetailResult { this.remarks = remarks; } - public Integer getRenShenResult() { - return renShenResult; - } - - public void setRenShenResult(Integer renShenResult) { - this.renShenResult = renShenResult; - } public List getRiskFactor() { return riskFactor; @@ -239,13 +241,13 @@ public class SieveDetailResult { private String publishName;*/ setId(sieveModel.getId()); setParentId(sieveModel.getParentId()); - setCqResult(sieveModel.getCqResult()); + setDiaresult(sieveModel.getCqResult()); if(null!=sieveModel.getCqResult()){ - setCqResultText(ChanQResultEnums.getTitle(sieveModel.getCqResult())); + setDiaresultText(ChanQResultEnums.getTitle(sieveModel.getCqResult())); } - setRenShenResult(sieveModel.getRenShenResult()); + setPregnancyOutcome(sieveModel.getRenShenResult()); if(null!=sieveModel.getRenShenResult()){ - setRenShenResultText(RenShenJieJuEnums.getTitle(sieveModel.getRenShenResult())); + setPregnancyOutcomeText(RenShenJieJuEnums.getTitle(sieveModel.getRenShenResult())); } setStatus(sieveModel.getStatus()); setDiaTime(sieveModel.getDiaTime());