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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/util/ElasticsearchUtil.java

@@ -507,7 +507,7 @@ public class ElasticsearchUtil {
     * @param level     等级 1 省 2 市 3 区县 4 机构 5团队
     * @param index     指标code
     * @param timelevel // 1日 2年
     * @param slaveKey1  一级维度的key
     * @param slaveKey1  一级维度的key 不传返回全部
     * @return
     */
    public SaveModel findOneDateQuotaLevel1(String quotaDate, String area, int level, String index, String timelevel, String slaveKey1) throws Exception {
@@ -547,9 +547,9 @@ public class ElasticsearchUtil {
     * @return
     * @throws Exception
     */
    public SaveModel findLineChartDateQuotaLevel0(String startDate,String endDate,  String area, int level, String index, String timelevel,String interval) throws Exception {
    public List<SaveModel> findLineChartDateQuotaLevel0(String startDate,String endDate,  String area, int level, String index, String timelevel,String interval) throws Exception {
        List list = findDateQuotaLevel0(startDate, endDate, area, level, index, timelevel, interval, null);
        return (SaveModel) list.get(0);
        return list;
    }
    /**
     * 折线图
@@ -566,9 +566,9 @@ public class ElasticsearchUtil {
     * @param slaveKey1  一级维度的key
     * @return
     */
    public SaveModel findLineChartDateQuotaLevel1(String startDate,String endDate,  String area, int level, String index, String timelevel,String interval, String slaveKey1) throws Exception {
    public  List<SaveModel>  findLineChartDateQuotaLevel1(String startDate,String endDate,  String area, int level, String index, String timelevel,String interval, String slaveKey1) throws Exception {
        List list = findDateQuotaLevel1(startDate, endDate, area, level, index, timelevel,slaveKey1, interval, null);
        return (SaveModel) list.get(0);
        return list;
    }
    /**
     * 折线图
@@ -586,9 +586,9 @@ public class ElasticsearchUtil {
     * @param slaveKey2  二级维度的key
     * @return
     */
    public SaveModel findLineChartDateQuotaLevel2(String startDate,String endDate,  String area, int level, String index, String timelevel,String interval, String slaveKey1, String slaveKey2) throws Exception {
    public  List<SaveModel>  findLineChartDateQuotaLevel2(String startDate,String endDate,  String area, int level, String index, String timelevel,String interval, String slaveKey1, String slaveKey2) throws Exception {
        List list = findDateQuotaLevel2(startDate, endDate, area, level, index, timelevel,slaveKey1,slaveKey2, interval, null);
        return (SaveModel) list.get(0);
        return list;
    }
    /**
@@ -605,9 +605,8 @@ public class ElasticsearchUtil {
     * @return
     * @throws Exception
     */
    public SaveModel findListDateQuotaLevel0(String quotaDate,  String area, int level, String index, String timelevel, String lowLevel) throws Exception {
        List list = findDateQuotaLevel0(quotaDate, quotaDate, area, level, index, timelevel, null, lowLevel);
        return (SaveModel) list.get(0);
    public  List<SaveModel>  findListDateQuotaLevel0(String quotaDate,  String area, int level, String index, String timelevel, String lowLevel) throws Exception {
        List list = findDateQuotaLevel0(quotaDate, quotaDate, area, level, index, timelevel, null, lowLevel); return list;
    }
    /**
     * 列表
@@ -623,9 +622,9 @@ public class ElasticsearchUtil {
     * @param slaveKey1  一级维度的key
     * @return
     */
    public SaveModel findListDateQuotaLevel1(String quotaDate,  String area, int level, String index, String timelevel,String lowLevel, String slaveKey1) throws Exception {
    public  List<SaveModel>  findListDateQuotaLevel1(String quotaDate,  String area, int level, String index, String timelevel,String lowLevel, String slaveKey1) throws Exception {
        List list = findDateQuotaLevel1(quotaDate, quotaDate, area, level, index, timelevel,slaveKey1, null, lowLevel);
        return (SaveModel) list.get(0);
        return list;
    }
    /**
     * 列表
@@ -642,8 +641,8 @@ public class ElasticsearchUtil {
     * @param slaveKey2  二级维度的key
     * @return
     */
    public SaveModel findListDateQuotaLevel2(String quotaDate,  String area, int level, String index, String timelevel,String lowLevel, String slaveKey1, String slaveKey2) throws Exception {
    public  List<SaveModel>  findListDateQuotaLevel2(String quotaDate,  String area, int level, String index, String timelevel,String lowLevel, String slaveKey1, String slaveKey2) throws Exception {
        List list = findDateQuotaLevel2(quotaDate, quotaDate, area, level, index, timelevel,slaveKey1,slaveKey2, null, lowLevel);
        return (SaveModel) list.get(0);
        return list;
    }
}