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

@@ -272,7 +272,7 @@ public class StatisticsESService {
                map.put("name", saveModel.getCityName());
            } else if (SaveModel.teamLevel.equals(lowLevel)) {
                map.put("code", saveModel.getTeam());
                map.put("name", saveModel.getCityName());
                map.put("name", saveModel.getTeamName());
            }
            if (!SaveModel.teamLevel.equals(lowLevel)) {
                if (org.springframework.util.StringUtils.isEmpty(year)) {
@@ -4036,8 +4036,8 @@ public class StatisticsESService {
                    return flag;
                }
            });
            startTime = DateUtil.dateToStr(dd.getTime(), "YYYY-MM-dd HH:mm:ss");
            endTime = DateUtil.dateToStr(new Date(), "YYYY-MM-dd HH:mm:ss");
            startTime = DateUtil.dateToStr(dd.getTime(), "YYYY-MM-dd 00:00:00");
            endTime = DateUtil.dateToStr(new Date(), "YYYY-MM-dd 00:00:00");
        }
        List<SaveModel> resultList = new ArrayList<>();

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

@@ -1650,7 +1650,7 @@ public class EsStatisticsController extends BaseController {
    }
    //=================================长处方分析===============================================
    //=================================长处方分析==============================================
    /**
     *年龄统计-下部列表（疾病维度）