diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs
index d41b722e..fee03043 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs
+++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs
@@ -6,11 +6,18 @@ namespace Dlhis.ScheduledTask.TaskAssignment.Request;
 
 public class DeviceTaskAssignmentRequest : PageDto
 {
+    /// <summary>
+    /// 设备类型
+    /// </summary>
+    [EnumDataType(typeof(DeviceTypeEnumType))]
+    public DeviceTypeEnumType? Type { get; set; }
+
+
     /// <summary>
     /// 任务类型
     /// </summary>
     [EnumDataType(typeof(DeviceTaskEnumType))]
-    public DeviceTaskEnumType? Type { get; set; }
+    public DeviceTaskEnumType? TaskType { get; set; }
 
     /// <summary>
     /// 任务下发状态
diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
index 979f2b17..f194ca21 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
+++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
@@ -27,13 +27,14 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService
     {
         var page = await _dbContext.Queryable<DeviceTaskEntity>()
             .LeftJoin<GainfoEntity>((deviceTask, ga) => deviceTask.UserNo == ga.No)
-            .LeftJoin<DeviceEntity>((deviceTask, ga,device) => deviceTask.DeviceUniqueNo == device.UniqueNo)
-            .WhereIF(!request.Search.IsEmpty(), (deviceTask, ga,device) => deviceTask.UserNo == request.Search || ga.Name.Contains(request.Search) || ga.Code == request.Search || deviceTask.DeviceUniqueNo == request.Search || deviceTask.ModifiedTime.ToString("yyyy-MM-dd").Contains(request.Search))
-            .WhereIF(request.Type.HasValue, deviceTask => deviceTask.Type == request.Type)
+            .LeftJoin<DeviceEntity>((deviceTask, ga, device) => deviceTask.DeviceUniqueNo == device.UniqueNo)
+            .WhereIF(!request.Search.IsEmpty(), (deviceTask, ga, device) => deviceTask.UserNo == request.Search || ga.Name.Contains(request.Search) || ga.Code == request.Search || deviceTask.DeviceUniqueNo == request.Search || deviceTask.ModifiedTime.ToString("yyyy-MM-dd").Contains(request.Search))
+            .WhereIF(request.TaskType.HasValue, deviceTask => deviceTask.Type == request.TaskType)
+            .WhereIF(request.Type.HasValue, (deviceTask, ga, device) => device.Type == request.Type)
             .WhereIF(request.Status.HasValue, deviceTask => deviceTask.Status == request.Status)
             .Where(deviceTask => 1 == 1)
             .OrderBy(deviceTask => deviceTask.CreateTime, OrderByType.Desc)
-            .Select((deviceTask, ga,device) => new DeviceTaskAssignmentResponse
+            .Select((deviceTask, ga, device) => new DeviceTaskAssignmentResponse
             {
                 Id = deviceTask.Id,
                 DeviceUniqueNo = deviceTask.DeviceUniqueNo,