diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java index b275292..fb02b04 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/CervicalCancerModel.java @@ -117,10 +117,22 @@ public class CervicalCancerModel extends BaseModel { //宫颈细胞学结果异常 结果 private String gjxbxResult; - //HPV 检查阳性 1 无 2 有 - private String hpv; - //HPV 检查阳性 有的注明结果 - private String hpvResult; + //HPV 1 阴性 2 阳 3 未查 + private Integer hpv; + //HPV分型 1未分型 2 HPV亚型 + private Integer hpvResult; + //HPV亚型 1 16型 2 18型 3 31型 4 33型 5 35型 6 45型 7 52型 8 58型 9 其他 + private Integer hpvSelect; + + //HPV 进一步检查 1 宫颈细胞学 2 VIA/VILI 3 阴道镜 4 不需要进一步检查 + private Integer hpvNext; + + //HPV 检查机构id + private String hpvHid; + //HPV 人员id + private String hpvUserId; + //HPV 日期 + private String hpvDate; //CIN 1 无 2 有 @@ -747,22 +759,62 @@ public class CervicalCancerModel extends BaseModel { this.gjxbxResult = gjxbxResult; } - public String getHpv() { + public Integer getHpv() { return hpv; } - public void setHpv(String hpv) { + public void setHpv(Integer hpv) { this.hpv = hpv; } - public String getHpvResult() { + public Integer getHpvResult() { return hpvResult; } - public void setHpvResult(String hpvResult) { + public void setHpvResult(Integer hpvResult) { this.hpvResult = hpvResult; } + public Integer getHpvSelect() { + return hpvSelect; + } + + public void setHpvSelect(Integer hpvSelect) { + this.hpvSelect = hpvSelect; + } + + public Integer getHpvNext() { + return hpvNext; + } + + public void setHpvNext(Integer hpvNext) { + this.hpvNext = hpvNext; + } + + public String getHpvHid() { + return hpvHid; + } + + public void setHpvHid(String hpvHid) { + this.hpvHid = hpvHid; + } + + public String getHpvUserId() { + return hpvUserId; + } + + public void setHpvUserId(String hpvUserId) { + this.hpvUserId = hpvUserId; + } + + public String getHpvDate() { + return hpvDate; + } + + public void setHpvDate(String hpvDate) { + this.hpvDate = hpvDate; + } + public String getCin() { return cin; }