批量重新分配

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -65,7 +65,7 @@
         </member>
         <member name="M:IRaCIS.Core.Application.Service.VisitTaskService.AssignSubjectDoctor(IRaCIS.Core.Application.ViewModel.AssginSubjectDoctorCommand)">
             <summary>
-            批量为 多个Subject 分配医生  手动分配
+            批量为 多个Subject 分配医生  手动分配  IsReAssign 为true 批量删除 重新分配
             </summary>
             <param name="assginSubjectDoctorCommand"></param>
             <returns></returns>

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

@@ -133,6 +133,8 @@ namespace IRaCIS.Core.Application.ViewModel
     {
         public Guid TrialId { get; set; }
 
+        public bool IsReAssign { get; set; }
+
         public List<Guid> SubjectIdList { get; set; }
 
         public List<Guid> DoctorUserIdList { get; set; }

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

@@ -90,13 +90,18 @@ namespace IRaCIS.Core.Application.Service
 
 
         /// <summary>
-        /// 批量为 多个Subject 分配医生  手动分配
+        /// 批量为 多个Subject 分配医生  手动分配  IsReAssign 为true 批量删除 重新分配
         /// </summary>
         /// <param name="assginSubjectDoctorCommand"></param>
         /// <returns></returns>
         [HttpPost]
         public async Task<IResponseOutput> AssignSubjectDoctor(AssginSubjectDoctorCommand assginSubjectDoctorCommand)
         {
+            if (assginSubjectDoctorCommand.IsReAssign)
+            {
+                await _subjectUserRepository.BatchDeleteNoTrackingAsync(t => assginSubjectDoctorCommand.DoctorUserIdList.Contains(t.DoctorUserId) && assginSubjectDoctorCommand.SubjectIdList.Contains(t.SubjectId));
+            }
+
             foreach (var subjectId in assginSubjectDoctorCommand.SubjectIdList)
             {
                 foreach (var doctorUserId in assginSubjectDoctorCommand.DoctorUserIdList)

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

@@ -20,7 +20,7 @@ namespace IRaCIS.Core.Application.Service
                  .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)))
                  .ForMember(o => o.TotalSubjectCount, t => t.MapFrom(u => u.Trial.SubjectList.Count()))
-                /* .ForMember(o => o.SelfSubjectCount, t => t.MapFrom(u => u.Trial.su.Where(t => t.DoctorUserId == u.DoctorUserId).Select(t=>t.SubjectId).Distinct().Count())*/;
+                 .ForMember(o => o.SelfSubjectCount, t => t.MapFrom(u => u.Trial.SubjectDoctorUserList.Where(t => t.DoctorUserId == u.DoctorUserId).Count()));
 
             CreateMap<TaskAllocationRule, AllocateInfo>()
                  .ForMember(o => o.ArmList, t => t.MapFrom(u => u.VisitTaskList.Where(c => c.TrialId == u.TrialId).Select(t => t.ArmEnum).Distinct()))

IRaCIS.Core.Domain/Trial/Trial.cs

@@ -15,6 +15,7 @@ namespace IRaCIS.Core.Domain.Models
             TrialDicList = new List<TrialDictionary>();
         }
 
+        public List<SubjectUser> SubjectDoctorUserList { get; set; }=new List<SubjectUser>();
         public List<VisitTask> VisitTaskList { get; set; }=new List<VisitTask>(){ };
 
         public List<TrialSiteSurvey> TrialSiteSurveyList { get; set; } = new List<TrialSiteSurvey>();