Merge branch 'dev' of trick9191/patient-co-management into dev

patient-co/patient-co-wlyy/src/main/java/com/yihu/wlyy/service/third/jw/ZyDictService.java

@@ -225,9 +225,9 @@ public class ZyDictService {
                " ho.physic_code = p.physic_code " ;
        if(StringUtils.isNotBlank(name)){
            if(isEnglish(name)){
                sql += " and p.spell_code like '%"+name.toUpperCase()+"%'";
                sql += " and (p.spell_code like '%"+name.toUpperCase()+"%' or p.physic_code like '%"+name+"%')";
            }else{
                sql += " and p.physic_name like '%"+name+"%'";
                sql += " and (p.physic_name like '%"+name+"%' or p.physic_code like '%"+name+"%')";
            }
        }
        sql +=" ) yp " +