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

@@ -747,7 +747,7 @@ public class EduArticleService {
    }
    /**
     * 根据批次号batchNo删除es数据
     * 根据批次号batchNo删除es数据.
     *
     * @param batchNo
     */
@@ -872,7 +872,7 @@ public class EduArticleService {
                    healthEduArticleES.setAdminTeamCode(adminTeam.getId());
                }
                healthEduArticleES.setAllCount(healthEduArticlePatients.size());
                healthEduArticleES.setCreateTime(new Date());
                healthEduArticleES.setCreateTime(healthEduArticlePatient.getCzrq());
                healthEduArticleES.setUserType(1);
                healthEduArticleES.setOperatorId(wjwCode);
                healthEduArticleES.setArticleSource("厦门市卫生与计划生育委员会");
@@ -902,7 +902,13 @@ public class EduArticleService {
        for (String doctorCode : doctorCodeArr) {
            net.sf.json.JSONObject o = new net.sf.json.JSONObject();
            //删除医生的推送记录
            deleteEsDataByDoctor(doctorCode);
            List<Map<String,Object>> list = new ArrayList<>();
            String batchNoSql = "SELECT batch_no FROM wlyy_health_edu_article_patient_copy where doctor ='"+doctorCode+"' GROUP BY batch_no";
            list =jdbcTemplate.queryForList(batchNoSql);
            for (Map<String,Object> map : list){
                deleteEsDataByBatch(String.valueOf(map.get("batch_no")));
            }
            //deleteEsDataByDoctor(doctorCode);
            //新增医生的推送记录
            Integer size = saveByDoctor(doctorCode);
            o.put("saveEsSize", size);
@@ -1078,7 +1084,7 @@ public class EduArticleService {
                    healthEduArticleES.setAdminTeamName(adminTeam.getName());
                }
                healthEduArticleES.setCreateTime(new Date());
                healthEduArticleES.setCreateTime(healthEduArticlePatient.getCzrq());
                healthEduArticleES.setUserType(1);//患者
                healthEduArticleES.setAllCount(healthEduArticlePatientTemps.size());
                healthEduArticleESSaveList.add(healthEduArticleES);