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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/jimeiJkEdu/JMJkEduArticleService.java

@@ -563,6 +563,7 @@ public class JMJkEduArticleService extends BaseService {
            roleVoLists.add(roleVo);
        }
        JSONObject article = thirdJkEduArticleService.getArticalById(articleId,"");
        Date createTime = new Date();
        for (String patient : patientSet) {
            one = patientDao.findByCode(patient);
@@ -593,7 +594,7 @@ public class JMJkEduArticleService extends BaseService {
            healthEduArticleES.setHospitalName(doctor.getHospitalName());
            healthEduArticleES.setTown(doctor.getTown());
            healthEduArticleES.setTownName(doctor.getTownName());
            healthEduArticleES.setCreateTime(new Date());
            healthEduArticleES.setCreateTime(createTime);
            healthEduArticleES.setSendType(sendType);
            healthEduArticleES.setArticleId(article.get("articleId") + "");