阅片配置表

IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs

@@ -6,6 +6,8 @@
 using System;
 using IRaCIS.Core.Domain.Share;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
 namespace IRaCIS.Core.Application.ViewModel
 {
     /// <summary> TaskAllocationRuleView  列表视图模型 </summary>
@@ -17,24 +19,42 @@ namespace IRaCIS.Core.Application.ViewModel
         public DateTime UpdateTime { get; set; }
         public Guid UpdateUserId { get; set; }
 
+
+        public int? TotalTaskCount { get; set; }
+
+        public int? SelfTaskCount { get; set; }
+
     }
 
     ///<summary>TaskAllocationRuleQuery  列表查询参数模型</summary>
     public class TaskAllocationRuleQuery
     {
-
+        [NotDefault]
+        public Guid TrialId { get; set; }
     }
 
     ///<summary> TaskAllocationRuleAddOrEdit  列表查询参数模型</summary>
     public class TaskAllocationRuleAddOrEdit
     {
-        public Guid Id { get; set; }
-
+        public Guid? Id { get; set; }
+        public Guid TrialId { get; set; }
         public int PlanReadingRatio { get; set; }
-        public Guid DoctorId { get; set; }
+        public Guid DoctorUserId { get; set; }
         public bool IsEnable { get; set; }
-        public int GroupEnum { get; set; }
-        public int AllocationObjectEnum { get; set; }
+        public string Note { get; set; } = string.Empty;
+    }
+
+    public class  TrialDoctorUserSelectView
+    {
+        public Guid DoctorUserId { get; set; }
+
+        public string UserCode { get; set; }
+
+        public string UserName { get; set; }
+
+        public string FullName { get; set; }
+
+        public UserTypeEnum UserTypeEnum { get; set; }
     }
 
 

IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs

@@ -31,7 +31,7 @@ namespace IRaCIS.Core.Application.ViewModel
         public string TaskCode { get; set; }
         public bool IsUrgent { get; set; }
         public int ArmEnum { get; set; }
-        public Guid? DoctorId { get; set; }
+        public Guid? DoctorUserId { get; set; }
 
 
 
@@ -63,13 +63,15 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public string TaskName { get; set; } = String.Empty;
 
-        public Guid? DoctorId { get; set; }
+        public Guid? DoctorUserId { get; set; }
 
         public ReadingCategory? ReadingCategory { get; set; }
 
         public TaskState? TaskState { get; set; }
 
+        public  DateTime? BeginAllocateDate { get; set; }
 
+        public DateTime? EndAllocateDate { get; set; }
     }