diff --git a/Src/Dlhis.Basic/Organization/Services/Implements/DepartmentService.cs b/Src/Dlhis.Basic/Organization/Services/Implements/DepartmentService.cs
index fd4f8e74..a7cfd72d 100644
--- a/Src/Dlhis.Basic/Organization/Services/Implements/DepartmentService.cs
+++ b/Src/Dlhis.Basic/Organization/Services/Implements/DepartmentService.cs
@@ -35,7 +35,7 @@ public class DepartmentService : IDepartmentService
         {
             Name = x.Name,
             No = x.Code,
-            PNo = x.PCode,
+            PNo = null,
             Tenant = x.Code,
             _Next = tops.Select(item =>
             {
diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs
index d6c88730..ed69bfdb 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs
+++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Request/DeviceTaskAssignmentRequest.cs
@@ -12,16 +12,13 @@ public class DeviceTaskAssignmentRequest : PageDto
     [EnumDataType(typeof(DeviceTypeEnumType))]
     public DeviceTypeEnumType? Type { get; set; }
 
-
     /// <summary>
     /// 任务类型
     /// </summary>
-    [EnumDataType(typeof(DeviceTaskEnumType))]
-    public DeviceTaskEnumType? TaskType { get; set; }
+    public List<DeviceTaskEnumType> TaskTypes { get; set; }
 
     /// <summary>
     /// 任务下发状态 DeviceTaskStatusEnumType
     /// </summary>
-    [EnumDataType(typeof(DeviceTaskStatusEnumType))]
-    public DeviceTaskStatusEnumType? Status { get; set; }
+    public List<DeviceTaskStatusEnumType> Status { get; set; }
 }
diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
index 50755267..cec44059 100644
--- a/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
+++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
@@ -28,15 +28,15 @@ 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 
+            .WhereIF(!request.Search.IsEmpty(), (deviceTask, ga, device) =>
+            deviceTask.UserNo == request.Search
+            || ga.Name.Contains(request.Search)
+            || ga.Code == request.Search
             || deviceTask.DeviceUniqueNo == request.Search
             )
-            .WhereIF(request.TaskType.HasValue, deviceTask => deviceTask.Type == request.TaskType)
+            .WhereIF(request.TaskTypes.IsPresent(), deviceTask => request.TaskTypes.Contains(deviceTask.Type))
             .WhereIF(request.Type.HasValue, (deviceTask, ga, device) => device.Type == request.Type)
-            .WhereIF(request.Status.HasValue, deviceTask => deviceTask.Status == request.Status)
+            .WhereIF(request.Status.IsPresent(), deviceTask => request.Status.Contains(deviceTask.Status))
             .Where(deviceTask => 1 == 1)
             .OrderBy(deviceTask => deviceTask.CreateTime, OrderByType.Desc)
             .Select((deviceTask, ga, device) => new DeviceTaskAssignmentResponse