| 
					
				 | 
			
			
				@ -27,9 +27,11 @@ public class DoctorMessageEndpoint extends EnvelopRestEndpoint { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @GetMapping(value = "messages") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    @ApiOperation("应用消息") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public ObjEnvelop messages(@ApiParam(name = "type", value = "消息类型 10床位申请,11安全监护") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                               @RequestParam(value = "type", required = false) String type){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                               @RequestParam(value = "type", required = false) String type, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                               @ApiParam(name = "doctor", value = "doctor") 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                               @RequestParam(value = "doctor", required = false) String doctor){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        try { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            return ObjEnvelop.getSuccess("查询成功",doctorMessageService.findDoctorAllMessage(getUID(),type)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            return ObjEnvelop.getSuccess("查询成功",doctorMessageService.findDoctorAllMessage(doctor,type)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        }catch (Exception e){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            e.printStackTrace(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            return ObjEnvelop.getError("查询失败"+e.getMessage()); 
			 |