Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

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

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

@@ -759,7 +759,7 @@ public class EduArticleService {
            List<Map<String, Object>> returnList = elasticsearchUtil.excuteDataModel(sql);
            //根据id批量删除
            for (Map<String, Object> obj : returnList) {
                if (obj.containsKey("id")) {
                if (obj.containsKey("_id")) {
                    i++;
                    Delete index = new Delete.Builder(obj.get("id").toString()).build();
                    bulk.addAction(index);
@@ -925,7 +925,7 @@ public class EduArticleService {
            List<Map<String, Object>> returnList = elasticsearchUtil.excuteDataModel(sql);
            //根据id批量删除
            for (Map<String, Object> obj : returnList) {
                if (obj.containsKey("id")) {
                if (obj.containsKey("_id")) {
                    i++;
                    Delete index = new Delete.Builder(obj.get("id").toString()).build();
                    bulk.addAction(index);
@@ -1147,7 +1147,7 @@ public class EduArticleService {
    public Map<String, Object> deleteEsOldArticlePatient() throws Exception {
        Map<String, Object> returnMap = new HashMap<>();
        String sql = "select batch_no code from wlyy_health_edu_article_patient_copy group by batch_no";
        String sql = "select batch_no code from wlyy_health_edu_article_patient_copy WHERE admin_team_code IS NOT NULL AND batch_no IS NOT NULL group by batch_no";
        List<Map<String, Object>> queryids = jdbcTemplate.queryForList(sql);
        List<String> ids = queryids.stream().map(one -> one.containsKey("code") ? one.get("code").toString() : "").collect(Collectors.toList());
        int count = deleteEsByBatchNo(ids);
@@ -1169,8 +1169,8 @@ public class EduArticleService {
                List<Map<String, Object>> returnList = elasticsearchUtil.excuteDataModel(sql);
                //根据id批量删除
                for (Map<String, Object> obj : returnList) {
                    if (obj.containsKey("id")) {
                        Delete index = new Delete.Builder(obj.get("id").toString()).build();
                    if (obj.containsKey("_id")) {
                        Delete index = new Delete.Builder(obj.get("_id").toString()).build();
                        bulk.addAction(index);
                        i++;
                    }