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

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/specialist/PatientLabelVO.java

@@ -31,6 +31,8 @@ public class PatientLabelVO {
    private String healthAssistant;
    @ApiModelProperty("计管师姓名")
    private String healthAssistantName;
    @ApiModelProperty("是否被家签管理（1管理，0未管理）")
    private String isManage;
    public String getCode() {
        return code;
@@ -127,4 +129,12 @@ public class PatientLabelVO {
    public void setHealthAssistantName(String healthAssistantName) {
        this.healthAssistantName = healthAssistantName;
    }
    
    public String getIsManage() {
        return isManage;
    }
    
    public void setIsManage(String isManage) {
        this.isManage = isManage;
    }
}

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

@@ -205,7 +205,8 @@ public class SpecialistService{
                " lb.labelName as health, " +
                " lb.label AS healthcode ," +
                " s.health_assistant AS healthAssistant," +
                " s.health_assistant_name AS healthAssistantName" +
                " s.health_assistant_name AS healthAssistantName," +
                " s.is_manage AS isManage" +
                " FROM " +
                " ( " +
                "  SELECT " +
@@ -237,7 +238,8 @@ public class SpecialistService{
                    "d.label_name AS health," +
                    "d.label AS healthcode," +
                    "a.health_assistant AS healthAssistant," +
                    "a.health_assistant_name AS healthAssistantName " +
                    "a.health_assistant_name AS healthAssistantName, " +
                    "a.is_manage AS isManage " +
                    "FROM wlyy_specialist.wlyy_specialist_patient_relation a " +
                    "JOIN "+basedb+".wlyy_patient_disease_server b ON a.id=b.specialist_relation_code AND b.disease=" +labelCode+" and b.del=1 "+
                    "JOIN "+basedb+".wlyy_patient c ON a.patient=c.CODE " +
@@ -257,6 +259,7 @@ public class SpecialistService{
                    "c.photo," +
                    "a.health_assistant AS healthAssistant," +
                    "a.health_assistant_name AS healthAssistantName " +
                    "a.is_manage AS isManage, " +
                    "FROM wlyy_specialist.wlyy_specialist_patient_relation a " +
                    "JOIN "+basedb+".wlyy_patient c ON a.patient=c.CODE " +
                    " WHERE a.sign_status> 0 AND a.`status`>=0 AND (a.is_manage = 0 or a.is_manage is null)" +