代码修改

svr/svr-resource/pom.xml

@@ -95,24 +95,24 @@
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-rest-model</artifactId>
            <artifactId>swagger-starter</artifactId>
            <version>${version.wlyy-common}</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>commons-data-redis</artifactId>
            <artifactId>common-rest-model</artifactId>
            <version>${version.wlyy-common}</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>common-entity</artifactId>
            <artifactId>commons-data-redis</artifactId>
            <version>${version.wlyy-common}</version>
            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.yihu.jw</groupId>
            <artifactId>es-service</artifactId>
            <artifactId>common-entity</artifactId>
            <version>${version.wlyy-common}</version>
        </dependency>

svr/svr-resource/src/main/java/com/yihu/jw/resource/service/ResourceCenterService.java

@@ -1,10 +1,10 @@
package com.yihu.jw.resource.service;
import com.yihu.jw.entity.ehr.dict.SystemDictEntry;
import com.yihu.jw.es.util.ElasticsearchUtil;
//import com.yihu.jw.es.util.ElasticsearchUtil;
import com.yihu.mysql.query.BaseJpaService;
import org.apache.commons.lang.StringUtils;
import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
//import org.elasticsearch.search.aggregations.bucket.histogram.DateHistogramInterval;
import org.hibernate.FlushMode;
import org.hibernate.Query;
import org.hibernate.SQLQuery;
@@ -23,8 +23,8 @@ import java.util.*;
@Service
public class ResourceCenterService extends BaseJpaService {
    @Autowired
    private ElasticsearchUtil elasticSearchUtil;
//    @Autowired
//    private ElasticsearchUtil elasticSearchUtil;
    // ------------------------------- 统计相关 start ------------------------------------