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

patient-co/patient-co-wlyy-job/src/main/resources/application-prod.yml

@@ -83,7 +83,7 @@ images:
sign:
  check_upload: http://59.61.92.90:8072/wlyy_service
  check_upload: http://59.61.92.90:8087/wlyy_service

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

@@ -82,7 +82,9 @@ public class DoctorSchemeService {
        sql = sql+ " 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;
            sql = sql + " and (p.disease ="+disease+" or p.disease = 3) ";
        }else{
            sql = sql + " and p.disease >0 ";
        }
        if(StringUtils.isNotBlank(diseaseCondition) && !"-1".equals(diseaseCondition)){