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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statisticsES/StatisticsESService.java

@@ -4013,7 +4013,7 @@ public class StatisticsESService {
        Date startDate = DateUtil.getNextMonthReturnDate(endDate, -6);
        startDate = DateUtil.getDateShort(startDate);
        if (interval == 1) {
            rs = DateUtil.findDates(startDate, endDate);
            rs = DateUtil.findDates(startDate, DateUtil.getDateShort(endDate));
            //加入当天数据
            Map<String, Object> dateMap = new HashedMap();
            dateMap.put("date", dateFormat.format(endDate));