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

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

@@ -4430,7 +4430,9 @@ public class StatisticsService extends BaseService {
        if (total == null) {
            return null;
        }
        if(lowlevel==null){
            lowlevel=(level-1)+"";
        }
        result.put("resultList", getCoutList(Integer.valueOf(lowlevel),rely, total, onRely));
        return result;
    }

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/statistic/StatisticsController.java

@@ -659,15 +659,14 @@ public class StatisticsController extends BaseController {
                                              @RequestParam(required = false) String lowlevel,
                                              @RequestParam(required = false) String year) {
        try {
            if (org.springframework.util.StringUtils.isEmpty(lowlevel)){
                lowlevel=level-1+"";
            }
            JSONObject data = null;
            if (Constant.getNowYear().equals(year)) {
                data = statisticsService.getConsultingStatisticsList(level, area, lowlevel);
            } else if (org.springframework.util.StringUtils.isEmpty(year)) {
                data = statisticsService.getConsultingStatisticsListAll(level, area, lowlevel, year);
            } else {
                data = statisticsService.getConsultingStatisticsListYear(level, area, lowlevel, year);
            }
            if (data != null) {