Merge branch '2.0' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into 2.0

business/es-service/src/main/java/com/yihu/jw/es/util/ElasticsearchUtil.java

@@ -1310,7 +1310,7 @@ public class ElasticsearchUtil {
            }
        }
        sql.append(groupBy);
        //logger.info("sql:"+sql);
        logger.info("sql:"+sql);
        return excuteEs7(sql.toString(), SaveModel.class, "", "");
    }

starter/elasticsearch-starter/src/main/java/com/yihu/jw/elasticsearch/ElasticSearch7Pool.java

@@ -93,7 +93,7 @@ public class ElasticSearch7Pool {
    public ResultSet restHighLevelClientStream(String sql) throws Exception {
//        Connection connection = DriverManager.getConnection("jdbc:es://http://172.26.0.55:9200","elastic","elastic");
        Connection connection = DriverManager.getConnection("jdbc:es://http://172.26.0.168:9200/","root","jkzlehr");
        Connection connection = DriverManager.getConnection("jdbc:es://http://172.26.0.168:9200/","elastic","elastic");
//        Connection connection = DriverManager.getConnection("jdbc:es://" + hosts, userName, password);
        Statement statement = connection.createStatement();
        ResultSet resultSet = statement.executeQuery(sql);

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/statistics/EsStatisticsEndpoint.java

@@ -1263,7 +1263,7 @@ public class EsStatisticsEndpoint extends EnvelopRestEndpoint {
    /**
     * 获取【科室、医生】的接诊量接诊率排名
     * 参数：
     * 科室参数：strJson={"startDate":"2023-07-01","endDate":"2023-07-20","area":"350211A1002","level":4,"flag":"1"}
     * 科室参数：strJson={"startDate":"2023-07-01","endDate":"2023-07-20","area":"350211A1002","level":4,"deptCode":"1190000","flag":"1"}
     * 医生参数：strJson={"startDate":"2023-07-17","endDate":"2023-07-20","area":"","level":5,"flag":"1"}
     */
    @GetMapping(value = BaseHospitalRequestMapping.Statistics.getDeptOrDoctorVolumeList)

svr/svr-statistics-hlw/src/main/resources/application.yml

@@ -744,7 +744,8 @@ es:
  pwflag: 1 # 1需要密码，0不需要密码
  index: hlw_quota_test
  type: hlw_quota_test
  host: http://172.26.0.55:9200
#  host: http://172.26.0.55:9200
  host: http://172.26.0.168:9200
  tHost: 172.26.0.55:9300
  clusterName: jkzl
  securityUser: elastic:elastic