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

svr/svr-iot/src/main/java/com/yihu/iot/service/device/WlyyDeviceService.java

@@ -102,12 +102,12 @@ public class WlyyDeviceService {
        Pageable pageRequest = new PageRequest(page-1,pageSize);
        StringBuilder filter = new StringBuilder();
        String sql =" SELECT i.* ,p.name userName FROM device.wlyy_patient_health_index i left join wlyy.wlyy_sign_family s on i.`user` = s. patient and s.`status`>0, wlyy.wlyy_patient p WHERE i.user=p.code ";
        String countSql =" SELECT count(1) as num FROM device.wlyy_patient_health_index i left join wlyy.wlyy_sign_family s on i.`user` = s. patient and s.`status`>0, wlyy.wlyy_patient p WHERE i.user=p.code ";
        String sql =" SELECT i.* ,i.name userName FROM device.wlyy_patient_health_index i WHERE 1=1 ";
        String countSql =" SELECT count(1) as num FROM device.wlyy_patient_health_index i WHERE 1=1 ";
        //根据患者名称过滤
        if(!StringUtils.isEmpty(userName)){
            filter.append(" AND p.name LIKE '%"+userName+"%' ");
            filter.append(" AND i.name LIKE '%"+userName+"%' ");
        }
        if(!StringUtils.isEmpty(deviceSn)){
@@ -150,7 +150,7 @@ public class WlyyDeviceService {
        //数据权限过滤
        List<String> orgList = orgUserService.getUserOrgById(userAgent.getUID());
        if(!orgList.contains(userAgent.commonHospital)){
            sql += " and s.hospital in ("+orgUserService.getUserOrg(orgList)+") ";
            sql += " and i.hospital in ("+orgUserService.getUserOrg(orgList)+") ";
        }
        String f = filter.toString();