Merge branch 'dev' into local-slave

# Conflicts:
#	nb-admin/pom.xml
#	nb-admin/src/main/resources/application-dev.yml
#	nb-service-api/web-service-api/src/main/java/com/nb/web/api/entity/common/BusDeviceRunningEntity.java
#	nb-service/web-service/src/main/java/com/nb/web/service/bus/service/dto/ClinicAnalRecordResult.java

nb-service/web-service/src/main/java/com/nb/web/service/bus/controller/BusPatientController.java

@@ -138,9 +138,9 @@ public class BusPatientController  implements BaseQueryController<BusPatientEnti
         }
         return R.success(infusionService.count(new QueryWrapper<BusInfusionHistoryEntity>()
                 .lambda()
-                .nested(i->i.ne(BusInfusionHistoryEntity::getRunState,DeviceStatusEnum.Shutdown)
-                        .ne(BusInfusionHistoryEntity::getRunState,DeviceStatusEnum.NoSignal))
                 .in(BusInfusionHistoryEntity::getId,infusionIds)
+                .notIn(BusInfusionHistoryEntity::getRunState,Arrays.asList(DeviceStatusEnum.Shutdown.getValue(),DeviceStatusEnum.NoSignal.getValue()))
+                .ne(BusInfusionHistoryEntity::getFinished,Boolean.TRUE)
         )!=0);
     }