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

@@ -1135,7 +1135,9 @@ public class JMJkEduArticleService extends BaseService {
            heapm.setCreateTime(DateUtil.dateToStrLong(one.getCreateTime()));
            heapm.setArticleId(article.containsKey("articleId")?article.getString("articleId"):"");
            heapm.setAttachedTitle(article.containsKey("articleTitle")?article.getString("articleTitle"):"");
            heapm.setAttachedContent(article.containsKey("articleContent")?article.getString("articleContent"):"");
            String articleContent = article.containsKey("articleContent")?article.getString("articleContent").replaceAll("</?[^>]+>", ""):"";
            heapm.setAttachedContent(articleContent.length()>0?(articleContent.length()>40?articleContent.substring(0,40):articleContent):"");
            heapm.setArticleType(article.containsKey("articleType")?article.getString("articleType"):"");
            heapm.setLevel1Type(article.containsKey("firstLevelCategoryId")?article.getString("firstLevelCategoryId"):"");
            heapm.setLevel2Type(article.containsKey("secondLevelCategoryId")?article.getString("secondLevelCategoryId"):"");