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

common/common-entity/src/main/java/com/yihu/jw/entity/hospital/prescription/WlyyOutpatientDO.java

@@ -179,6 +179,11 @@ public class WlyyOutpatientDO extends UuidIdentityEntity {
	 */
	private String status;
    /**
     * 1已经评价，0或其他未评价
     */
    private String evaluateStatus;
	@Column(name = "adm_no")
    public String getAdmNo() {
@@ -451,4 +456,13 @@ public class WlyyOutpatientDO extends UuidIdentityEntity {
    public void setRegisterDate(Date registerDate) {
        this.registerDate = registerDate;
    }
    @Column(name="evaluate_status")
    public String getEvaluateStatus() {
        return evaluateStatus;
    }
    public void setEvaluateStatus(String evaluateStatus) {
        this.evaluateStatus = evaluateStatus;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/hospital/prescription/WlyyOutpatientVO.java

@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.util.List;
/**
@@ -192,6 +193,11 @@ public class WlyyOutpatientVO extends UuidIdentityVO {
    @ApiModelProperty(value = "生日", example = "模块1")
    private Date birthday;
    /**
     * 1已经评价，0或其他未评价
     */
    @ApiModelProperty(value = "1已经评价，0或其他未评价", example = "模块1")
    private String evaluateStatus;
    public String getAdmNo() {
        return admNo;
@@ -415,4 +421,12 @@ public class WlyyOutpatientVO extends UuidIdentityVO {
    public void setBirthday(Date birthday) {
        this.birthday = birthday;
    }
    public String getEvaluateStatus() {
        return evaluateStatus;
    }
    public void setEvaluateStatus(String evaluateStatus) {
        this.evaluateStatus = evaluateStatus;
    }
}