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

business/es-service/src/main/java/com/yihu/jw/es/service/StatisticsEsService.java

@@ -123,7 +123,7 @@ public class StatisticsEsService {
        if (level==4){
            sql += " and o.doctor IN (SELECT doctor_code FROM `base_doctor_hospital` dh where dh.org_code ='"+area+"' and dh.del=1)";
        }if (level==2){
            sql += " 1=1 ";
            sql += " AND 1=1 ";
        }else if (level==5){
            sql += " and o.doctor IN (SELECT doctor_code FROM `base_doctor_hospital` dh where dh.dept_code ='"+area+"' and dh.del=1)";
        }else if (level==6){