Merge branch 'dev' of zengmengkang/wlyy2.0 into dev

business/base-service/src/main/java/com/yihu/jw/doctor/service/BaseDoctorService.java

@@ -66,8 +66,8 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
            params.put("status",status);
        }
        if (StringUtils.isNotBlank(name)){
            name = name+"%";
            sqlTotal += " AND b.dept_name like:name";
            name = "%"+name+"%";
            sqlTotal += " AND (a.name like:name or b.dept_name like:name)";
            params.put("name",name);
        }
        sqlTotal += " AND e.dept_type_code =:typeCode";
@@ -103,7 +103,7 @@ public class BaseDoctorService extends BaseJpaService<BaseDoctorDO, BaseDoctorDa
            sql += " AND a.del =:status";
        }
        if (StringUtils.isNotBlank(name)){
            sql += " AND b.dept_name like:name";
            sql += " AND (a.name like:name or b.dept_name like:name)";
        }
        sql += " AND e.dept_type_code =:typeCode";