| 
					
				 | 
			
			
				@ -1342,9 +1342,13 @@ public class DoctorSchemeService extends BaseService{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     * @return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				    public String getXTSql(String doctor ,Long teamCode,String startDate,String endDate,String state){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String value1 ="cast(p.fbg as SIGNED INTEGER)"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String value1min ="cast(p.fbg_min as SIGNED INTEGER)"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String value2 ="1,3,5,7"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if("1".equals(state)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            value2 = "2,4,6"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            value1 = "cast(p.hpg AS SIGNED INTEGER)"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            value1min ="cast(p.hpg_min AS SIGNED INTEGER)"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        //餐前血糖达标数 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String xtSql = "SELECT " + 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -1362,6 +1366,7 @@ public class DoctorSchemeService extends BaseService{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "     SELECT p.patient_code AS `user` FROM wlyy_track_patient p WHERE p.del='1' AND p.doctor_code='"+doctor+"' AND p.team_code =" +teamCode+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "    ) " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "  AND i.del ='1' " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "  AND i.value2 in("+value2+") " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "  AND i.type = 1  " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "  AND i.record_date >= '"+startDate+"' " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "  AND i.record_date <= '"+endDate+"' " + 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -1382,9 +1387,9 @@ public class DoctorSchemeService extends BaseService{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "     SELECT p.patient_code AS `user` FROM wlyy_track_patient p WHERE p.del='1' AND p.doctor_code='"+doctor+"' AND p.team_code =" +teamCode+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "    ) " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "  AND " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "  i.value1 <= cast(p.fbg as SIGNED INTEGER)  " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "  i.value1 <= " +value1+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "  AND  " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "  i.value1 >= cast(p.fbg_min as SIGNED INTEGER) " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "  i.value1 >= " +value1min + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "  AND i.value2 in("+value2+") " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "  AND i.del ='1'  " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "  AND i.type = 1   " + 
			 |