| 
					
				 | 
			
			
				@ -181,9 +181,9 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				//                .replace("{end}",String.valueOf(end)); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        String sql="SELECT\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\ttb. ID AS \"ID\",\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\ttb.id AS \"id\",\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\ttb.idcard AS \"idcard\",\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\ttb. NAME AS \"NAME\",\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\ttb.name AS \"name\",\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\ttb.sex AS \"sex\",\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\ttb.mobile AS \"mobile\","; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				        if ("xm_ykyy_wx".equalsIgnoreCase(wechatId)){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -202,8 +202,8 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "FROM\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\t(\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\t\tSELECT\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\t\t\tdoc. ID,\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\t\t\tdoc. NAME,\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\t\t\tdoc.id,\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\t\t\tdoc.name,\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\t\t\tdoc.idcard,\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\t\t\tCASE\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\t\tWHEN doc.sex = 1 THEN\n" + 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -228,7 +228,7 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\tbase_doctor_hospital hos,\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\tdict_hospital_dept dept\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "WHERE\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\tdoc. ID = hos.doctor_code\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\tdoc.id = hos.doctor_code\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "AND hos.org_code = dept.org_code\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "AND hos.dept_code = dept.code\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "AND (\n" + 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -236,7 +236,7 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\t\tdoc.idcard LIKE '%%'\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\t\tOR '' = '%%'\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\t)\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\tOR (doc. NAME LIKE '%%' OR '' = '%%')\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\tOR (doc.name LIKE '%%' OR '' = '%%')\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\tAND (hos.org_code = '' OR '' = '')\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\tAND (doc.del = '' OR '' = '')\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                ")\n" + 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@ -244,7 +244,7 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "  GROUP BY\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\ttb. ID,\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\ttb.idcard,\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\ttb. NAME,\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\ttb.name,\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\ttb.sex,\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\ttb.mobile,\n" + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                "\ttb.job_title_name,\n" + 
			 |