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

patient-co/patient-co-wlyy-job/src/main/resources/application-test.yml

@@ -110,7 +110,7 @@ activemq:
  password: admin
  url: tcp://172.19.103.87:61616
  queue:
    healtHarticleQueue: healthArticleChannel_dev  #健康文章推送
    healtHarticleQueue: healthArticleChannel_test  #健康文章推送
  consumers:
    count: 10 #消费者集群数

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

@@ -2121,7 +2121,7 @@ public class EsStatisticsController extends BaseController {
                lowLevel = elasticsearchUtil.changeLevel(Integer.parseInt(lowLevel)) + "";
            }
            JSONObject result = new JSONObject();
            result.put("",statisticsESService.getArticleLowlevelTotal(endDate, area, level, sort, lowLevel, level2_type, year));
            result.put("index_83_84",statisticsESService.getArticleLowlevelTotal(endDate, area, level, sort, lowLevel, level2_type, year));
            return write(200, "查询成功", "data", result);
        } catch (Exception e) {
            e.printStackTrace();