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

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

@@ -504,7 +504,8 @@ public class EsStatisticsController extends BaseController {
            if (index != null) {
                for (String idx : indexes) {
                    if (org.springframework.util.StringUtils.isEmpty(year)) {
                        year = Constant.getNowYear();
                        year =  Constant.getNowYearByDate(endDate);
                    }
                    if ("13".equals(idx)) {
                        idx = "1";