修改配置

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

@@ -13,6 +13,11 @@ namespace IRaCIS.Core.Application.ViewModel
     /// <summary> TaskAllocationRuleView  列表视图模型 </summary>
     public class TaskAllocationRuleView : TaskAllocationRuleAddOrEdit
     {
+        public string UserCode { get; set; }
+        public string UserName { get; set; }
+        public string FullName { get; set; }
+
+        public string UserTypeShortName { get; set; }
 
         public Guid CreateUserId { get; set; }
         public DateTime CreateTime { get; set; }

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

@@ -44,6 +44,13 @@ namespace IRaCIS.Core.Application.ViewModel
         public Guid SiteId { get; set; }
         public String TrialSiteCode { get; set; } = String.Empty;
         public string SubjectCode { get; set; } = String.Empty;
+
+
+        public string UserCode { get; set; }
+        public string UserName { get; set; }
+        public string FullName { get; set; }
+
+        public string UserTypeShortName { get; set; }
     }
 
 

IRaCIS.Core.Application/Service/Allocation/_MapConfig.cs

@@ -12,13 +12,22 @@ namespace IRaCIS.Core.Application.Service
         {
 
             CreateMap<TaskAllocationRule, TaskAllocationRuleView>()
-                  .ForMember(o => o.TotalTaskCount, t => t.MapFrom(u => u.Trial.VisitTaskList.Count()))
+                 .ForMember(o => o.UserCode, t => t.MapFrom(u => u.DoctorUser.UserCode))
-                  .ForMember(o => o.SelfTaskCount, t => t.MapFrom(u => u.Trial.VisitTaskList.Count(t=>t.DoctorUserId==u.DoctorUserId)));
+                 .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))
+                 .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.FullName))
+                 .ForMember(o => o.UserTypeShortName, t => t.MapFrom(u => u.DoctorUser.UserTypeRole.UserTypeShortName))
+                 .ForMember(o => o.TotalTaskCount, t => t.MapFrom(u => u.Trial.VisitTaskList.Count()))
+                 .ForMember(o => o.SelfTaskCount, t => t.MapFrom(u => u.Trial.VisitTaskList.Count(t=>t.DoctorUserId==u.DoctorUserId)));
 
+            
             CreateMap<VisitTask, VisitTaskView>()
                  .ForMember(o => o.SiteId, t => t.MapFrom(u => u.Subject.SiteId))
                  .ForMember(o => o.TrialSiteCode, t => t.MapFrom(u => u.Subject.TrialSite.TrialSiteCode))
-                 .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code));
+                 .ForMember(o => o.SubjectCode, t => t.MapFrom(u => u.Subject.Code))
+                 .ForMember(o => o.UserCode, t => t.MapFrom(u => u.DoctorUser.UserCode))
+                 .ForMember(o => o.UserName, t => t.MapFrom(u => u.DoctorUser.UserName))
+                 .ForMember(o => o.FullName, t => t.MapFrom(u => u.DoctorUser.FullName))
+                 .ForMember(o => o.UserTypeShortName, t => t.MapFrom(u => u.DoctorUser.UserTypeRole.UserTypeShortName));
 
 
             CreateMap<TaskAllocationRuleAddOrEdit, TaskAllocationRule>();

IRaCIS.Core.Domain/Allocation/TaskAllocationRule.cs

@@ -53,6 +53,9 @@ namespace IRaCIS.Core.Domain.Models
 
         public Guid DoctorUserId { get; set; }
 
+
+        public User DoctorUser { get; set; }
+
         /// <summary>
         /// IsEnable
         /// </summary>

IRaCIS.Core.Domain/Allocation/VisitTask.cs

@@ -111,7 +111,9 @@ namespace IRaCIS.Core.Domain.Models
 		/// DoctorUserId
 		/// </summary>
 		public Guid? DoctorUserId { get; set; }
-	 
+
-	 }
+		public User DoctorUser { get; set; }
+
+	}
 
 }