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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statistics/StatisticsService.java

@@ -287,7 +287,7 @@ public class StatisticsService extends BaseService {
            sql+=" and level2_type = '"+level2_type+"'";
        }
        sql+=   " group by " + lowLevelField + "," + lowLevelName;
        sql+=   " group by " + lowLevelField ;//+ "," + lowLevelName;
        if (sort == 1) {
            sql += " order by amount desc";
@@ -498,7 +498,8 @@ public class StatisticsService extends BaseService {
                "   and quota_date >= ? " +
                "   and quota_date <= ? " +
                "   and " + areaField + " = ? " +
                " group by " + lowLevelField + "," + lowLevelName;
                " group by " + lowLevelField ;
                //+ "," + lowLevelName; 加上名称group by会影响下面流程 团队如果改名字 数据会被覆盖
        if (sort == 1) {
            sql += " order by amount desc";