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

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/patient/health/HealthEduArticleController.java

@@ -106,7 +106,7 @@ public class HealthEduArticleController extends BaseController {
	}
	/**
	 * 查询文章列表
	 * @param id 数据文章唯一标示article
	 * @param article 数据文章唯一标示article
	 * @return 列表
	 */
	@RequestMapping(value = "article")
@@ -167,6 +167,7 @@ public class HealthEduArticleController extends BaseController {
	private String parsrHtml(String html) throws ParserException {
		Parser parser = null;
		html = ("<span>"+html+"<span>");
		try{
			parser = new Parser(html);
		}catch (ParserException e){