|  | @ -143,7 +143,8 @@ public class PatientJMJkEduArticleController extends BaseController {
 | 
	
		
			
				|  |  |                                       @ApiParam(name = "roleType", value = "1、普通医生,2、管理员")
 | 
	
		
			
				|  |  |                                       @RequestParam(value = "archive", required = false) Integer roleType,
 | 
	
		
			
				|  |  |                                       @ApiParam(name = "patient", value = "居民CODE")
 | 
	
		
			
				|  |  |                                       @RequestParam(value = "patient", required = false) String patient){
 | 
	
		
			
				|  |  |                                       @RequestParam(value = "patient", required = false) String patient,
 | 
	
		
			
				|  |  |                                       @RequestParam(value = "doctor", required = false)String doctor ){
 | 
	
		
			
				|  |  |         try {
 | 
	
		
			
				|  |  |             if(StringUtils.isEmpty(currentUserRole)){
 | 
	
		
			
				|  |  |                 currentUserRole=getCurrentRoleCode();
 | 
	
	
		
			
				|  | @ -153,7 +154,7 @@ public class PatientJMJkEduArticleController extends BaseController {
 | 
	
		
			
				|  |  |             }
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |             JSONObject response = jmJkEduArticleService.queryArticlePcList(firstLevelCategoryId,secondLevelCategoryId,insertTimeStart,insertTimeEnd,articlelevel,articleTitle,
 | 
	
		
			
				|  |  |                     getUID(),currentUserRole,currentUserRoleLevel,isAuthentication,isMyArticle,page,pageSize,sEcho,roleType);
 | 
	
		
			
				|  |  |                     doctor,currentUserRole,currentUserRoleLevel,isAuthentication,isMyArticle,page,pageSize,sEcho,roleType);
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |             //判断文章列表是否有推送过该居民
 |