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

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

@@ -262,12 +262,14 @@ public class DoctorHealthEduArticleController extends BaseController {
			if(StringUtils.isNotBlank(group)&&groups.length>0){
				//递归患者数据
				for(String g :groups){
					getPatientByGroup(g,labelType,teamCode,patientSet,1,100);
					getPatientByGroup(g,labelType,teamCode,patientSet,0,100);
				}
			}
			//去重操作
			for (String p : patients) {
				patientSet.add(p);
				if(StringUtils.isNotBlank(p)){
					patientSet.add(p);
				}
			}
			if(patientSet.size()==0){
				return error(-1, "请至少选择一个患者！");

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

@@ -131,6 +131,8 @@ public class HealthEduArticleController extends BaseController {
			json.put("title", healthEduArticlePatient.getTitle());
			// 文章内容
			json.put("content", healthEduArticlePatient.getContent());
			json.put("url", healthEduArticlePatient.getUrl());
			// 添加日期
			json.put("czrq", DateUtil.dateToStrLong(healthEduArticlePatient.getCzrq()));
			int readAmount = healthEduArticleOpHistoryService.countReadAmount(healthEduArticlePatient.getArticle());