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

common/common-entity/src/main/java/com/yihu/jw/base/wx/WxGraphicMessageDO.java

@@ -16,7 +16,7 @@ import java.util.Date;
@Table(name = "wx_graphic_message")
public class WxGraphicMessageDO extends IdEntityWithOperation implements java.io.Serializable {
    private String saasId;
    private String code;
    private String title;//标题
    private String description;//描述
    private String url;//图文消息url值
@@ -24,25 +24,6 @@ public class WxGraphicMessageDO extends IdEntityWithOperation implements java.io
    private String remark;//备注
    private Integer status;  //状态 -1删除 0 冻结 1可用
    public WxGraphicMessageDO() {
    }
    public WxGraphicMessageDO(String code, String title, String description, String url, String picUrl, String createUser, String createUserName, Date createTime, String updateUser, String updateUserName, Date updateTime, String remark, Integer status) {
        this.title = title;
        this.description = description;
        this.url = url;
        this.picUrl = picUrl;
        this.createUser = createUser;
        this.createUserName = createUserName;
        this.createTime = createTime;
        this.updateUser = updateUser;
        this.updateUserName = updateUserName;
        this.updateTime = updateTime;
        this.remark = remark;
        this.status = status;
    }
    @Column(name = "title", length = 200)
    public String getTitle() {
        return title;
@@ -102,12 +83,12 @@ public class WxGraphicMessageDO extends IdEntityWithOperation implements java.io
        this.status = status;
    }
    @Column(name = "saas_id", length = 50)
    public String getSaasId() {
        return saasId;
    @Column(name = "code", length = 50)
    public String getCode() {
        return code;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    @Column(name = "code", length = 50)
    public void setCode(String code) {
        this.code = code;
    }
}

common/common-entity/src/main/java/com/yihu/jw/base/wx/WxTemplateDO.java

@@ -22,6 +22,7 @@ public class WxTemplateDO extends IdEntityWithOperation implements java.io.Seria
    @Transient
    private String wechatName;
    private String templateId;//微信模板id
    private String templateName;//模板名称（模板检索名称）
    private String content;//模板内容
    private String remark;
    private Integer status;  //状态 -1删除 0 冻结 1可用
@@ -59,8 +60,16 @@ public class WxTemplateDO extends IdEntityWithOperation implements java.io.Seria
        this.templateId = templateId;
    }
    @Column(name="content")
    @Column(name="template_name")
    public String getTemplateName() {
        return templateName;
    }
    public void setTemplateName(String templateName) {
        this.templateName = templateName;
    }
    @Column(name="content")
    public String getContent() {
        return content;
    }

common/common-entity/src/main/java/com/yihu/jw/base/wx/WxWechatDO.java

@@ -20,7 +20,6 @@ import java.util.Map;
public class WxWechatDO extends IdEntityWithOperation implements java.io.Serializable {
    // Fields
    private String saasId;//'saas配置id'
    private String name;//名称
    private String token;//token
    private String encodingAesKey;//加密密钥
@@ -38,25 +37,6 @@ public class WxWechatDO extends IdEntityWithOperation implements java.io.Seriali
    @Transient
    private String state;
    public WxWechatDO(String code, String saasId, String name, String token, String encodingAesKey, Integer encType, Integer status, String type, String appId, String appSecret, String baseUrl, String createUser, String createUserName, Date createTime, String updateUser, String updateUserName, Date updateTime, String remark) {
        this.saasId = saasId;
        this.name = name;
        this.token = token;
        this.encodingAesKey = encodingAesKey;
        this.encType = encType;
        this.status = status;
        this.type = type;
        this.appId = appId;
        this.appSecret = appSecret;
        this.baseUrl = baseUrl;
        this.createUser = createUser;
        this.createUserName = createUserName;
        this.createTime = createTime;
        this.updateUser = updateUser;
        this.updateUserName = updateUserName;
        this.updateTime = updateTime;
        this.remark = remark;
    }
    /**
     * default constructor
     */
@@ -98,15 +78,6 @@ public class WxWechatDO extends IdEntityWithOperation implements java.io.Seriali
        this.encodingAesKey = encodingAesKey;
    }
    @Column(name = "saas_id", length = 50)
    public String getSaasId() {
        return this.saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    @Column(name = "name", length = 200)
    public String getName() {
        return this.name;

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/SpecialistService.java

@@ -125,7 +125,7 @@ public class SpecialistService{
                "  SELECT " +
                "   i.patient " +
                "  FROM " +
                "   wlyy.wlyy_sign_patient_label_info i " +
                "   "+basedb+".wlyy_sign_patient_label_info i " +
                "  WHERE " +
                "   i.label_type = '7' AND " +
                "   i.status = 1 " +
@@ -516,9 +516,9 @@ public class SpecialistService{
                " md.name AS doctorName" +
                " FROM " +
                " wlyy_specialist_patient_relation r  " +
                " JOIN wlyy.wlyy_admin_team t ON t.id = r.team_code " +
                " JOIN wlyy.wlyy_doctor d ON t.leader_code = d.`code` " +
                " JOIN wlyy.wlyy_doctor md ON md.code = r.doctor " +
                " JOIN "+basedb+".wlyy_admin_team t ON t.id = r.team_code " +
                " JOIN "+basedb+".wlyy_doctor d ON t.leader_code = d.`code` " +
                " JOIN "+basedb+".wlyy_doctor md ON md.code = r.doctor " +
                " WHERE " +
                " r.patient = '"+patient+"' " +
                " AND r.`status` >=0  " +
@@ -558,7 +558,7 @@ public class SpecialistService{
                " d.`level` " +
                " FROM " +
                " wlyy_specialist_patient_relation r " +
                " JOIN wlyy.wlyy_doctor d ON r.doctor = d.`code` " +
                " JOIN "+basedb+".wlyy_doctor d ON r.doctor = d.`code` " +
                " WHERE  " +
                " r.patient ='"+patient+"' " +
                " AND r.`status`>=0 " +
@@ -586,7 +586,7 @@ public class SpecialistService{
                " d.`level` " +
                " FROM " +
                " wlyy_specialist_patient_relation r " +
                " JOIN wlyy.wlyy_doctor d ON r.doctor = d.`code` " +
                " JOIN "+basedb+".wlyy_doctor d ON r.doctor = d.`code` " +
                " WHERE  " +
                " r.patient ='"+patient+"' " +
                " AND r.doctor ='"+doctor+"' " +