liubing 4 роки тому
батько
коміт
26d162cd8c

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

@ -1341,7 +1341,7 @@ public class MonitorPlatformService  {
            sqlCondition.append(" and f.hospital in (SELECT dh.code from wlyy.dm_hospital dh where dh.town ='"+area+"' and dh.del =1 )  ");
        }
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(hospital)){
            sqlCondition.append(" and f.hospital ="+hospital+"  ");
            sqlCondition.append(" and d.hospital ="+hospital+"  ");
        }
        if (org.apache.commons.lang3.StringUtils.isNoneBlank(deviceType)){
            sqlCondition.append("and d.category_code in ('").append(deviceType.replace(",","','")).append("') ");
@ -1565,7 +1565,7 @@ public class MonitorPlatformService  {
                sql.append(" and f.hospital in (SELECT dh.code from wlyy.dm_hospital dh where dh.town ='"+area+"' and dh.del =1 )  ");
            }
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(hospital)){
                sql.append(" and f.hospital ="+hospital+"  ");
                sql.append(" and d.hospital ="+hospital+"  ");
            }
            if (org.apache.commons.lang3.StringUtils.isNoneBlank(startTime)&& org.apache.commons.lang3.StringUtils.isNoneBlank(endTime)){
                sql.append(" and d.czrq <='"+endTime+" 23:59:59'  ");