| 
					
				 | 
			
			
				@ -2,6 +2,7 @@ package com.yihu.wlyy.web.doctor.jimeiJkEdu; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				import com.alibaba.fastjson.JSONObject; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				import com.yihu.es.entity.HealthEduArticleES; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				import com.yihu.wlyy.aop.ObserverRequired; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				import com.yihu.wlyy.repository.doctor.DoctorAdminTeamDao; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				import com.yihu.wlyy.service.jimeiJkEdu.JMJkEduArticleService; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				import com.yihu.wlyy.service.third.jkEduArticle.ThirdJkEduArticleService; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -120,6 +121,7 @@ public class DoctorJMJkEduArticleController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @RequestMapping(value = "manageSendArticleToPatients", method = RequestMethod.POST) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ApiOperation("卫计委(管理员)文章群推送") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ObserverRequired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public BaseResultModel manageSendArticleToPatients( 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				//            @ApiParam(name = "sendType", value = "发送类型 1医生发送 2卫纪委(管理员)发送", required = true) @RequestParam(value = "sendType", required = true) Integer sendType, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				//            @ApiParam(name = "sendName", value = "发送方名称(如:卫计委发送:集美区;医生发送:医生名称)", required = true) @RequestParam(value = "sendName", required = true) String sendName, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -292,6 +294,7 @@ public class DoctorJMJkEduArticleController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @RequestMapping(value = "doctorSendArticleToPatients", method = RequestMethod.POST) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ApiOperation("医生文章群推送") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ObserverRequired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public BaseResultModel doctorSendArticleToPatients( 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                              @RequestParam(value = "patient", required = false) String patient, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                                              @RequestParam(value = "group", required = false, defaultValue = "") String group, 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -368,6 +371,7 @@ public class DoctorJMJkEduArticleController extends BaseController { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @RequestMapping(value = "doctorSendArticleToSingle", method = RequestMethod.POST) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ApiOperation("医生文章单个患者推送") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ObserverRequired 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public BaseResultModel doctorSendArticleToSingle( 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            @ApiParam(name = "patientCode", value = "患者Code", required = true) @RequestParam(value = "patientCode", required = true) String patientCode, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            @ApiParam(name = "articleId", value = "文章ID", required = true) @RequestParam(value = "articleId", required = true) String articleId, 
			 |