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/endpoint/article/ArticleEndpoint.java

@@ -118,6 +118,11 @@ public class ArticleEndpoint extends EnvelopRestEndpoint {
				articleDO.setIsUsed(knowledgeArticleUserDO.getUsed());
				articleDO.setKnowledgeArticleUserDO(knowledgeArticleUserDO);
			}
			List<BaseDoctorHospitalDO> doctorHospitalDOS = doctorHospitalDao.findByDoctorCode(articleDO.getCreateUser());
			if (doctorHospitalDOS!=null&&doctorHospitalDOS.size()!=0){
				articleDO.setHospitalName(doctorHospitalDOS.get(0).getOrgName());
				articleDO.setDeptName(doctorHospitalDOS.get(0).getDeptName());
			}
		return success(articleDO);
	}