增加用户映射

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

@@ -163,6 +163,7 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<UserRole, IdentityUserTypeDTO>()
                 .ForMember(d => d.UserTypeShortName, c => c.MapFrom(t => t.UserTypeRole.UserTypeShortName));
 
+            CreateMap<UserBasicInfoCommand, IdentityUser>();
             
         }
     }

IRaCIS.Core.Application/Service/WorkLoad/DoctorWorkloadService.cs

@@ -206,7 +206,7 @@ namespace IRaCIS.Core.Application.Service
             var doctorIntoGroupQueryable =
 
                 from intoGroup in _enrollRepository.Where(x => x.TrialId == trialId && x.EnrollStatus >= EnrollStatus.ConfirmIntoGroup)
-                join allocateRule in _taskAllocationRuleRepository.AsQueryable() on intoGroup.Id equals allocateRule.EnrollId
+                join allocateRule in _taskAllocationRuleRepository.Where(x => x.TrialId == trialId) on intoGroup.Id equals allocateRule.EnrollId
                 join doctor in _doctorRepository.AsQueryable() on intoGroup.DoctorId equals doctor.Id
                 join attachmentItem in _attachmentRepository.AsQueryable() on intoGroup.AttachmentId equals attachmentItem.Id into cc
                 from attachment in cc.DefaultIfEmpty()

IRaCIS.Core.Application/TestService.cs

@@ -161,6 +161,8 @@ namespace IRaCIS.Core.Application.Service
         {
             _userInfo.IsNotNeedInspection = true;
 
+            if ((await _identityUserRepository.FirstOrDefaultAsync()) == null)
+            {
                 var userList = _userRoleRepository.Where().ToList();
 
                 foreach (var item in userList.GroupBy(t => t.EMail.Trim()))
@@ -179,6 +181,9 @@ namespace IRaCIS.Core.Application.Service
                 }
 
                 await _identityUserRepository.SaveChangesAsync();
+            }
+
+
 
             return ResponseOutput.Ok();
         }
@@ -192,6 +197,9 @@ namespace IRaCIS.Core.Application.Service
         {
             _userInfo.IsNotNeedInspection = true;
 
+
+            if ((await _trialIdentityUserRepository.FirstOrDefaultAsync()) == null)
+            {
                 var list = _trialUserRoleReposiotry.Where().Select(t => new { t.TrialId, t.UserRole.IdentityUserId, t.UserId, t.JoinTime, t.RemoveTime }).ToList();
 
 
@@ -223,6 +231,9 @@ namespace IRaCIS.Core.Application.Service
                 }
 
                 await _trialIdentityUserRepository.SaveChangesAsync();
+            }
+
+             
 
             return ResponseOutput.Ok();
         }

IRaCIS.Core.Domain/Trial/Enroll.cs

@@ -52,6 +52,8 @@ public partial class Enroll : BaseFullAuditEntity
     public int? Global { get; set; }
 
     public int? Downtime { get; set; }
+
+
     [Comment("生成账号  加入到项目中后 赋值")]
     public Guid? DoctorUserId { get; set; }
 }