diff --git a/Src/Dlhis.Basic/Device/Response/DevicePageResponse.cs b/Src/Dlhis.Basic/Device/Response/DevicePageResponse.cs index 73955b65..b2869e94 100644 --- a/Src/Dlhis.Basic/Device/Response/DevicePageResponse.cs +++ b/Src/Dlhis.Basic/Device/Response/DevicePageResponse.cs @@ -1,4 +1,5 @@ using Dlhis.Entity.Device.Enums; +using Google.Protobuf.WellKnownTypes; using Kurisu.AspNetCore.Utils.Extensions; using System.ComponentModel.DataAnnotations; @@ -51,7 +52,9 @@ public class DevicePageResponse /// /// 设备机功能类型 /// - public string TypeDescription { get; set; } + public DeviceGroupFunctionEnumType Type { get; set; } + + public string TypeDescription => Type.GetDescription(); /// /// 部署点 diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs index 38cb83ea..c3fafd5f 100644 --- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs +++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs @@ -32,7 +32,7 @@ public class DeviceService : IDeviceService { FuncsStr = d.Funcs.ToString(), Brand = dt.Brand, - TypeDescription = d.Type.ToString(), + Type = d.Type, }, true) .ToPageListAsync(request);