|  | @ -347,8 +347,9 @@ public class DoctorMessageService {
 | 
	
		
			
				|  |  |         if (StringUtils.isNotBlank(deviceCode)&&!"''".equals(deviceCode)){
 | 
	
		
			
				|  |  |             sql +=" AND pd.category_code = '"+deviceCode+"'";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         //模糊搜居民名字和身份证号
 | 
	
		
			
				|  |  |         if (StringUtils.isNotBlank(deviceName)){
 | 
	
		
			
				|  |  |             sql += " and pd.device_name LIKE '%"+deviceName+"%'";
 | 
	
		
			
				|  |  |             sql += " and ( p.name LIKE '%"+deviceName+"%' or p.idcard like '%"+deviceName+"%' )";
 | 
	
		
			
				|  |  |         }
 | 
	
		
			
				|  |  |         sql+= "  order by sm.create_time desc";
 | 
	
		
			
				|  |  | 
 |