Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

# Conflicts:
#	svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/endpoint/consult/PatientConsultEndpoint.java

svr/svr-internet-hospital/src/main/java/com/yihu/jw/hospital/service/consult/KnowledgeArticleService.java

@@ -224,6 +224,7 @@ public class KnowledgeArticleService extends BaseJpaService<KnowledgeArticleDO,
					KnowledgeArticleDO knowledgeArticleDO = knowledgeArticleDao.findByIdAndDel(patientBusinessDO.getRelationCode());
					System.out.println("content:"+JSON.toJSONString(knowledgeArticleDO));
					Map<String,Object> map = new HashedMap();
					map.put("id",knowledgeArticleDO.getId());
					map.put("title",knowledgeArticleDO.getTitle());
					map.put("content",knowledgeArticleDO.getContent());
					imUtil.sendImMsg(patientBusinessDO.getDoctor(), patientBusinessDO.getDoctorName(), patientBusinessDO.getSessionId(), "4", map.toString(),"1");