代码修改

svr/svr-iot/src/main/java/com/yihu/iot/service/monitorPlatform/MonitorPlatformService.java

@@ -165,6 +165,9 @@ public class MonitorPlatformService  {
                         }
                         else{
                             String sql="select DISTINCT device_code from device.wlyy_devices wd INNER JOIN wlyy.wlyy_patient_device pd on pd.device_sn = wd.device_code  ";
                             if (org.apache.commons.lang3.StringUtils.isNoneBlank(deviceType)){
                                 sql+="and pd.category_code in ('"+deviceType.replace(",","','")+"') ";
                             }
                             List<String> tmpList = jdbcTemplate.queryForList(sql,String.class);
                             json.put("andOr","and");
                             json.put("field","deviceSn");
@@ -184,7 +187,7 @@ public class MonitorPlatformService  {
                           totalCount += iotPatientDeviceService.getESCount(jsonObject.toString());
                         }
                     }
                     if (org.apache.commons.lang3.StringUtils.isNoneBlank(deviceName)) break;//通过deviceName查询的不过滤categpry（即所有设备中查找符合）
                     break;
                }
            }
            envelop.setTotalCount(totalCount>totalEqCount?totalCount:totalEqCount);