Merge branch 'dev' of linzhuo/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/entity/message/SMS.java

@@ -37,11 +37,11 @@ public class SMS extends IdEntity {
        this.userCode = userCode;
    }
    public int getUserType() {
    public Integer getUserType() {
        return userType;
    }
    public void setUserType(int userType) {
    public void setUserType(Integer userType) {
        this.userType = userType;
    }

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/health/HealthEduArticlePatientService.java

@@ -122,9 +122,9 @@ public class HealthEduArticlePatientService extends BaseService {
                (wheaType > 0 ? " and a.wheaType = ? " : "") +
                " order by a.id desc limit 0," + pagesize;
        Object params[] = null;
        if(wheaType>0&&id>0){
        if(wheaType>-1&&id>0){
            params = new Object[]{patient,id,wheaType};
        }else if(wheaType>0&&id<0){
        }else if(wheaType>-1&&id<0){
            params = new Object[]{patient,wheaType};
        }
        else if(wheaType<0&&id>0){