| 
					
				 | 
			
			
				@ -228,13 +228,16 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\tEND AS status,\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\tdoc.create_time\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "FROM\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\tbase_doctor doc,\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                " base_doctor doc LEFT join base_doctor_hospital hos on doc.id = hos.doctor_code " + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                " LEFT JOIN dict_hospital_dept dept on hos.org_code = dept.org_code" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                " AND hos.dept_code = dept.code"+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                /*"\tbase_doctor doc,\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\tbase_doctor_hospital hos,\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\tdict_hospital_dept dept\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "WHERE\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\tdoc.id = hos.doctor_code\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\tdict_hospital_dept dept\n" +*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                " WHERE 1=1"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                /*"\tdoc.id = hos.doctor_code\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "AND hos.org_code = dept.org_code\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "AND hos.dept_code = dept.code\n" ; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "AND hos.dept_code = dept.code\n"*/ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if (!StringUtils.isEmpty(nameOrIdcard)){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				            sql += " and (doc.idcard LIKE '%"+nameOrIdcard+"%' or doc.name LIKE '%"+nameOrIdcard+"%')"; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        }if (!StringUtils.isEmpty(orgCode)){ 
			 |