修改分配任务

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

@@ -40,7 +40,7 @@ namespace IRaCIS.Core.Application.Service
              .ProjectTo<TaskAllocationRuleView>(_mapper.ConfigurationProvider);
 
 
-            var trialTaskConfig= _trialRepository.Where(t=>t.Id==queryTaskAllocationRule.TrialId).ProjectTo<TrialTaskConfig>(_mapper.ConfigurationProvider);
+            var trialTaskConfig= _trialRepository.Where(t=>t.Id==queryTaskAllocationRule.TrialId).ProjectTo<TrialTaskConfig>(_mapper.ConfigurationProvider).FirstOrDefault();
             return (await taskAllocationRuleQueryable.ToListAsync(), trialTaskConfig);
         }
 
@@ -51,7 +51,7 @@ namespace IRaCIS.Core.Application.Service
         {
             var verifyExp1 = new EntityVerifyExp<TaskAllocationRule>()
             {
-                VerifyExp = t => t.DoctorUserId == addOrEditTaskAllocationRule.DoctorUserId,
+                VerifyExp = t => t.DoctorUserId == addOrEditTaskAllocationRule.DoctorUserId && t.TrialId== addOrEditTaskAllocationRule.TrialId,
                 VerifyMsg = "已有该医生配置，不允许继续增加"
             };
 

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

@@ -16,12 +16,12 @@ 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.ArmList, t => t.MapFrom(u => u.VisitTaskList.Select(t=>t.ArmEnum).Distinct()))
+                 .ForMember(o => o.ArmList, t => t.MapFrom(u => u.VisitTaskList.Where(c=>c.TrialId==u.TrialId).Select(t=>t.ArmEnum).Distinct()))
                  .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<TaskAllocationRule, AllocateInfo>()
-                 .ForMember(o => o.ArmList, t => t.MapFrom(u => u.VisitTaskList.Select(t => t.ArmEnum).Distinct()))
+                 .ForMember(o => o.ArmList, t => t.MapFrom(u => u.VisitTaskList.Where(c => c.TrialId == u.TrialId).Select(t => t.ArmEnum).Distinct()))
                 .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)));