项目用户表增加初步修改

2024-12-25 10:20:17 +08:00
parent 32c6d745b6
commit 26cba15742
39 changed files with 19508 additions and 783 deletions
@@ -347,7 +347,7 @@ public class UrgentMIMRepliedMedicalReviewConsumer(
 /// </summary>
 public class UrgentIRApplyedReReadingConsumer(
      IRepository<UserRole> _userRoleRepository,
-        IRepository<TrialUser> _trialUseRepository,
+        IRepository<TrialUserRole> _trialUseRoleRepository,
       IRepository<TaskMedicalReview> _taskMedicalReviewRepository,
      IRepository<Trial> _trialRepository,
        IRepository<SubjectVisit> _subjectVisitRepository,
@@ -372,7 +372,7 @@ public class UrgentIRApplyedReReadingConsumer(

        var doctorInfo = await _userRoleRepository.Where(x => x.Id == taskInfo.DoctorUserId).FirstOrDefaultAsync();

-        var trialUser = await _trialUseRepository.Where(x => x.TrialId == taskInfo.TrialId).Include(x => x.User).Select(x=>x.User).ToListAsync();
+        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == taskInfo.TrialId).Include(x => x.UserRole).Select(x=>x.UserRole).ToListAsync();

        var userinfoList = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.ProjectManager||x.UserTypeEnum==UserTypeEnum.APM).ToList();
        if (context.Message.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed)
@@ -30,7 +30,7 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer;
 public class UserSiteSurveySubmitedEventConsumer(
      IRepository<Trial> _trialRepository,
      IRepository<TrialSite> _trialSiteRepository,
-       IRepository<TrialUser> _trialUserRepository,
+       IRepository<TrialUserRole> _trialUserRepository,
      IRepository<TrialSiteSurvey> _trialSiteSurveyRepository,
      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
      IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig
@@ -48,8 +48,8 @@ public class UserSiteSurveySubmitedEventConsumer(
        var trialId = siteSurveyInfo.TrialId;

        var trialUserList = await _trialUserRepository.Where(t => t.TrialId == siteSurveyInfo.TrialId)
-            .Where(t => t.User.UserTypeEnum == UserTypeEnum.SPM || t.User.UserTypeEnum == UserTypeEnum.CPM || t.User.UserTypeEnum == UserTypeEnum.ProjectManager || t.User.UserTypeEnum == UserTypeEnum.APM)
-            .Select(t => new { t.User.FullName, t.User.EMail, t.User.UserTypeEnum }).ToListAsync();
+            .Where(t => t.UserRole.UserTypeEnum == UserTypeEnum.SPM || t.UserRole.UserTypeEnum == UserTypeEnum.CPM || t.UserRole.UserTypeEnum == UserTypeEnum.ProjectManager || t.UserRole.UserTypeEnum == UserTypeEnum.APM)
+            .Select(t => new { t.UserRole.FullName, t.UserRole.EMail, t.UserRole.UserTypeEnum }).ToListAsync();

        var sPMOrCPMList = trialUserList.Where(t => t.UserTypeEnum == UserTypeEnum.SPM || t.UserTypeEnum == UserTypeEnum.CPM).ToList();
        var pmAndAPMList = trialUserList.Where(t => t.UserTypeEnum == UserTypeEnum.ProjectManager || t.UserTypeEnum == UserTypeEnum.APM).ToList();
@@ -125,7 +125,7 @@ public class UserSiteSurveySubmitedEventConsumer(
 /// </summary>
 public class SiteSurveySPMSubmitedEventConsumer(
      IRepository<Trial> _trialRepository,
-      IRepository<TrialUser> _trialUserRepository,
+      IRepository<TrialUserRole> _trialUserRepository,
      IRepository<TrialSite> _trialSiteRepository,
      IRepository<TrialSiteSurvey> _trialSiteSurveyRepository,
      IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
@@ -146,8 +146,8 @@ public class SiteSurveySPMSubmitedEventConsumer(
        var messageToSend = new MimeMessage();

        var trialUserList = _trialUserRepository.Where(t => t.TrialId == trialId)
-            .Where(t => t.User.UserTypeEnum == UserTypeEnum.SPM || t.User.UserTypeEnum == UserTypeEnum.CPM || t.User.UserTypeEnum == UserTypeEnum.ProjectManager || t.User.UserTypeEnum == UserTypeEnum.APM)
-            .Select(t => new { t.User.EMail, t.User.FullName, t.User.UserTypeEnum }).ToList();
+            .Where(t => t.UserRole.UserTypeEnum == UserTypeEnum.SPM || t.UserRole.UserTypeEnum == UserTypeEnum.CPM || t.UserRole.UserTypeEnum == UserTypeEnum.ProjectManager || t.UserRole.UserTypeEnum == UserTypeEnum.APM)
+            .Select(t => new { t.UserRole.EMail, t.UserRole.FullName, t.UserRole.UserTypeEnum }).ToList();

        var sPMOrCPMList = trialUserList.Where(t => t.UserTypeEnum == UserTypeEnum.SPM || t.UserTypeEnum == UserTypeEnum.CPM).ToList();
        var pmAndAPMList = trialUserList.Where(t => t.UserTypeEnum == UserTypeEnum.ProjectManager || t.UserTypeEnum == UserTypeEnum.APM).ToList();
@@ -200,7 +200,7 @@ public class SiteSurveySPMSubmitedEventConsumer(
 /// 调研表驳回发送邮件    之前已有，需要迁移过来
 /// </summary>
 public class SiteSurverRejectedEventConsumer(
-       IRepository<TrialUser> _trialUserRepository,
+       IRepository<TrialUserRole> _trialUserRepository,
      IRepository<Trial> _trialRepository,
      IRepository<TrialSite> _trialSiteRepository,
      IRepository<TrialSiteSurvey> _trialSiteSurveyRepository,
@@ -234,8 +234,8 @@ public class SiteSurverRejectedEventConsumer(
                //name = user.FullName;

                var sPMOrCPMList = _trialUserRepository.Where(t => t.TrialId == trialId)
-                  .Where(t => t.User.UserTypeEnum == UserTypeEnum.SPM || t.User.UserTypeEnum == UserTypeEnum.CPM)
-                  .Select(t => new { t.User.EMail, t.User.FullName, t.User.UserTypeEnum }).ToList();
+                  .Where(t => t.UserRole.UserTypeEnum == UserTypeEnum.SPM || t.UserRole.UserTypeEnum == UserTypeEnum.CPM)
+                  .Select(t => new { t.UserRole.EMail, t.UserRole.FullName, t.UserRole.UserTypeEnum }).ToList();


                foreach (var user in sPMOrCPMList)
@@ -24,7 +24,7 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer;
 /// </summary>
 public class CRCSubmitedAndQCToAuditEventConsumer(
      IRepository<UserRole> _userRoleRepository,
-        IRepository<TrialUser> _trialUseRepository,
+        IRepository<TrialUserRole> _trialUseRoleRepository,
       IRepository<SubjectVisit> _subjectVisitRepository,
      IRepository<Trial> _trialRepository,
      IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
@@ -43,7 +43,7 @@ public class CRCSubmitedAndQCToAuditEventConsumer(

        var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).Include(x => x.Subject).FirstOrDefaultAsync();

-        var trialUser = await _trialUseRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.User).Select(x => x.User).ToListAsync();
+        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();

        var userinfoList = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.IQC).ToList();

@@ -128,7 +128,7 @@ public class CRCSubmitedAndQCToAuditEventConsumer(
 /// </summary>
 public class CRCRepliedQCChallengeEventConsumer(
      IRepository<UserRole> _userRoleRepository,
-        IRepository<TrialUser> _trialUseRepository,
+        IRepository<TrialUserRole> _trialUseRoleRepository,
       IRepository<SubjectVisit> _subjectVisitRepository,
      IRepository<Trial> _trialRepository,
      IRepository<QCChallenge> _qCChallengeRepository,
@@ -153,7 +153,7 @@ public class CRCRepliedQCChallengeEventConsumer(



-        var trialUser = await _trialUseRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.User).Select(x => x.User).ToListAsync();
+        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();



@@ -225,7 +225,7 @@ public class CRCRepliedQCChallengeEventConsumer(
 /// </summary>
 public class QCRepliedQCChallengeEventConsumer(
      IRepository<UserRole> _userRoleRepository,
-        IRepository<TrialUser> _trialUseRepository,
+        IRepository<TrialUserRole> _trialUseRoleRepository,
       IRepository<SubjectVisit> _subjectVisitRepository,
      IRepository<Trial> _trialRepository,
      IRepository<QCChallenge> _qCChallengeRepository,
@@ -259,7 +259,7 @@ public class QCRepliedQCChallengeEventConsumer(

        var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).Include(x => x.Subject).FirstNotNullAsync();

-        var trialUser = await _trialUseRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.User).Select(x => x.User).ToListAsync();
+        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();

        var userinfoList = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).ToList();

@@ -334,7 +334,7 @@ public class QCRepliedQCChallengeEventConsumer(
 /// </summary>
 public class CRCRepliedCheckChallengeEventConsumer(
      IRepository<UserRole> _userRoleRepository,
-        IRepository<TrialUser> _trialUseRepository,
+        IRepository<TrialUserRole> _trialUseRoleRepository,
       IRepository<SubjectVisit> _subjectVisitRepository,
      IRepository<Trial> _trialRepository,
      IRepository<QCChallenge> _qCChallengeRepository,
@@ -354,7 +354,7 @@ public class CRCRepliedCheckChallengeEventConsumer(

        var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).Include(x => x.Subject).FirstNotNullAsync();

-        var trialUser = await _trialUseRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.User).Select(x => x.User).ToListAsync();
+        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();

        var userinfoList = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.APM || x.UserTypeEnum == UserTypeEnum.ProjectManager).ToList();

@@ -426,7 +426,7 @@ public class CRCRepliedCheckChallengeEventConsumer(
 /// </summary>
 public class PMRepliedCheckChallengeEventConsumer(
      IRepository<UserRole> _userRoleRepository,
-        IRepository<TrialUser> _trialUseRepository,
+        IRepository<TrialUserRole> _trialUseRoleRepository,
       IRepository<SubjectVisit> _subjectVisitRepository,
      IRepository<Trial> _trialRepository,
      IRepository<CheckChallengeDialog> _checkChallengeDialogRepository,
@@ -446,7 +446,7 @@ public class PMRepliedCheckChallengeEventConsumer(

        var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).Include(x => x.NoneDicomStudyList).Include(x => x.StudyList).Include(x => x.Subject).FirstNotNullAsync();

-        var trialUser = await _trialUseRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.User).Select(x => x.User).ToListAsync();
+        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();

        var userinfoList = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).ToList();

@@ -525,7 +525,7 @@ public class PMRepliedCheckChallengeEventConsumer(
 /// </summary>
 public class CheckStateChangedToAuditEventConsumer(
      IRepository<UserRole> _userRoleRepository,
-        IRepository<TrialUser> _trialUseRepository,
+        IRepository<TrialUserRole> _trialUseRoleRepository,
       IRepository<SubjectVisit> _subjectVisitRepository,
      IRepository<Trial> _trialRepository,
      IRepository<QCChallenge> _qCChallengeRepository,
@@ -544,7 +544,7 @@ public class CheckStateChangedToAuditEventConsumer(

        var subjectVisit = await _subjectVisitRepository.Where(x => x.Id == subjectVisitId).Include(x => x.Subject).FirstNotNullAsync();

-        var trialUser = await _trialUseRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.User).Select(x => x.User).ToListAsync();
+        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();

        var userinfoList = trialUser.Where(x => x.UserTypeEnum == UserTypeEnum.APM || x.UserTypeEnum == UserTypeEnum.ProjectManager).ToList();

@@ -613,7 +613,7 @@ public class CheckStateChangedToAuditEventConsumer(
 /// </summary>
 public class QCClaimTaskEventConsumer(
      IRepository<UserRole> _userRoleRepository,
-        IRepository<TrialUser> _trialUseRepository,
+        IRepository<TrialUserRole> _trialUseRoleRepository,
       IRepository<SubjectVisit> _subjectVisitRepository,
      IRepository<Trial> _trialRepository,
      IRepository<QCChallenge> _qCChallengeRepository,
@@ -639,7 +639,7 @@ public class QCClaimTaskEventConsumer(



-        var trialUser = await _trialUseRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.User).Select(x => x.User).ToListAsync();
+        var trialUser = await _trialUseRoleRepository.Where(x => x.TrialId == subjectVisit.TrialId).Include(x => x.UserRole).Select(x => x.UserRole).ToListAsync();



@@ -26,7 +26,7 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
        IRepository<ReadingQuestionCriterionTrial> _trialReadingCriterionRepository,
        IRepository<VisitTask> _visitTaskRepository,
         IRepository<Dictionary> _dictionaryRepository,
-        IRepository<TrialUser> _trialUserRepository,
+        IRepository<TrialUserRole> _trialUserRepository,
        IRepository<EmailNoticeConfig> _emailNoticeConfigrepository,
        IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : IConsumer<UrgentIRUnReadTaskRecurringEvent>
    {
@@ -55,9 +55,9 @@ namespace IRaCIS.Core.Application.MassTransit.Recurring
            var trialUserList = _trialUserRepository.Where(t => t.TrialId == trialId).Select(t => new
            {
                t.UserId,
-                t.User.FullName,
-                t.User.EMail,
-                t.User.UserName,
+                t.UserRole.FullName,
+                t.UserRole.EMail,
+                t.UserRole.UserName,
                t.Trial.TrialCode,
                t.Trial.ResearchProgramNo
                //TrialReadingCriterionList = t.Trial.TrialReadingCriterionList.Select(t => new { t.CriterionName, TrialReadingCriterionId = t.Id }).ToList()
@@ -22,7 +22,7 @@ public static class OldRecurringEmailHelper
    public static async Task SendTrialEmailAsync(
      IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigRepository,
      IRepository<Trial> _trialRepository,
-      IRepository<TrialUser> _trialUserRepository,
+      IRepository<TrialUserRole> _trialUserRepository,
      IRepository<VisitTask> _visitTaskRepository,
      IRepository<TrialSiteUser> _trialSiteUserRepository,

@@ -59,7 +59,7 @@ public static class OldRecurringEmailHelper

            var allUserTypeEnumList = toUserTypeEnumList.Union(copyUserTypeEnumList).Distinct().ToList();

-            var allUserList = await _trialUserRepository.Where(t => t.TrialId == trialId && allUserTypeEnumList.Contains(t.User.UserTypeEnum)).Select(t => new { t.UserId, t.User.EMail, t.User.FullName, t.User.UserTypeEnum }).ToListAsync();
+            var allUserList = await _trialUserRepository.Where(t => t.TrialId == trialId && allUserTypeEnumList.Contains(t.UserRole.UserTypeEnum)).Select(t => new { t.UserId, t.UserRole.EMail, t.UserRole.FullName, t.UserRole.UserTypeEnum }).ToListAsync();


            var toUserList = allUserList.Where(t => toUserTypeEnumList.Contains(t.UserTypeEnum))
@@ -23,7 +23,7 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer;

 public class QCImageQuestionRecurringEventConsumer(IRepository<Trial> _trialRepository,
    IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigRepository,
-      IRepository<TrialUser> _trialUserRepository,
+      IRepository<TrialUserRole> _trialUserRepository,
      IRepository<VisitTask> _visitTaskRepository,
      IRepository<TrialSiteUser> _trialSiteUserRepository,
      IOptionsMonitor<SystemEmailSendConfig> _SystemEmailSendConfig) : IConsumer<QCImageQuestionRecurringEvent>
@@ -37,7 +37,7 @@ public class QCImageQuestionRecurringEventConsumer(IRepository<Trial> _trialRepo
        var trialInfo = await _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.ResearchProgramNo, t.ExperimentName, t.TrialCode, t.TrialStatusStr }).FirstNotNullAsync();

        //找到 该项目的CRC 用户Id
-        var userList = await _trialUserRepository.Where(t => t.TrialId == trialId).Where(t => t.User.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).Select(t => new { t.UserId, t.User.FullName }).ToListAsync();
+        var userList = await _trialUserRepository.Where(t => t.TrialId == trialId).Where(t => t.UserRole.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).Select(t => new { t.UserId, t.UserRole.FullName }).ToListAsync();

        //判断是否任务可以领取 ，可以的话 发送邮件

@@ -88,7 +88,7 @@ public class QCImageQuestionRecurringEventConsumer(IRepository<Trial> _trialRepo
 /// </summary>
 public class CRCImageQuestionRecurringEventConsumer(IRepository<Trial> _trialRepository,
    IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigRepository,
-      IRepository<TrialUser> _trialUserRepository,
+      IRepository<TrialUserRole> _trialUserRepository,
      IRepository<VisitTask> _visitTaskRepository,
      IRepository<TrialSiteUser> _trialSiteUserRepository,
      IOptionsMonitor<SystemEmailSendConfig> _SystemEmailSendConfig) : IConsumer<CRCImageQuestionRecurringEvent>
@@ -101,7 +101,7 @@ public class CRCImageQuestionRecurringEventConsumer(IRepository<Trial> _trialRep
        var trialInfo = await _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.ResearchProgramNo, t.ExperimentName, t.TrialCode, t.TrialStatusStr, t.DeclarationTypeEnumList }).FirstNotNullAsync();

        //找到 该项目的IQC 用户Id
-        var userList = await _trialUserRepository.Where(t => t.TrialId == trialId).Where(t => t.User.UserTypeEnum == UserTypeEnum.IQC).Select(t => new { t.UserId, t.User.FullName }).ToListAsync();
+        var userList = await _trialUserRepository.Where(t => t.TrialId == trialId).Where(t => t.UserRole.UserTypeEnum == UserTypeEnum.IQC).Select(t => new { t.UserId, t.UserRole.FullName }).ToListAsync();

        //判断是否任务可以领取 ，可以的话 发送邮件

@@ -155,7 +155,7 @@ public class CRCImageQuestionRecurringEventConsumer(IRepository<Trial> _trialRep
 /// </summary>
 public class ImageQCRecurringEventConsumer(IRepository<Trial> _trialRepository,
    IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigRepository,
-      IRepository<TrialUser> _trialUserRepository,
+      IRepository<TrialUserRole> _trialUserRepository,
      IRepository<VisitTask> _visitTaskRepository,
      IRepository<TrialSiteUser> _trialSiteUserRepository,
      IOptionsMonitor<SystemEmailSendConfig> _SystemEmailSendConfig) : IConsumer<ImageQCRecurringEvent>
@@ -169,7 +169,7 @@ public class ImageQCRecurringEventConsumer(IRepository<Trial> _trialRepository,
        var trialInfo = await _trialRepository.Where(t => t.Id == trialId).Select(t => new { t.ResearchProgramNo, t.ExperimentName, t.TrialCode, t.TrialStatusStr }).FirstNotNullAsync();

        //找到 该项目的IQC 用户Id
-        var userList = await _trialUserRepository.Where(t => t.TrialId == trialId).Where(t => t.User.UserTypeEnum == UserTypeEnum.IQC).Select(t => new { t.UserId, t.User.FullName }).ToListAsync();
+        var userList = await _trialUserRepository.Where(t => t.TrialId == trialId).Where(t => t.UserRole.UserTypeEnum == UserTypeEnum.IQC).Select(t => new { t.UserId, t.UserRole.FullName }).ToListAsync();

        //判断是否任务可以领取 ，可以的话 发送邮件
        var userIdList = userList.Select(t => t.UserId).ToList();