|  | @ -242,7 +242,7 @@ public class CareDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
 | 
	
		
			
				|  |  |         //已入学
 | 
	
		
			
				|  |  |         String sql1=" select DISTINCT rsr.patient from base_recruit_students_record rsr INNER JOIN  base_org org on rsr.org_code = org.`code` " +
 | 
	
		
			
				|  |  |                 "and org.del=1 INNER JOIN base_doctor_hospital dh on rsr.org_code = dh.org_code and dh.del =1  where dh.doctor_code='"+doctor+"' " +
 | 
	
		
			
				|  |  |                 "and rsr.del<>0  and rsr.`status` = 2 GROUP BY dh.doctor_code  ";
 | 
	
		
			
				|  |  |                 "and rsr.del<>0  and rsr.`status` = 2   ";
 | 
	
		
			
				|  |  |         String sql = "select p.id,p.name,p.photo,p.sex,p.idcard,p.openid,p.mobile,group_concat( pd.category_code) deviceType from ( {sqlReplace} )tmp Inner JOIN base_patient p on tmp.patient  = p.id " +
 | 
	
		
			
				|  |  |                 " LEFT JOIN wlyy_patient_device pd on pd.`user`=p.id and pd.category_code BETWEEN 1 and 2 GROUP BY p.id ";
 | 
	
		
			
				|  |  |         String sqlcpunt = "select count(Distinct p.id) from ( {sqlReplace} )tmp Inner JOIN base_patient p on tmp.patient  = p.id " +
 | 
	
	
		
			
				|  | @ -289,7 +289,7 @@ public class CareDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
 | 
	
		
			
				|  |  |         //已入学
 | 
	
		
			
				|  |  |         String sql1=" select DISTINCT rsr.patient from base_recruit_students_record rsr INNER JOIN  base_org org on rsr.org_code = org.`code` " +
 | 
	
		
			
				|  |  |                 "and org.del=1 INNER JOIN base_doctor_hospital dh on rsr.org_code = dh.org_code and dh.del =1  where dh.doctor_code='"+doctor+"' " +
 | 
	
		
			
				|  |  |                 "and rsr.del<>0  and rsr.`status` = 2 GROUP BY dh.doctor_code  ";
 | 
	
		
			
				|  |  |                 "and rsr.del<>0  and rsr.`status` = 2   ";
 | 
	
		
			
				|  |  | 
 | 
	
		
			
				|  |  |         String sqlcpunt = "select count(Distinct p.id) from ( {sqlReplace} )tmp Inner JOIN base_patient p on tmp.patient  = p.id " +
 | 
	
		
			
				|  |  |                 " LEFT JOIN wlyy_patient_device pd on pd.`user`=p.id and pd.category_code BETWEEN 1 and 2  ";
 |