diff --git a/Src/Dlhis.Basic/Device/Response/DeviceResponse.cs b/Src/Dlhis.Basic/Device/Response/DeviceResponse.cs index d28b8650..642a250a 100644 --- a/Src/Dlhis.Basic/Device/Response/DeviceResponse.cs +++ b/Src/Dlhis.Basic/Device/Response/DeviceResponse.cs @@ -88,6 +88,9 @@ public class DeviceResponse } } + public DeviceTypeEnumType Type { get; set; } + public string TypeDesc => Type.GetDescription(); + /// /// 连接信息 /// diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs index 3db17c09..aeafde5a 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs @@ -236,7 +236,7 @@ public class DeviceService : IDeviceService }, true) .ToListAsync(); - return devices.Where(x => x.Funcs.Contains(DeviceFuncEnumType.Attendance)).ToList(); + return devices.Where(x => x.Type == DeviceTypeEnumType.Attendance).ToList(); } public async Task GetDeviceNumberAsync()