| 
					
				 | 
			
			
				@ -61,7 +61,7 @@ public class DetectionPlatformService  { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            List<Map<String,Object>> list = jdbcTemplate.queryForList(sql); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            return PageEnvelop.getSuccessListWithPage("查询成功",list,page,pageSize,count); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        }else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            String sql = " select  '22' as 'OrderType',ord.id,ord.patient,p.name,ord.serve_desc,DATE_FORMAT(ord.create_time,'%Y-%m-%d %H:%i:%S') create_time,ord.`status` \n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            String sql = " select  '22' as 'OrderType',ord.id,ord.patient,p.name,ord.serve_desc,DATE_FORMAT(ord.create_time,'%Y-%m-%d %H:%i:%S') create_time,ord.`status`,ord.doctor,ord.doctor_name \n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    "from base_security_monitoring_order ord INNER JOIN base_patient p on ord.patient = p.id order by create_time desc "; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            String countSql = "select count(id) from ("+sql+")A "; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            long count = jdbcTemplate.queryForObject(countSql,long.class); 
			 |