Merge branch 'dev' of trick9191/wlyy2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/survey/WlyySurveyQuestionsOptionDO.java

@@ -17,6 +17,7 @@ public class WlyySurveyQuestionsOptionDO {
    private String id;
    private String questionCode;//题库问题编码',
    private String content;//选项内容',
    private Integer haveComment;//是否有备注，0没有，1有
    private Integer isRequired;//选项说明是否必填（0否 1是）',
    private Integer sort;//单题内排序',
    private String del;//删除标志（1正常，0删除）',
@@ -70,4 +71,12 @@ public class WlyySurveyQuestionsOptionDO {
    public void setDel(String del) {
        this.del = del;
    }
    public Integer getHaveComment() {
        return haveComment;
    }
    public void setHaveComment(Integer haveComment) {
        this.haveComment = haveComment;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/survey/WlyySurveyTemplateOptionDO.java

@@ -18,6 +18,7 @@ public class WlyySurveyTemplateOptionDO  {
    private String templateCode;//模板编码',
    private String questionCode;//模板问题编码',关联wlyy_survey_template_question
    private String content;//选项内容',
    private Integer haveComment;//是否有备注，0没有，1有
    private Integer isRequired;//选项说明是否必填（0否 1是）',
    private Integer score;//选项分值',
    private String questionCodeNext;//下一题问题编码（问答题逻辑跳转）',
@@ -106,4 +107,12 @@ public class WlyySurveyTemplateOptionDO  {
    public void setSort(Integer sort) {
        this.sort = sort;
    }
    public Integer getHaveComment() {
        return haveComment;
    }
    public void setHaveComment(Integer haveComment) {
        this.haveComment = haveComment;
    }
}

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/survey/WlyySurveyUserAnswerDO.java

@@ -18,6 +18,7 @@ public class WlyySurveyUserAnswerDO extends UuidIdentityEntity {
    private String tempQuestionCode;//问答题题目编码',
    private Integer questionType;//
    private String tempOptionCode;//问卷选项编码',
    private String comment;//选项的备注
    private String content;//问答题答案/选择题，问答题的中文',
    private String patient;//患者ID',
    private String patientName;//患者姓名',
@@ -96,4 +97,12 @@ public class WlyySurveyUserAnswerDO extends UuidIdentityEntity {
    public void setCreateTime(Date createTime) {
        this.createTime = createTime;
    }
    public String getComment() {
        return comment;
    }
    public void setComment(String comment) {
        this.comment = comment;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/survey/WlyySurveyQuestionsOptionVO.java

@@ -14,6 +14,8 @@ public class WlyySurveyQuestionsOptionVO extends UuidIdentityVO {
    private String questionCode;//题库问题编码',
    @ApiModelProperty(value = "选项内容", example = "模块1")
    private String content;//选项内容',
    @ApiModelProperty(value = "是否有备注，0没有，1有", example = "模块1")
    private String haveComment;
    @ApiModelProperty(value = "选项说明是否必填（0否 1是）", example = "模块1")
    private Integer isRequired;//选项说明是否必填（0否 1是）',
    @ApiModelProperty(value = "单题内排序", example = "模块1")
@@ -60,4 +62,12 @@ public class WlyySurveyQuestionsOptionVO extends UuidIdentityVO {
    public void setDel(String del) {
        this.del = del;
    }
    public String getHaveComment() {
        return haveComment;
    }
    public void setHaveComment(String haveComment) {
        this.haveComment = haveComment;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/survey/WlyySurveyTemplateOptionVO.java

@@ -16,6 +16,8 @@ public class WlyySurveyTemplateOptionVO extends UuidIdentityVO {
    private String questionCode;//模板问题编码',
    @ApiModelProperty(value = "选项内容", example = "模块1")
    private String content;//选项内容',
    @ApiModelProperty(value = "是否有备注，0没有，1有", example = "模块1")
    private String haveComment;
    @ApiModelProperty(value = "选项说明是否必填（0否 1是）", example = "模块1")
    private Integer isRequired;//选项说明是否必填（0否 1是）',
    @ApiModelProperty(value = "选项分值", example = "模块1")
@@ -100,4 +102,12 @@ public class WlyySurveyTemplateOptionVO extends UuidIdentityVO {
    public void setSort(Integer sort) {
        this.sort = sort;
    }
    public String getHaveComment() {
        return haveComment;
    }
    public void setHaveComment(String haveComment) {
        this.haveComment = haveComment;
    }
}