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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/jkEduArticle/ThirdJkEduArticleService.java

@@ -412,9 +412,9 @@ public class ThirdJkEduArticleService extends BaseService {
            
    
            List<DoctorRole> roleList = doctorRoleDao.findUserRole(userCode);
            
            orgName = doctor.getHospitalName();
            if(roleList.isEmpty()){
                orgName = doctor.getHospitalName();
            
            }else{
                
                HashMap<String,String> rolemap = new HashMap<>();