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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/third/jkedu/service/EduArticleService.java

@@ -288,7 +288,7 @@ public class EduArticleService {
    }
    /**
     * 数据转移至Es
     * 数据转移至Es.
     * @return
     */
    public boolean getArticleSendedListToEs(){
@@ -402,7 +402,8 @@ public class EduArticleService {
                    " LEFT JOIN wlyy_patient p ON ap.patient = p.code " +
                    " LEFT JOIN wlyy_admin_team t ON ap.admin_team_code = t.id" +
                    " WHERE " +
                    " ap.admin_team_code IS NOT NULL GROUP BY ap.batch_no ORDER BY ap.czrq ASC ";
                    " ap.admin_team_code IS NOT NULL GROUP BY ap.batch_no ORDER BY createTime ASC ";
            System.out.println("userType2========="+BartchNoSql);
            List<Map<String,Object>> batchList = jdbcTemplate.queryForList(BartchNoSql);
            List<HealthEduArticleES> batchEsList = new ArrayList<>();
            if (batchList!=null && batchList.size()>0){
@@ -544,7 +545,7 @@ public class EduArticleService {
            BoolQueryBuilder boolQueryBuilder =  new BoolQueryBuilder();
            boolQueryBuilder.mustNot(QueryBuilders.matchQuery("userType",1));
            boolQueryBuilder.mustNot(QueryBuilders.matchQuery("userType",2));
            searchSourceBuilder.query(boolQueryBuilder).size(10000);//一次取10000条
            searchSourceBuilder.query(boolQueryBuilder).size(100000);//一次取100000条
            Search search = new Search.Builder(searchSourceBuilder.toString()).addIndex(esIndex).addType(esType)
                    .build();