| 
					
				 | 
			
			
				@ -53,7 +53,7 @@ public class DetectionPlatformService  { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public PageEnvelop getHealthMonitoringListNew(Integer page, Integer pageSize, Integer type){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        page = page>0?page-1:0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (type == 1) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            String sql = " SELECT id,user patient,`name`,'健康监测' as serve_desc,czrq,value1,value2,value3,value4,value5,value6,value7,type \n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            String sql = " SELECT id,user,`name`,'健康监测' as serve_desc,czrq,value1,value2,value3,value4,value5,value6,value7,type \n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                    "FROM wlyy_patient_health_index WHERE del = 1 AND type < 3 ORDER BY czrq desc "; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            String countSql = "select count(id) from ("+sql+")A "; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            long count = jdbcTemplate.queryForObject(countSql,long.class); 
			 |