修改裁判任务列表

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

@@ -57,7 +57,6 @@ namespace IRaCIS.Core.Application.ViewModel
     public class JudgeVisitTaskView : VisitTaskView
     {
 
-        public string? JudgeTaskCode { get; set; }
 
 
         public List<HistoryReadingDoctorUser> HistoryReadingDoctorUserList { get; set; }
@@ -68,6 +67,8 @@ namespace IRaCIS.Core.Application.ViewModel
 
     public class HistoryReadingDoctorUser
     {
+
+        public string? JudgeTaskCode { get; set; }
         public Guid DoctorUserId { get; set; }
 
         public string UserCode { get; set; }
@@ -202,7 +203,7 @@ namespace IRaCIS.Core.Application.ViewModel
     {
         public Guid SubjectId { get; set; }
 
-        public List<Guid> DoctorUserIdList { get; set; }
+        public List<Guid> DoctorUserIdList { get; set; }=new List<Guid> ();
     }
 
     public class AutoSubjectAssignCommand

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

@@ -48,14 +48,15 @@ namespace IRaCIS.Core.Application.Service
                  .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.JudgeTaskCode, t => t.MapFrom(u => u.JudgeVisitTask.TaskCode))
-                 .ForMember(o => o.HistoryReadingDoctorUserList, t => t.MapFrom(u => u.JudgeVisitList.Select(u=>u.DoctorUser)));
                  
-            CreateMap<User, HistoryReadingDoctorUser>()
+                 .ForMember(o => o.HistoryReadingDoctorUserList, t => t.MapFrom(u => u.JudgeVisitList));
-                 .ForMember(o => o.UserCode, t => t.MapFrom(u => u.UserCode))
+
-                 .ForMember(o => o.UserName, t => t.MapFrom(u => u.UserName))
+            CreateMap<VisitTask, HistoryReadingDoctorUser>()
-                 .ForMember(o => o.FullName, t => t.MapFrom(u => u.FullName))
+                 .ForMember(o => o.UserCode, t => t.MapFrom(u => u.DoctorUser.UserCode))
-                  .ForMember(o => o.DoctorUserId, t => t.MapFrom(u => u.Id));
+                 .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.JudgeTaskCode, t => t.MapFrom(u => u.TaskCode))
+                 .ForMember(o => o.DoctorUserId, t => t.MapFrom(u => u.DoctorUser.Id));
 
 
             CreateMap<Subject, SubjectAssignView>()
@@ -65,7 +66,7 @@ namespace IRaCIS.Core.Application.Service
                  .ForMember(o => o.IsAssignedDoctorUser, t => t.MapFrom(u => u.SubjectDoctorList.Any()))
                  
                  
-                 .ForMember(o => o.DoctorUserList, t => t.MapFrom(u => u.SubjectDoctorList.OrderByDescending(t=>t.ArmEnum)));
+                 .ForMember(o => o.DoctorUserList, t => t.MapFrom(u => u.SubjectDoctorList.OrderBy(t=>t.ArmEnum)));
 
             CreateMap<SubjectUser, AssignDoctorView>()
                  //.ForMember(o => o.AssignTime, t => t.MapFrom(u => u.AssignTime))

IRaCIS.Core.Domain.Share/Allocation/AllocationRelation.cs

@@ -13,6 +13,7 @@ namespace IRaCIS.Core.Domain.Share
         //全局
         Global=3,
 
+        //裁判
         Judge=4
     }
 

IRaCIS.Core.Domain/Allocation/VisitTask.cs

@@ -48,7 +48,7 @@ namespace IRaCIS.Core.Domain.Models
         /// TaskName
         /// </summary>
         [Required]
-		public string TaskName { get; set; }=string.Empty;
+        public string TaskName { get; set; } = string.Empty;
 
         /// <summary>
         /// TaskBlindName
@@ -124,14 +124,21 @@ namespace IRaCIS.Core.Domain.Models
 
         public VisitTask JudgeVisitTask { get; set; }
 
-
-
         //对于裁判项而言，触发裁判的列表
-
         public List<VisitTask> JudgeVisitList { get; set; }
 
 
 
+        //建议完成时间
+        public int SuggesteDays { get; set; }
+
+        public int ReadingTaskState { get; set; }
+
+        public DateTime? SignTime { get; set; }
+
+        //是否回退过
+        public bool IsReturned { get; set; }
+
     }
 
 }