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

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/jimeiJkEduPC/DoctorJMJkEduArticlePCController.java

@@ -153,7 +153,13 @@ public class DoctorJMJkEduArticlePCController extends BaseController {
            //判断文章列表是否有推送过该居民
            if(StringUtils.isNotBlank(patient)){
                com.alibaba.fastjson.JSONArray pushresponse = jmJkEduArticleService.pushArticleLogs(0,0,patient,"");
                com.alibaba.fastjson.JSONArray pushresponse = null;
                try{
                    pushresponse = jmJkEduArticleService.pushArticleLogs(0,0,patient,"");
                }catch (Exception e){
                    pushresponse = new JSONArray();
                }
                Set<String> articleids = new HashSet<>();
                if(pushresponse.size() > 0)
                {