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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/scheme/DoctorSchemeService.java

@@ -79,7 +79,7 @@ public class DoctorSchemeService {
            sql = sql + " LEFT JOIN wlyy_patient_device dev on dev.user = p.code ";
        }
        sql = sql+ " LEFT wlyy_sign_family sf on sf.patient = p.code where sf.admin_team_code = "+teamCode;
        sql = sql+ " LEFT JOIN wlyy_sign_family sf on sf.patient = p.code where sf.admin_team_code = "+teamCode;
        if(-1 != disease){
            sql = sql + " and (p.disease ="+disease+" or p.disease = 3) ";