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

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/sign/ArchiveService.java

@@ -284,7 +284,7 @@ public class ArchiveService extends BaseJpaService<ArchiveDO, ArchiveDao> {
//            filter += " and m.org_code='"+hospital+"'   ";
//        }
        if(StringUtils.isNotBlank(name)){
            filter += " and p.name like '%"+name+"%'";
            filter += " and (p.name like '%"+name+"%' or p.idcard = '"+name+"')";
        }
//        filter+= " and m.del = '1' and sr.`status`=1 ) ";
        if (StringUtils.isNotBlank(filterMyPatient)){//