diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
index f06f81c4..fc88ef1a 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
@@ -298,10 +298,8 @@ public class DeviceService : IDeviceService
         var list = new List<DeviceEntity>();
         foreach (var device in devices)
         {
-            if(device.HeartbeatInterval > 0)
-            {
                 var regis = deviceRegistrys.FirstOrDefault(x => x.DeviceUniqueNo == device.UniqueNo);
-                if (regis == null)
+                if (regis == null || device.HeartbeatInterval == 0)
                 {
                     continue;
                 }
@@ -310,12 +308,7 @@ public class DeviceService : IDeviceService
                 {
                     list.Add(device);
                 }
-            }
-            else
-            {
-                list.Add(device);
-            }
-            
+   
         }
         return list;
     }