项目用户表增加初步修改

2024-12-25 10:20:17 +08:00 · 2024-12-25 10:20:17 +08:00 · 26cba15742
parent 32c6d745b6
commit 26cba15742
39 changed files with 19508 additions and 783 deletions
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@ -237,7 +237,7 @@
            医学审核生成规则   废弃
            </summary>	
        </member>
-        <member name="M:IRaCIS.Core.Application.Service.TaskMedicalReviewRuleService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TaskMedicalReviewRule},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
+        <member name="M:IRaCIS.Core.Application.Service.TaskMedicalReviewRuleService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TaskMedicalReviewRule},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
            <summary>
            医学审核生成规则   废弃
            </summary>	
@ -247,7 +247,7 @@
            任务医学审核
            </summary>	
        </member>
-        <member name="M:IRaCIS.Core.Application.Service.TaskMedicalReviewService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TaskMedicalReview},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
+        <member name="M:IRaCIS.Core.Application.Service.TaskMedicalReviewService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TaskMedicalReview},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
            <summary>
            任务医学审核
            </summary>	
@ -678,7 +678,7 @@
            <param name="eventId"></param>
            <returns></returns>
        </member>
-        <member name="M:IRaCIS.Core.Application.Service.Common.ExcelExportService.TrialUserListExport(IRaCIS.Application.Contracts.TrialMaintenanceExportQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CommonDocument},IRaCIS.Application.Interfaces.IDictionaryService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser})">
+        <member name="M:IRaCIS.Core.Application.Service.Common.ExcelExportService.TrialUserListExport(IRaCIS.Application.Contracts.TrialMaintenanceExportQuery,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CommonDocument},IRaCIS.Application.Interfaces.IDictionaryService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole})">
            <summary>
            项目参与人员导出
            </summary>
@ -686,7 +686,7 @@
            <param name="_commonDocumentRepository"></param>
            <param name="_dictionaryService"></param>
            <param name="_trialRepository"></param>
-            <param name="_trialUseRepository"></param>
+            <param name="_trialUseRoleRepository"></param>
            <returns></returns>
            <exception cref="T:System.Exception"></exception>
        </member>
@ -1328,7 +1328,7 @@
            TrialEmailNoticeConfigService
            </summary>	
        </member>
-        <member name="M:IRaCIS.Core.Application.Service.TrialEmailNoticeConfigService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialEmailNoticeConfig},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialEmailBlackUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TaskMedicalReview},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingGlobalTaskInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialEmailNoticeUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Subject},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadModule},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTableQuestionAnswer},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTaskQuestionAnswer},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig},IRaCIS.Core.Application.Service.IEmailSendService,AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer,Microsoft.AspNetCore.Hosting.IWebHostEnvironment)">
+        <member name="M:IRaCIS.Core.Application.Service.TrialEmailNoticeConfigService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialEmailNoticeConfig},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialEmailBlackUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TaskMedicalReview},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingGlobalTaskInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialEmailNoticeUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Subject},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadModule},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTableQuestionAnswer},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTaskQuestionAnswer},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig},IRaCIS.Core.Application.Service.IEmailSendService,AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer,Microsoft.AspNetCore.Hosting.IWebHostEnvironment)">
            <summary>
            TrialEmailNoticeConfigService
            </summary>	
@ -12715,7 +12715,7 @@
            Dashboard统计、全局工作量统计、入组两个维度统计（按照项目、按照人）
            </summary>
        </member>
-        <member name="M:IRaCIS.Core.Application.Service.StatisticsService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Doctor},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Enroll},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Workload},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CRO},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Hospital},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EnrollDetail},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
+        <member name="M:IRaCIS.Core.Application.Service.StatisticsService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Doctor},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Enroll},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Workload},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CRO},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Hospital},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EnrollDetail},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
            <summary>
            Dashboard统计、全局工作量统计、入组两个维度统计（按照项目、按照人）
            </summary>
@ -12834,7 +12834,7 @@
            项目外部人员  录入流程相关
            </summary>	
        </member>
-        <member name="M:IRaCIS.Core.Application.Service.TrialExternalUserService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialExternalUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserType},IRaCIS.Core.Application.Service.IMailVerificationService,Medallion.Threading.IDistributedLockProvider,AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
+        <member name="M:IRaCIS.Core.Application.Service.TrialExternalUserService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialExternalUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.IdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserType},IRaCIS.Core.Application.Service.IMailVerificationService,Medallion.Threading.IDistributedLockProvider,AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
            <summary>
            项目外部人员  录入流程相关
            </summary>	
@ -13092,7 +13092,7 @@
            入组流程-CRO确定医生名单 [ Approve]
            </summary>
        </member>
-        <member name="M:IRaCIS.Core.Application.Service.EnrollService.ConfirmReviewer(IRaCIS.Core.Application.Service.WorkLoad.DTO.ConfirmReviewerCommand,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TaskAllocationRule})">
+        <member name="M:IRaCIS.Core.Application.Service.EnrollService.ConfirmReviewer(IRaCIS.Core.Application.Service.WorkLoad.DTO.ConfirmReviewerCommand,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TaskAllocationRule})">
            <summary>
            入组流程-后台确认医生入组[Confirm]
            </summary>
@ -13123,6 +13123,13 @@
            </summary>
            <returns></returns>
        </member>
+        <member name="M:IRaCIS.Core.Application.Service.TestService.UserTrialUser(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialIdentityUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole})">
+            <summary>
+            项目用户 维护数据
+            </summary>
+            <param name="_trialIdentityUserRepository"></param>
+            <returns></returns>
+        </member>
        <member name="M:IRaCIS.Core.Application.Service.TestService.ModifyClinicalDataTable">
            <summary>
            维护临床数据  --一定要在同步表前同步数据才行
@ -13349,7 +13356,7 @@
            加急阅片 IR 申请重阅  或者PM 申请重阅
            </summary>
        </member>
-        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.UrgentIRApplyedReReadingConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TaskMedicalReview},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
+        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.UrgentIRApplyedReReadingConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TaskMedicalReview},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
            <summary>
            加急阅片 IR 申请重阅  或者PM 申请重阅
            </summary>
@ -13359,7 +13366,7 @@
            用户提交 发送邮件 通知SPM 或者PM
            </summary>
        </member>
-        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.UserSiteSurveySubmitedEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSite},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteSurvey},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
+        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.UserSiteSurveySubmitedEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSite},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteSurvey},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
            <summary>
            用户提交 发送邮件 通知SPM 或者PM
            </summary>
@ -13369,7 +13376,7 @@
            调研表初审通过，进行复审发送邮件
            </summary>
        </member>
-        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.SiteSurveySPMSubmitedEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSite},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteSurvey},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
+        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.SiteSurveySPMSubmitedEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSite},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteSurvey},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
            <summary>
            调研表初审通过，进行复审发送邮件
            </summary>
@ -13379,7 +13386,7 @@
            调研表驳回发送邮件    之前已有，需要迁移过来
            </summary>
        </member>
-        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.SiteSurverRejectedEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSite},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteSurvey},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
+        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.SiteSurverRejectedEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSite},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteSurvey},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
            <summary>
            调研表驳回发送邮件    之前已有，需要迁移过来
            </summary>
@ -13389,7 +13396,7 @@
            CRC 提交了 通知QC进行质控  Code005，006
            </summary>
        </member>
-        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.CRCSubmitedAndQCToAuditEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
+        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.CRCSubmitedAndQCToAuditEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
            <summary>
            CRC 提交了 通知QC进行质控  Code005，006
            </summary>
@ -13399,7 +13406,7 @@
            CRC 回复质控质疑 通知QC  Code012，013
            </summary>
        </member>
-        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.CRCRepliedQCChallengeEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.QCChallenge},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.QCChallengeDialog},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
+        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.CRCRepliedQCChallengeEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.QCChallenge},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.QCChallengeDialog},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
            <summary>
            CRC 回复质控质疑 通知QC  Code012，013
            </summary>
@ -13409,7 +13416,7 @@
            QC回复 质控质疑，通知CRC (014，015)
            </summary>
        </member>
-        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.QCRepliedQCChallengeEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.QCChallenge},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.QCChallengeDialog},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
+        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.QCRepliedQCChallengeEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.QCChallenge},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.QCChallengeDialog},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
            <summary>
            QC回复 质控质疑，通知CRC (014，015)
            </summary>
@ -13419,19 +13426,19 @@
            CRC 回复一致性核查质疑 通知PM  (019,020)
            </summary>
        </member>
-        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.CRCRepliedCheckChallengeEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.QCChallenge},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.QCChallengeDialog},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
+        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.CRCRepliedCheckChallengeEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.QCChallenge},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.QCChallengeDialog},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
            <summary>
            CRC 回复一致性核查质疑 通知PM  (019,020)
            </summary>
        </member>
        <!-- Badly formed XML comment ignored for member "T:IRaCIS.Core.Application.MassTransit.Consumer.PMRepliedCheckChallengeEventConsumer" -->
-        <!-- Badly formed XML comment ignored for member "M:IRaCIS.Core.Application.MassTransit.Consumer.PMRepliedCheckChallengeEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CheckChallengeDialog},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.QCChallengeDialog},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})" -->
+        <!-- Badly formed XML comment ignored for member "M:IRaCIS.Core.Application.MassTransit.Consumer.PMRepliedCheckChallengeEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.CheckChallengeDialog},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.QCChallengeDialog},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})" -->
        <member name="T:IRaCIS.Core.Application.MassTransit.Consumer.CheckStateChangedToAuditEventConsumer">
            <summary>
            通知PM 进行一致性核查 (018,030)
            </summary>
        </member>
-        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.CheckStateChangedToAuditEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.QCChallenge},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.QCChallengeDialog},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
+        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.CheckStateChangedToAuditEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.QCChallenge},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.QCChallengeDialog},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
            <summary>
            通知PM 进行一致性核查 (018,030)
            </summary>
@ -13441,7 +13448,7 @@
            QC 领取了质控任务 (007，008) 
            </summary>
        </member>
-        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.QCClaimTaskEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.QCChallenge},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.QCChallengeDialog},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
+        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.QCClaimTaskEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.QCChallenge},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.QCChallengeDialog},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
            <summary>
            QC 领取了质控任务 (007，008) 
            </summary>
@ -13467,7 +13474,7 @@
            QC 影像质疑
            </summary>
        </member>
-        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.QCImageQuestionRecurringEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialEmailNoticeConfig},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteUser},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
+        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.QCImageQuestionRecurringEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialEmailNoticeConfig},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteUser},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
            <summary>
            QC 影像质疑
            </summary>
@ -13477,7 +13484,7 @@
            CRC 影像质疑
            </summary>
        </member>
-        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.CRCImageQuestionRecurringEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialEmailNoticeConfig},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteUser},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
+        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.CRCImageQuestionRecurringEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialEmailNoticeConfig},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteUser},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
            <summary>
            CRC 影像质疑
            </summary>
@ -13487,7 +13494,7 @@
            影像质控  发送给QC的
            </summary>
        </member>
-        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.ImageQCRecurringEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialEmailNoticeConfig},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteUser},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
+        <member name="M:IRaCIS.Core.Application.MassTransit.Consumer.ImageQCRecurringEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialEmailNoticeConfig},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteUser},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
            <summary>
            影像质控  发送给QC的
            </summary>
@ -13527,7 +13534,7 @@
            10分钟检测通知IR 已通知的进行标注，下次不会再通知
            </summary>
        </member>
-        <member name="M:IRaCIS.Core.Application.MassTransit.Recurring.UrgentIRUnReadTaskRecurringEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
+        <member name="M:IRaCIS.Core.Application.MassTransit.Recurring.UrgentIRUnReadTaskRecurringEventConsumer.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Dictionary},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.EmailNoticeConfig},Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig})">
            <summary>
            10分钟检测通知IR 已通知的进行标注，下次不会再通知
            </summary>
@ -15418,7 +15425,7 @@
            TrialSiteSurveyService
            </summary>	
        </member>
-        <member name="M:IRaCIS.Core.Application.Contracts.TrialSiteSurveyService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteSurvey},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteUserSurvey},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSite},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Doctor},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VerificationCode},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteUser},Medallion.Threading.IDistributedLockProvider,IRaCIS.Core.Application.Auth.ITokenService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserType},IRaCIS.Core.Application.Service.IMailVerificationService,Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
+        <member name="M:IRaCIS.Core.Application.Contracts.TrialSiteSurveyService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteSurvey},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteUserSurvey},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSite},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Doctor},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VerificationCode},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialSiteUser},Medallion.Threading.IDistributedLockProvider,IRaCIS.Core.Application.Auth.ITokenService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.UserType},IRaCIS.Core.Application.Service.IMailVerificationService,Microsoft.Extensions.Options.IOptionsMonitor{IRaCIS.Core.Domain.Share.SystemEmailSendConfig},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
            <summary>
            TrialSiteSurveyService
            </summary>	
@ -16068,7 +16075,7 @@
            TrialDocumentService
            </summary>	
        </member>
-        <member name="M:IRaCIS.Core.Application.Services.TrialDocumentService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocument},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocConfirmedUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Application.Contracts.ISystemDocumentService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocConfirmedUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocNeedConfirmedUserType},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocNeedConfirmedUserType},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocument},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocConfirmedUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
+        <member name="M:IRaCIS.Core.Application.Services.TrialDocumentService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocument},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocConfirmedUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Trial},IRaCIS.Core.Application.Contracts.ISystemDocumentService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocConfirmedUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocNeedConfirmedUserType},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocNeedConfirmedUserType},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SystemDocument},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialUserRole},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialDocConfirmedUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
            <summary>
            TrialDocumentService
            </summary>	
--- a/IRaCIS.Core.Application/MassTransit/Consumer/ReadingRelationEmailConsumer.cs
+++ b/IRaCIS.Core.Application/MassTransit/Consumer/ReadingRelationEmailConsumer.cs
@ -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)
--- a/IRaCIS.Core.Application/MassTransit/Consumer/SiteSurverEmailConsumer.cs
+++ b/IRaCIS.Core.Application/MassTransit/Consumer/SiteSurverEmailConsumer.cs
@ -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)
--- a/IRaCIS.Core.Application/MassTransit/Consumer/SubjectVisitQCAndCheckConsumer.cs
+++ b/IRaCIS.Core.Application/MassTransit/Consumer/SubjectVisitQCAndCheckConsumer.cs
@ -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();



--- a/IRaCIS.Core.Application/MassTransit/Recurring/IRRecurringConsumer.cs
+++ b/IRaCIS.Core.Application/MassTransit/Recurring/IRRecurringConsumer.cs
@ -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()
--- a/IRaCIS.Core.Application/MassTransit/Recurring/OldRecurringEmailHelper.cs
+++ b/IRaCIS.Core.Application/MassTransit/Recurring/OldRecurringEmailHelper.cs
@ -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))
--- a/IRaCIS.Core.Application/MassTransit/Recurring/QCRecurringEmailConsumer.cs
+++ b/IRaCIS.Core.Application/MassTransit/Recurring/QCRecurringEmailConsumer.cs
@ -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();
--- a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewRuleService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewRuleService.cs
@ -16,7 +16,7 @@ namespace IRaCIS.Core.Application.Service
    /// </summary>	
    [ApiExplorerSettings(GroupName = "Trial")]
    public class TaskMedicalReviewRuleService(IRepository<TaskMedicalReviewRule> _taskMedicalReviewRuleRepository,
-        IRepository<TrialUser> _trialUserRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITaskMedicalReviewRuleService
+        IRepository<TrialUserRole> _trialUserRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITaskMedicalReviewRuleService
    {


@ -29,7 +29,7 @@ namespace IRaCIS.Core.Application.Service
            var taskTaskMedicalReviewRuleQueryable = _taskMedicalReviewRuleRepository.Where(t => t.TrialId == inQuery.TrialId)
            .ProjectTo<TaskMedicalReviewRuleView>(_mapper.ConfigurationProvider);

-            var isHaveMIM = await _trialUserRepository.AnyAsync(t => t.User.UserTypeEnum == Domain.Share.UserTypeEnum.MIM && t.TrialId == inQuery.TrialId);
+            var isHaveMIM = await _trialUserRepository.AnyAsync(t => t.UserRole.UserTypeEnum == Domain.Share.UserTypeEnum.MIM && t.TrialId == inQuery.TrialId);

            return (await taskTaskMedicalReviewRuleQueryable.ToListAsync(), new { IsHaveMIM = isHaveMIM });
        }
--- a/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/TaskMedicalReviewService.cs
@ -18,7 +18,7 @@ namespace IRaCIS.Core.Application.Service
    /// </summary>	
    [ApiExplorerSettings(GroupName = "Trial")]
    public class TaskMedicalReviewService(IRepository<TaskMedicalReview> _taskMedicalReviewRepository,
-        IRepository<TrialUser> _trialUserRepository,
+        IRepository<TrialUserRole> _trialUserRepository,
        IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
        IRepository<VisitTask> _visitTaskRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITaskMedicalReviewService
    {
@ -328,7 +328,7 @@ namespace IRaCIS.Core.Application.Service
        [HttpGet("{trialId:guid}")]
        public async Task<List<UserSimpleInfo>> GetMIMUserList(Guid trialId)
        {
-            var query = _trialUserRepository.Where(t => (t.User.UserTypeEnum == Domain.Share.UserTypeEnum.MIM || t.User.UserTypeEnum == Domain.Share.UserTypeEnum.MC) && t.TrialId == trialId).Select(t => t.User).ProjectTo<UserSimpleInfo>(_mapper.ConfigurationProvider);
+            var query = _trialUserRepository.Where(t => (t.UserRole.UserTypeEnum == Domain.Share.UserTypeEnum.MIM || t.UserRole.UserTypeEnum == Domain.Share.UserTypeEnum.MC) && t.TrialId == trialId).Select(t => t.UserRole).ProjectTo<UserSimpleInfo>(_mapper.ConfigurationProvider);

            return await query.ToListAsync();
        }
--- a/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs
@ -1512,7 +1512,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,

        var isSPMJoinReReadingApproval = _trialRepository.Any(t => t.Id == trialId && t.IsSPMJoinReReadingApproval);

-        var hasSPMOrCPM = await _trialRepository.Where(t => t.Id == trialId).SelectMany(t => t.TrialUserList).AnyAsync(t => t.User.UserTypeEnum == UserTypeEnum.SPM || t.User.UserTypeEnum == UserTypeEnum.CPM);
+        var hasSPMOrCPM = await _trialRepository.Where(t => t.Id == trialId).SelectMany(t => t.TrialUserList).AnyAsync(t => t.UserRole.UserTypeEnum == UserTypeEnum.SPM || t.UserRole.UserTypeEnum == UserTypeEnum.CPM);

        var isSPMjoin = isSPMJoinReReadingApproval && hasSPMOrCPM;

--- a/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
+++ b/IRaCIS.Core.Application/Service/Common/ExcelExportService.cs
@ -25,7 +25,7 @@ namespace IRaCIS.Core.Application.Service.Common
 {

    [ApiExplorerSettings(GroupName = "Common")]
-    public class ExcelExportService(IRepository<TrialUser> _trialUserRepository,
+    public class ExcelExportService(IRepository<TrialUserRole> _trialUserRepository,
        IRepository<VisitTask> _visitTaskRepository,
        IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
        IRepository<SystemDocNeedConfirmedUserType> _systemDocNeedConfirmedUserTypeRepository,
@ -54,7 +54,7 @@ namespace IRaCIS.Core.Application.Service.Common
        /// <param name="_commonDocumentRepository"></param>
        /// <param name="_dictionaryService"></param>
        /// <param name="_trialRepository"></param>
-        /// <param name="_trialUseRepository"></param>
+        /// <param name="_trialUseRoleRepository"></param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        [HttpPost]
@ -63,7 +63,7 @@ namespace IRaCIS.Core.Application.Service.Common
            [FromServices] IRepository<CommonDocument> _commonDocumentRepository,
            [FromServices] IDictionaryService _dictionaryService,
            [FromServices] IRepository<Trial> _trialRepository,
-            [FromServices] IRepository<TrialUser> _trialUseRepository
+            [FromServices] IRepository<TrialUserRole> _trialUseRoleRepository

            )
        {
@ -71,15 +71,15 @@ namespace IRaCIS.Core.Application.Service.Common

            var exportInfo = (await _trialRepository.Where(t => t.Id == param.TrialId).IgnoreQueryFilters().ProjectTo<ExcelExportInfo>(_mapper.ConfigurationProvider).FirstOrDefaultAsync()).IfNullThrowException();

-            var list = await _trialUseRepository.Where(t => t.TrialId == param.TrialId).IgnoreQueryFilters()
-                .WhereIf(param.UserTypeId != null, t => t.User.UserTypeId == param.UserTypeId)
-                .WhereIf(!string.IsNullOrWhiteSpace(param.UserName), t => t.User.UserName.Contains(param.UserName))
+            var list = await _trialUseRoleRepository.Where(t => t.TrialId == param.TrialId).IgnoreQueryFilters()
+                .WhereIf(param.UserTypeId != null, t => t.UserRole.UserTypeId == param.UserTypeId)
+                .WhereIf(!string.IsNullOrWhiteSpace(param.UserName), t => t.UserRole.UserName.Contains(param.UserName))

                .WhereIf(param.IsDeleted != null, t => t.IsDeleted == param.IsDeleted)
                .WhereIf(!string.IsNullOrWhiteSpace(param.OrganizationName),
-                    t => t.User.OrganizationName.Contains(param.OrganizationName))
+                    t => t.UserRole.OrganizationName.Contains(param.OrganizationName))
                .WhereIf(!string.IsNullOrWhiteSpace(param.UserRealName),
-                    t => (t.User.FullName).Contains(param.UserRealName))
+                    t => (t.UserRole.FullName).Contains(param.UserRealName))
                .ProjectTo<TrialMaintenanceDTO>(_mapper.ConfigurationProvider).ToListAsync();

            exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(list, _userInfo.TimeZoneId);
@ -225,7 +225,7 @@ namespace IRaCIS.Core.Application.Service.Common
             .WhereIf(!string.IsNullOrWhiteSpace(inQuery.ExperimentName), o => o.ExperimentName.Contains(inQuery.ExperimentName))
             .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.Admin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.OP, t => t.TrialUserList.Any(t => t.UserId == _userInfo.UserRoleId && t.IsDeleted == false) && t.IsDeleted == false)
             .WhereIf(inQuery.CriterionType != null, o => o.TrialReadingCriterionList.Any(t => t.CriterionType == inQuery.CriterionType && t.IsSigned && t.IsConfirm))
-             .WhereIf(!string.IsNullOrEmpty(inQuery.PM_EMail), o => o.TrialUserList.Any(t => t.User.EMail.Contains(inQuery.PM_EMail) && (t.User.UserTypeEnum == UserTypeEnum.ProjectManager || t.User.UserTypeEnum == UserTypeEnum.APM)))
+             .WhereIf(!string.IsNullOrEmpty(inQuery.PM_EMail), o => o.TrialUserList.Any(t => t.UserRole.EMail.Contains(inQuery.PM_EMail) && (t.UserRole.UserTypeEnum == UserTypeEnum.ProjectManager || t.UserRole.UserTypeEnum == UserTypeEnum.APM)))
             .Select(t => new TrialToBeDoneDto()
             {
                 TrialId = t.Id,
@ -286,7 +286,7 @@ namespace IRaCIS.Core.Application.Service.Common

                 IR_ReadingCriterionList = isIR ? t.TrialReadingCriterionList.Where(t => t.IsConfirm && t.IsSigned).OrderBy(t => t.CriterionName).Select(t => t.CriterionName).ToList() : null,

-                 IR_PMEmailList = isIR ? t.TrialUserList.Where(t => t.User.UserTypeEnum == UserTypeEnum.ProjectManager || t.User.UserTypeEnum == UserTypeEnum.APM).OrderBy(t => t.User.EMail).Select(t => t.User.EMail).ToList() : null,
+                 IR_PMEmailList = isIR ? t.TrialUserList.Where(t => t.UserRole.UserTypeEnum == UserTypeEnum.ProjectManager || t.UserRole.UserTypeEnum == UserTypeEnum.APM).OrderBy(t => t.UserRole.EMail).Select(t => t.UserRole.EMail).ToList() : null,

                 IR_TotalReadCount = isIR ? t.VisitTaskList.Where(t => t.DoctorUserId == _userInfo.UserRoleId && t.TaskState == TaskState.Effect && t.ReadingTaskState == ReadingTaskState.HaveSigned).Count() : 0,

@ -350,8 +350,8 @@ namespace IRaCIS.Core.Application.Service.Common
            var trialDocQuery = from trialDocumentNeedConfirmedUserType in _trialDocNeedConfirmedUserTypeRepository.Where(t => t.TrialDocument.TrialId == inQuery.TrialId)
                                join trialUser in _trialUserRepository.Where(t => t.TrialId == inQuery.TrialId)
                                                                              .WhereIf(inQuery.UserId != null, t => t.UserId == inQuery.UserId)
-                                                                              .WhereIf(inQuery.UserTypeId != null, t => t.User.UserTypeId == inQuery.UserTypeId)
-                                                on trialDocumentNeedConfirmedUserType.NeedConfirmUserTypeId equals trialUser.User.UserTypeId
+                                                                              .WhereIf(inQuery.UserTypeId != null, t => t.UserRole.UserTypeId == inQuery.UserTypeId)
+                                                on trialDocumentNeedConfirmedUserType.NeedConfirmUserTypeId equals trialUser.UserRole.UserTypeId

                                join confirm in _trialDocConfirmedUserRepository.Where(t => t.TrialDocument.TrialId == inQuery.TrialId) on
                                 new { trialUser.UserId, TrialDocumentId = trialDocumentNeedConfirmedUserType.TrialDocumentId } equals new { UserId = confirm.ConfirmUserId, confirm.TrialDocumentId } into cc
@ -375,10 +375,10 @@ namespace IRaCIS.Core.Application.Service.Common

                                    //ConfirmUserId = confirm.ConfirmUserId,
                                    ConfirmTime = confirm.ConfirmTime,
-                                    RealName = trialUser.User.FullName,
-                                    UserName = trialUser.User.UserName,
-                                    UserTypeId = trialUser.User.UserTypeId,
-                                    UserTypeShortName = trialUser.User.UserTypeRole.UserTypeShortName,
+                                    RealName = trialUser.UserRole.FullName,
+                                    UserName = trialUser.UserRole.UserName,
+                                    UserTypeId = trialUser.UserRole.UserTypeId,
+                                    UserTypeShortName = trialUser.UserRole.UserTypeRole.UserTypeShortName,

                                    //FullFilePath = trialDocumentNeedConfirmedUserType.TrialDocument.Path
                                };
@ -389,7 +389,7 @@ namespace IRaCIS.Core.Application.Service.Common

                                 join trialUser in _trialUserRepository.Where(t => t.TrialId == inQuery.TrialId)
                                                                       .WhereIf(inQuery.UserId != null, t => t.UserId == inQuery.UserId)
-                                       on needConfirmEdUserType.NeedConfirmUserTypeId equals trialUser.User.UserTypeId
+                                       on needConfirmEdUserType.NeedConfirmUserTypeId equals trialUser.UserRole.UserTypeId
                                 join confirm in _systemDocConfirmedUserRepository.Where() on new { ConfirmUserId = trialUser.UserId, SystemDocumentId = needConfirmEdUserType.SystemDocumentId } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc
                                 from confirm in cc.DefaultIfEmpty()
                                 select new TrainingRecordExportDTO()
@ -409,10 +409,10 @@ namespace IRaCIS.Core.Application.Service.Common

                                     //ConfirmUserId = confirm.ConfirmUserId,
                                     ConfirmTime = confirm.ConfirmTime,
-                                     RealName = trialUser.User.FullName,
-                                     UserName = trialUser.User.UserName,
-                                     UserTypeId = trialUser.User.UserTypeId,
-                                     UserTypeShortName = trialUser.User.UserTypeRole.UserTypeShortName,
+                                     RealName = trialUser.UserRole.FullName,
+                                     UserName = trialUser.UserRole.UserName,
+                                     UserTypeId = trialUser.UserRole.UserTypeId,
+                                     UserTypeShortName = trialUser.UserRole.UserTypeRole.UserTypeShortName,

                                     //FullFilePath = needConfirmEdUserType.SystemDocument.Path
                                 };
--- a/IRaCIS.Core.Application/Service/Document/EmailSendService.cs
+++ b/IRaCIS.Core.Application/Service/Document/EmailSendService.cs
@ -15,7 +15,7 @@ namespace IRaCIS.Core.Application.Service

    public class EmailSendService(IRepository<TrialEmailNoticeConfig> _trialEmailNoticeConfigRepository,
      IRepository<Trial> _trialRepository,
-      IRepository<TrialUser> _trialUserRepository,
+      IRepository<TrialUserRole> _trialUserRepository,
      IRepository<VisitTask> _visitTaskRepository,
      IRepository<TrialSiteUser> _trialSiteUserRepository,
      IOptionsMonitor<SystemEmailSendConfig> _SystemEmailSendConfig, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IEmailSendService
@ -144,7 +144,7 @@ namespace IRaCIS.Core.Application.Service

                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))
--- a/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs
@ -23,7 +23,7 @@ namespace IRaCIS.Core.Application.Services
        IRepository<SystemDocNeedConfirmedUserType> _systemDocNeedConfirmedUserTypeRepository,
         IRepository<TrialDocNeedConfirmedUserType> _trialDocNeedConfirmedUserTypeRepository,
        IRepository<SystemDocument> _systemDocumentRepository,
-        IRepository<TrialUser> _trialUserRepository,
+        IRepository<TrialUserRole> _trialUserRepository,
        IRepository<TrialDocConfirmedUser> _trialDocConfirmedUserRepository,
        IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, ITrialDocumentService
    {
@ -82,10 +82,10 @@ namespace IRaCIS.Core.Application.Services
                                        //IsConfirmed = confirm.ConfirmTime != null,
                                        ConfirmUserId = confirm.ConfirmUserId,
                                        ConfirmTime = confirm.ConfirmTime,
-                                        RealName = trialUser.User.FullName,
-                                        UserName = trialUser.User.UserName,
-                                        UserTypeId = trialUser.User.UserTypeId,
-                                        UserTypeShortName = trialUser.User.UserTypeRole.UserTypeShortName
+                                        RealName = trialUser.UserRole.FullName,
+                                        UserName = trialUser.UserRole.UserName,
+                                        UserTypeId = trialUser.UserRole.UserTypeId,
+                                        UserTypeShortName = trialUser.UserRole.UserTypeRole.UserTypeShortName

                                    };

@ -224,7 +224,7 @@ namespace IRaCIS.Core.Application.Services
                                               .WhereIf(!_userInfo.IsAdmin, t => t.SystemDocument.IsDeleted == false || (t.SystemDocument.IsDeleted == true && t.SystemDocument.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.UserRoleId)))

                                          join trialUser in _trialUserRepository.Where(t => t.TrialId == inQuery.TrialId && t.UserId == _userInfo.UserRoleId)
-                                                                          on needConfirmedUserType.NeedConfirmUserTypeId equals trialUser.User.UserTypeId
+                                                                          on needConfirmedUserType.NeedConfirmUserTypeId equals trialUser.UserRole.UserTypeId
                                          join confirm in _systemDocConfirmedUserRepository.Where() on new { ConfirmUserId = trialUser.UserId, SystemDocumentId = needConfirmedUserType.SystemDocumentId } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc
                                          from confirm in cc.DefaultIfEmpty()
                                          select new UnionDocumentWithConfirmInfoView()
@ -246,10 +246,10 @@ namespace IRaCIS.Core.Application.Services
                                              //IsConfirmed = confirm.ConfirmTime != null,
                                              ConfirmUserId = confirm.ConfirmUserId,
                                              ConfirmTime = confirm.ConfirmTime,
-                                              RealName = trialUser.User.FullName,
-                                              UserName = trialUser.User.UserName,
-                                              UserTypeId = trialUser.User.UserTypeId,
-                                              UserTypeShortName = trialUser.User.UserTypeRole.UserTypeShortName
+                                              RealName = trialUser.UserRole.FullName,
+                                              UserName = trialUser.UserRole.UserName,
+                                              UserTypeId = trialUser.UserRole.UserTypeId,
+                                              UserTypeShortName = trialUser.UserRole.UserTypeRole.UserTypeShortName
                                          };

            //项目文档查询
@ -278,10 +278,10 @@ namespace IRaCIS.Core.Application.Services
                                        //IsConfirmed = confirm.ConfirmTime != null,
                                        ConfirmUserId = confirm.ConfirmUserId,
                                        ConfirmTime = confirm.ConfirmTime,
-                                        RealName = trialUser.User.FullName,
-                                        UserName = trialUser.User.UserName,
-                                        UserTypeId = trialUser.User.UserTypeId,
-                                        UserTypeShortName = trialUser.User.UserTypeRole.UserTypeShortName
+                                        RealName = trialUser.UserRole.FullName,
+                                        UserName = trialUser.UserRole.UserName,
+                                        UserTypeId = trialUser.UserRole.UserTypeId,
+                                        UserTypeShortName = trialUser.UserRole.UserTypeRole.UserTypeShortName

                                    };

@ -392,8 +392,8 @@ namespace IRaCIS.Core.Application.Services
            var trialDocQuery = from trialDocumentNeedConfirmedUserType in _trialDocNeedConfirmedUserTypeRepository.Where(t => t.TrialDocument.TrialId == inQuery.TrialId)
                                join trialUser in _trialUserRepository.Where(t => t.TrialId == inQuery.TrialId)
                                                                              .WhereIf(inQuery.UserId != null, t => t.UserId == inQuery.UserId)
-                                                                              .WhereIf(inQuery.UserTypeId != null, t => t.User.UserTypeId == inQuery.UserTypeId)
-                                                on trialDocumentNeedConfirmedUserType.NeedConfirmUserTypeId equals trialUser.User.UserTypeId
+                                                                              .WhereIf(inQuery.UserTypeId != null, t => t.UserRole.UserTypeId == inQuery.UserTypeId)
+                                                on trialDocumentNeedConfirmedUserType.NeedConfirmUserTypeId equals trialUser.UserRole.UserTypeId

                                join confirm in _trialDocConfirmedUserRepository.Where(t => t.TrialDocument.TrialId == inQuery.TrialId) on
                                 new { trialUser.UserId, TrialDocumentId = trialDocumentNeedConfirmedUserType.TrialDocumentId } equals new { UserId = confirm.ConfirmUserId, confirm.TrialDocumentId } into cc
@ -417,10 +417,10 @@ namespace IRaCIS.Core.Application.Services

                                    ConfirmUserId = confirm.ConfirmUserId,
                                    ConfirmTime = confirm.ConfirmTime,
-                                    RealName = trialUser.User.FullName,
-                                    UserName = trialUser.User.UserName,
-                                    UserTypeId = trialUser.User.UserTypeId,
-                                    UserTypeShortName = trialUser.User.UserTypeRole.UserTypeShortName,
+                                    RealName = trialUser.UserRole.FullName,
+                                    UserName = trialUser.UserRole.UserName,
+                                    UserTypeId = trialUser.UserRole.UserTypeId,
+                                    UserTypeShortName = trialUser.UserRole.UserTypeRole.UserTypeShortName,

                                    FullFilePath = trialDocumentNeedConfirmedUserType.TrialDocument.Path
                                };
@ -431,7 +431,7 @@ namespace IRaCIS.Core.Application.Services

                                 join trialUser in _trialUserRepository.Where(t => t.TrialId == inQuery.TrialId)
                                                                       .WhereIf(inQuery.UserId != null, t => t.UserId == inQuery.UserId)
-                                       on needConfirmEdUserType.NeedConfirmUserTypeId equals trialUser.User.UserTypeId
+                                       on needConfirmEdUserType.NeedConfirmUserTypeId equals trialUser.UserRole.UserTypeId
                                 join confirm in _systemDocConfirmedUserRepository.Where() on new { ConfirmUserId = trialUser.UserId, SystemDocumentId = needConfirmEdUserType.SystemDocumentId } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc
                                 from confirm in cc.DefaultIfEmpty()
                                 select new UnionDocumentWithConfirmInfoView()
@ -451,10 +451,10 @@ namespace IRaCIS.Core.Application.Services

                                     ConfirmUserId = confirm.ConfirmUserId,
                                     ConfirmTime = confirm.ConfirmTime,
-                                     RealName = trialUser.User.FullName,
-                                     UserName = trialUser.User.UserName,
-                                     UserTypeId = trialUser.User.UserTypeId,
-                                     UserTypeShortName = trialUser.User.UserTypeRole.UserTypeShortName,
+                                     RealName = trialUser.UserRole.FullName,
+                                     UserName = trialUser.UserRole.UserName,
+                                     UserTypeId = trialUser.UserRole.UserTypeId,
+                                     UserTypeShortName = trialUser.UserRole.UserTypeRole.UserTypeShortName,

                                     FullFilePath = needConfirmEdUserType.SystemDocument.Path
                                 };
@ -493,7 +493,7 @@ namespace IRaCIS.Core.Application.Services
        public async Task<List<TrialUserDto>> GetTrialUserSelect(Guid trialId)
        {
            return await _trialUserRepository.Where(t => t.TrialId == trialId)
-                .Select(t => new TrialUserDto() { UserId = t.UserId, RealName = t.User.FullName, UserName = t.User.UserName })
+                .Select(t => new TrialUserDto() { UserId = t.UserId, RealName = t.UserRole.FullName, UserName = t.UserRole.UserName })
                   .ToListAsync();
        }

@ -778,16 +778,16 @@ namespace IRaCIS.Core.Application.Services
                  .Select(t => new TrialUserUnionDocumentView()
                  {
                      UserId = t.UserId,
-                      UserName = t.User.UserName,
-                      RealName = t.User.FullName,
-                      UserTypeShortName = t.User.UserTypeRole.UserTypeShortName,
-                      TrialDocumentCount = t.Trial.TrialDocumentList.Count(u => u.NeedConfirmedUserTypeList.Any(k => k.NeedConfirmUserTypeId == t.User.UserTypeId)),
+                      UserName = t.UserRole.UserName,
+                      RealName = t.UserRole.FullName,
+                      UserTypeShortName = t.UserRole.UserTypeRole.UserTypeShortName,
+                      TrialDocumentCount = t.Trial.TrialDocumentList.Count(u => u.NeedConfirmedUserTypeList.Any(k => k.NeedConfirmUserTypeId == t.UserRole.UserTypeId)),
                      TrialDocumentConfirmedCount = t.Trial.TrialDocumentList.SelectMany(u => u.TrialDocConfirmedUserList).Count(k => k.ConfirmUserId == t.UserId),
-                      SystemDocumentConfirmedCount = t.User.SystemDocConfirmedList.Count(),
+                      SystemDocumentConfirmedCount = t.UserRole.SystemDocConfirmedList.Count(),
                      //这样写不行
                      //SystemDocumentCount = _systemDocumentRepository.Where(s => s.NeedConfirmedUserTypeList.Any(kk => kk.NeedConfirmUserTypeId == t.User.UserTypeId))
                      //                       .WhereIf(!_userInfo.IsAdmin, s => s.IsAbandon == false || (s.IsAbandon == true && s.SystemDocConfirmedUserList.Any(uu => uu.ConfirmUserId == t.UserId))).Count()
-                      SystemDocumentCount = t.User.UserTypeRole.SystemDocNeedConfirmedUserTypeList.Where(cc => cc.NeedConfirmUserTypeId == t.User.UserTypeId).Select(y => y.SystemDocument).Count()
+                      SystemDocumentCount = t.UserRole.UserTypeRole.SystemDocNeedConfirmedUserTypeList.Where(cc => cc.NeedConfirmUserTypeId == t.UserRole.UserTypeId).Select(y => y.SystemDocument).Count()
                  });

            return query.ToList();
@ -837,7 +837,7 @@ namespace IRaCIS.Core.Application.Services
                SignViewMinimumMinutes = t.SignViewMinimumMinutes,

                DocumentConfirmedUserCount = t.TrialDocConfirmedUserList.Count(),
-                DocumentUserCount = t.Trial.TrialUserList.Count(cc => t.NeedConfirmedUserTypeList.Any(k => k.NeedConfirmUserTypeId == cc.User.UserTypeId))
+                DocumentUserCount = t.Trial.TrialUserList.Count(cc => t.NeedConfirmedUserTypeList.Any(k => k.NeedConfirmUserTypeId == cc.UserRole.UserTypeId))

            });

--- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
@ -33,7 +33,7 @@ namespace IRaCIS.Core.Application.Service
            IRepository<TaskMedicalReview> _taskMedicalReviewRepository,
            IRepository<ReadingGlobalTaskInfo> _readingGlobalTaskInfoRepository,
            IRepository<VisitTask> _visitTaskRepository,
-            IRepository<TrialUser> _trialUserRepository,
+            IRepository<TrialUserRole> _trialUserRepository,
            IRepository<TrialEmailNoticeUser> _trialEmailNoticeUserRepository,
            IRepository<Subject> _subjectRepository,
            IRepository<ReadModule> _readModuleRepository,
@ -300,7 +300,7 @@ namespace IRaCIS.Core.Application.Service

                var answer = "否";
                var isNeedSend = true;
-                var minUserIdList = _trialUserRepository.Where(t => t.User.UserTypeEnum == Domain.Share.UserTypeEnum.MIM && t.TrialId == taskInfo.TrialId).Select(t => t.UserId).ToList();
+                var minUserIdList = _trialUserRepository.Where(t => t.UserRole.UserTypeEnum == Domain.Share.UserTypeEnum.MIM && t.TrialId == taskInfo.TrialId).Select(t => t.UserId).ToList();



@ -1199,7 +1199,7 @@ namespace IRaCIS.Core.Application.Service
        public async Task<List<TrialUserType>> GetTrialUserTypeSelectList(Guid trialId)
        {

-            var query = _trialUserRepository.Where(t => t.TrialId == trialId, false, true).IgnoreQueryFilters().Select(t => t.User.UserTypeRole).Distinct()
+            var query = _trialUserRepository.Where(t => t.TrialId == trialId, false, true).IgnoreQueryFilters().Select(t => t.UserRole.UserTypeRole).Distinct()

              .ProjectTo<TrialUserType>(_mapper.ConfigurationProvider);

@ -1222,13 +1222,13 @@ namespace IRaCIS.Core.Application.Service
            var userTypeList = trialEmailNoticeConfig.TrialEmailNoticeUserList.Select(t => t.UserType).ToList();


-            var query = _trialUserRepository.Where(t => t.TrialId == trialId && userTypeList.Contains(t.User.UserTypeEnum), false, true).IgnoreQueryFilters()
+            var query = _trialUserRepository.Where(t => t.TrialId == trialId && userTypeList.Contains(t.UserRole.UserTypeEnum), false, true).IgnoreQueryFilters()
                .Select(t => new TrialSelectUser()
                {
                    UserId = t.UserId,
-                    UserName = t.User.UserName,
-                    RealName = t.User.FullName,
-                    UserTypeEnum = t.User.UserTypeEnum
+                    UserName = t.UserRole.UserName,
+                    RealName = t.UserRole.FullName,
+                    UserTypeEnum = t.UserRole.UserTypeEnum
                }).Distinct();

            return await query.ToListAsync();
--- a/IRaCIS.Core.Application/Service/Document/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Document/_MapConfig.cs
@ -49,7 +49,7 @@ namespace IRaCIS.Core.Application.Service
            //   .ForMember(d => d.RealName, c => c.MapFrom(t => t.User.LastName + " / " + t.User.FirstName));


-            CreateMap<TrialUser, TrialDocumentUserConfirmView>();
+            CreateMap<TrialUserRole, TrialDocumentUserConfirmView>();

            CreateMap<BatchAddTrialEmailNoticeConfig, TrialEmailNoticeConfig>();

@ -78,11 +78,11 @@ namespace IRaCIS.Core.Application.Service

            CreateMap<TrialEmailNoticeConfigAddOrEdit, TrialEmailNoticeConfig>();

-            CreateMap<TrialUser, TrialUserSelct>()
-                 .ForMember(d => d.Phone, c => c.MapFrom(t => t.User.Phone))
-                 .ForMember(d => d.Email, c => c.MapFrom(t => t.User.EMail))
-                 .ForMember(d => d.RealName, c => c.MapFrom(t => t.User.FullName))
-                .ForMember(d => d.UserName, c => c.MapFrom(t => t.User.UserName));
+            CreateMap<TrialUserRole, TrialUserSelct>()
+                 .ForMember(d => d.Phone, c => c.MapFrom(t => t.UserRole.Phone))
+                 .ForMember(d => d.Email, c => c.MapFrom(t => t.UserRole.EMail))
+                 .ForMember(d => d.RealName, c => c.MapFrom(t => t.UserRole.FullName))
+                .ForMember(d => d.UserName, c => c.MapFrom(t => t.UserRole.UserName));


            CreateMap<TrialEmailNoticeUser, EmailUserInfoDto>();
--- a/IRaCIS.Core.Application/Service/Management/UserService.cs
+++ b/IRaCIS.Core.Application/Service/Management/UserService.cs
@ -26,7 +26,7 @@ namespace IRaCIS.Core.Application.Service
    public class UserService(IRepository<UserRole> _userRoleRepository,
        IMailVerificationService _mailVerificationService,
        IRepository<VerificationCode> _verificationCodeRepository,
-        IRepository<TrialUser> _userTrialRepository,
+        IRepository<TrialUserRole> _userTrialRepository,
        IRepository<UserLog> _userLogRepository,
        IRepository<UserPassWordLog> _userPassWordLogRepository,
        IDistributedLockProvider _distributedLockProvider,
--- a/IRaCIS.Core.Application/Service/Management/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Management/_MapConfig.cs
@ -16,8 +16,8 @@ namespace IRaCIS.Core.Application.Service
            CreateMap<UserTypeMenu, MenuTreeNode>().IncludeMembers(t => t.Menu);


-
            CreateMap<UserCommand, UserRole>().ForMember(d => d.UserCode, x => x.Ignore());
+            CreateMap<UserCommand, IdentityUser>().ForMember(d => d.UserCode, x => x.Ignore());
            CreateMap<UserType, UserTypeMenuAddOrEdit>().ReverseMap()
                .ForMember(t => t.UserTypeMenuList, u => u.MapFrom(c => c.MenuIds))
                .ForMember(t => t.UserTypeGroupList, u => u.MapFrom(c => c.UserTypeGroupIdList));
--- a/IRaCIS.Core.Application/Service/QC/QCListService.cs
+++ b/IRaCIS.Core.Application/Service/QC/QCListService.cs
@ -17,7 +17,7 @@ namespace IRaCIS.Core.Application.Image.QA
        IRepository<TrialQCQuestionAnswer> _trialQCQuestionAnswerRepository,
        IRepository<TrialQCQuestion> _trialQCQuestionRepository,
        IRepository<DicomStudy> _dicomStudyRepository,
-        IRepository<TrialUser> _trialUserRepository,
+        IRepository<TrialUserRole> _trialUserRepository,
        IRepository<DicomSeries> _dicomSeriesRepository,
        IRepository<NoneDicomStudy> _noneDicomStudyRepository,
        IRepository<QCChallenge> _qcChallengeRepository,
@ -584,10 +584,10 @@ namespace IRaCIS.Core.Application.Image.QA
        public async Task<List<QCChanllengeCreatorDto>> GetQCChallengeCreatorList(Guid trialId)
        {

-            return await _trialUserRepository.Where(t => t.TrialId == trialId && t.User.UserTypeEnum == UserTypeEnum.IQC).Select(t => new QCChanllengeCreatorDto()
+            return await _trialUserRepository.Where(t => t.TrialId == trialId && t.UserRole.UserTypeEnum == UserTypeEnum.IQC).Select(t => new QCChanllengeCreatorDto()
            {
-                CreatorRealName = t.User.FullName,
-                Creator = t.User.UserName,
+                CreatorRealName = t.UserRole.FullName,
+                Creator = t.UserRole.UserName,
                CreateUserId = t.UserId
            }).ToListAsync();

@ -601,10 +601,10 @@ namespace IRaCIS.Core.Application.Image.QA
        [HttpGet("{trialId:guid}")]
        public async Task<List<ParticipantDTO>> GetQCParticipantList(Guid trialId)
        {
-            return await _trialUserRepository.Where(t => t.TrialId == trialId && (t.User.UserTypeEnum == UserTypeEnum.IQC || t.User.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator)).Select(t => new ParticipantDTO()
+            return await _trialUserRepository.Where(t => t.TrialId == trialId && (t.UserRole.UserTypeEnum == UserTypeEnum.IQC || t.UserRole.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator)).Select(t => new ParticipantDTO()
            {
-                HandleUserRealName = t.User.FullName,
-                HandleUser = t.User.UserName,
+                HandleUserRealName = t.UserRole.FullName,
+                HandleUser = t.UserRole.UserName,
                HandleUserId = t.UserId
            }).ToListAsync();
        }
--- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
+++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
@ -29,7 +29,7 @@ namespace IRaCIS.Core.Application.Image.QA
        IRepository<VisitTask> _visitTaskRepository,
        IRepository<SCPPatient> _scpPatientRepository,
        IRepository<SCPStudy> _scpStudyRepository,
-        IRepository<TrialUser> _trialUserRepository,
+        IRepository<TrialUserRole> _trialUserRepository,
        IRepository<ReadModule> _readModuleRepository,
        IRepository<DicomInstance> _dicomInstanceRepository,
        IRepository<TrialQCQuestionAnswer> _trialQCQuestionAnswerRepository,
--- a/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
+++ b/IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs
@ -36,7 +36,7 @@ namespace IRaCIS.Core.Application.Contracts
        IRepository<TrialSite> _trialSiteRepository,
        IRepository<Doctor> _doctorRepository,
        IRepository<VerificationCode> _verificationCodeRepository,
-        IRepository<TrialUser> _trialUserRepository,
+        IRepository<TrialUserRole> _trialUserRepository,
        IRepository<TrialSiteUser> _trialSiteUserRepository,
        IDistributedLockProvider _distributedLockProvider,
        ITokenService _tokenService,
@ -687,7 +687,7 @@ namespace IRaCIS.Core.Application.Contracts
            else if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ProjectManager || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.APM)
            {
                var isTrialSPMJoin = await _trialRepository.AnyAsync(t => t.Id == trialSiteSubmitBackCommand.TrialId && t.IsSPMJoinSiteSurvey);
-                var hasSPMOrCPM = await _trialSiteSurveyRepository.AnyAsync(t => t.TrialId == trialSiteSubmitBackCommand.TrialId && t.Trial.TrialUserList.Any(u => u.User.UserTypeEnum == UserTypeEnum.SPM || u.User.UserTypeEnum == UserTypeEnum.CPM));
+                var hasSPMOrCPM = await _trialSiteSurveyRepository.AnyAsync(t => t.TrialId == trialSiteSubmitBackCommand.TrialId && t.Trial.TrialUserList.Any(u => u.UserRole.UserTypeEnum == UserTypeEnum.SPM || u.UserRole.UserTypeEnum == UserTypeEnum.CPM));

                var isSPMjoin= isTrialSPMJoin && hasSPMOrCPM;

@ -811,7 +811,7 @@ namespace IRaCIS.Core.Application.Contracts

            if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.Undefined || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator)
            {
-                var hasSPMOrCPM = await _trialSiteSurveyRepository.AnyAsync(t => t.TrialId == trialId && t.Trial.TrialUserList.Any(u => u.User.UserTypeEnum == UserTypeEnum.SPM || u.User.UserTypeEnum == UserTypeEnum.CPM));
+                var hasSPMOrCPM = await _trialSiteSurveyRepository.AnyAsync(t => t.TrialId == trialId && t.Trial.TrialUserList.Any(u => u.UserRole.UserTypeEnum == UserTypeEnum.SPM || u.UserRole.UserTypeEnum == UserTypeEnum.CPM));

                var isTrialSPMJoin = await _trialRepository.AnyAsync(t => t.Id == trialId && t.IsSPMJoinSiteSurvey);

@ -953,14 +953,14 @@ namespace IRaCIS.Core.Application.Contracts
                var findTrialUser = await _trialUserRepository.FirstOrDefaultAsync(t => t.TrialId == trialId && t.UserId == userId, true);
                if (findTrialUser == null)
                {
-                    await _trialUserRepository.AddAsync(new TrialUser() { TrialId = trialId, UserId = userId, JoinTime = DateTime.Now });
+                    await _trialUserRepository.AddAsync(new TrialUserRole() { TrialId = trialId, UserId = userId, JoinTime = DateTime.Now });

                    await _mailVerificationService.SiteSurveyUserJoinEmail(trialId, userId, joinCommand.BaseUrl, joinCommand.RouteUrl);

                }
                else if (findTrialUser.IsDeleted == true)
                {
-                    await _trialUserRepository.UpdatePartialFromQueryAsync(t => t.TrialId == trialId && t.UserId == userId, c => new TrialUser()
+                    await _trialUserRepository.UpdatePartialFromQueryAsync(t => t.TrialId == trialId && t.UserId == userId, c => new TrialUserRole()
                    {
                        IsDeleted = false,
                        DeletedTime = null,
@ -1073,14 +1073,14 @@ namespace IRaCIS.Core.Application.Contracts
                var findTrialUser = await _trialUserRepository.FirstOrDefaultAsync(t => t.TrialId == trialId && t.UserId == userId, true);
                if (findTrialUser == null)
                {
-                    await _trialUserRepository.AddAsync(new TrialUser() { TrialId = trialId, UserId = userId, JoinTime = DateTime.Now });
+                    await _trialUserRepository.AddAsync(new TrialUserRole() { TrialId = trialId, UserId = userId, JoinTime = DateTime.Now });

                    await _mailVerificationService.SiteSurveyUserJoinEmail(trialId, userId, baseUrl, routeUrl);

                }
                else if (findTrialUser.IsDeleted == true)
                {
-                    await _trialUserRepository.UpdatePartialFromQueryAsync(t => t.TrialId == trialId && t.UserId == userId, c => new TrialUser()
+                    await _trialUserRepository.UpdatePartialFromQueryAsync(t => t.TrialId == trialId && t.UserId == userId, c => new TrialUserRole()
                    {
                        IsDeleted = false,
                        DeletedTime = null,
--- a/IRaCIS.Core.Application/Service/Stat/StatisticsService.cs
+++ b/IRaCIS.Core.Application/Service/Stat/StatisticsService.cs
@ -19,7 +19,7 @@ namespace IRaCIS.Core.Application.Service
        IRepository<Hospital> _hospitalRepository,
        IRepository<EnrollDetail> _enrollDetailRepository,
        IRepository<UserRole> _userRoleRepository,
-        IRepository<TrialUser> _userTrialRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IStatisticsService
+        IRepository<TrialUserRole> _userTrialRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IStatisticsService
    {


@ -371,7 +371,7 @@ namespace IRaCIS.Core.Application.Service
        {

            Expression<Func<UserRole, bool>> userLambda = x => true;
-            Expression<Func<TrialUser, bool>> userTrialLambda = x => true;
+            Expression<Func<TrialUserRole, bool>> userTrialLambda = x => true;
            if (!string.IsNullOrEmpty(param.UserInfo))
            {
                var userInfo = param.UserInfo.Trim();
@ -438,7 +438,7 @@ namespace IRaCIS.Core.Application.Service
        public List<UserParticipateTrialDetail> GetParticipateTrialList(Guid userId)
        {

-            Expression<Func<TrialUser, bool>> userTrialLambda = x => x.UserId == userId;
+            Expression<Func<TrialUserRole, bool>> userTrialLambda = x => x.UserId == userId;

            var userTypeEnum = _userInfo.UserTypeEnumStr;
            var loginUserId = _userInfo.UserRoleId;
@ -463,7 +463,7 @@ namespace IRaCIS.Core.Application.Service
                            CROName = cro.CROName,
                            Expedited = trial.Expedited,
                            Indication = trial.Indication,
-                            UserType = userTrial.User.UserTypeRole.UserTypeShortName,
+                            UserType = userTrial.UserRole.UserTypeRole.UserTypeShortName,
                            TrialId = trial.Id

                        };
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialExternalUserViewModel.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialExternalUserViewModel.cs
@ -174,6 +174,8 @@ namespace IRaCIS.Core.Application.ViewModel
        [NotDefault]
        public Guid SystemUserId { get; set; }

+        public Guid UserTypeId { get; set; }
+
    }


--- a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
@ -1381,7 +1381,7 @@ namespace IRaCIS.Core.Application
             .WhereIf(!string.IsNullOrWhiteSpace(inQuery.ExperimentName), o => o.ExperimentName.Contains(inQuery.ExperimentName))
             .WhereIf(_userInfo.UserTypeEnumInt != (int)UserTypeEnum.SuperAdmin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.Admin && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.OP, t => t.TrialUserList.Any(t => t.UserId == _userInfo.UserRoleId && t.IsDeleted == false) && t.IsDeleted == false)
             .WhereIf(inQuery.CriterionType != null, o => o.TrialReadingCriterionList.Any(t => t.CriterionType == inQuery.CriterionType && t.IsSigned && t.IsConfirm))
-             .WhereIf(!string.IsNullOrEmpty(inQuery.PM_EMail), o => o.TrialUserList.Any(t => t.User.EMail.Contains(inQuery.PM_EMail) && (t.User.UserTypeEnum == UserTypeEnum.ProjectManager || t.User.UserTypeEnum == UserTypeEnum.APM)))
+             .WhereIf(!string.IsNullOrEmpty(inQuery.PM_EMail), o => o.TrialUserList.Any(t => t.UserRole.EMail.Contains(inQuery.PM_EMail) && (t.UserRole.UserTypeEnum == UserTypeEnum.ProjectManager || t.UserRole.UserTypeEnum == UserTypeEnum.APM)))
             .Select(t => new TrialToBeDoneDto()
             {
                 TrialId = t.Id,
@ -1442,7 +1442,7 @@ namespace IRaCIS.Core.Application

                 IR_ReadingCriterionList = isIR ? t.TrialReadingCriterionList.Where(t => t.IsConfirm && t.IsSigned).OrderBy(t => t.CriterionName).Select(t => t.CriterionName).ToList() : null,

-                 IR_PMEmailList = isIR ? t.TrialUserList.Where(t => t.User.UserTypeEnum == UserTypeEnum.ProjectManager || t.User.UserTypeEnum == UserTypeEnum.APM).OrderBy(t => t.User.EMail).Select(t => t.User.EMail).ToList() : null,
+                 IR_PMEmailList = isIR ? t.TrialUserList.Where(t => t.UserRole.UserTypeEnum == UserTypeEnum.ProjectManager || t.UserRole.UserTypeEnum == UserTypeEnum.APM).OrderBy(t => t.UserRole.EMail).Select(t => t.UserRole.EMail).ToList() : null,

                 IR_TotalReadCount = isIR ? t.VisitTaskList.Where(t => t.DoctorUserId == _userInfo.UserRoleId && t.TaskState == TaskState.Effect && t.ReadingTaskState == ReadingTaskState.HaveSigned).Count() : 0,

@ -1476,54 +1476,54 @@ namespace IRaCIS.Core.Application

        [HttpPost]
        public async Task<IResponseOutput<List<TrialUserToBeDoneDto>>> GetTrialUserToBeDoneList(TrialUserToBeDoneQuery inQuery,
-      [FromServices] IRepository<TrialUser> _trialUserRepository)
+      [FromServices] IRepository<TrialUserRole> _trialUserRepository)
        {

            var query = _trialUserRepository.Where(t => t.TrialId == inQuery.TrialId)
                .Select(t => new TrialUserToBeDoneDto()
                {
-                    UserName = t.User.UserName,
-                    FullName = t.User.FullName,
-                    UserType = t.User.UserTypeEnum,
+                    UserName = t.UserRole.UserName,
+                    FullName = t.UserRole.FullName,
+                    UserType = t.UserRole.UserTypeEnum,

                    //SPM  阅片人筛选
                    ReviewerSelect_SPM_ToBeApprovalCount =
-                    (t.User.UserTypeEnum == UserTypeEnum.SPM || t.User.UserTypeEnum == UserTypeEnum.CPM) ?
+                    (t.UserRole.UserTypeEnum == UserTypeEnum.SPM || t.UserRole.UserTypeEnum == UserTypeEnum.CPM) ?
                    t.Trial.EnrollList.Where(u => u.EnrollStatus == EnrollStatus.HasCommittedToCRO).Count() : 0,

                    //PM  阅片人确认
                    ReviewerSelect_PM_ToBeConfirmCount =
-                     (t.User.UserTypeEnum == UserTypeEnum.APM || t.User.UserTypeEnum == UserTypeEnum.ProjectManager) ?
+                     (t.UserRole.UserTypeEnum == UserTypeEnum.APM || t.UserRole.UserTypeEnum == UserTypeEnum.ProjectManager) ?
                    t.Trial.EnrollList.Where(u => u.EnrollStatus == EnrollStatus.InviteIntoGroup).Count() : 0,

                    //CRC  重传 --区分人
                    ImageUpload_CRC_ToBeReUploadCount =
-                     (t.User.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator || t.User.UserTypeEnum == UserTypeEnum.CRA) ?
+                     (t.UserRole.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator || t.UserRole.UserTypeEnum == UserTypeEnum.CRA) ?
                    t.Trial.SubjectVisitList.Where(c => c.TrialSite.CRCUserList.Any(u => u.UserId == t.UserId))
                    .Where(u => u.SubmitState == SubmitStateEnum.ToSubmit && u.IsPMBackOrReReading).Count() : 0,

                    //CRC加急待提交  需确认？--区分人
                    ImageUpload_CRC_ToBeSubmitCount =
-                     (t.User.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator || t.User.UserTypeEnum == UserTypeEnum.CRA) ?
+                     (t.UserRole.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator || t.UserRole.UserTypeEnum == UserTypeEnum.CRA) ?
                    t.Trial.SubjectVisitList.Where(c => c.TrialSite.CRCUserList.Any(u => u.UserId == t.UserId))
                    .Where(u => u.SubmitState == SubmitStateEnum.ToSubmit).Count() : 0,

                    //  QC   IQC 待领取
                    QC_IQC_ToBeClaimedCount =
-                     (t.User.UserTypeEnum == UserTypeEnum.IQC) ?
+                     (t.UserRole.UserTypeEnum == UserTypeEnum.IQC) ?
                    t.Trial.SubjectVisitList.Where(u => u.CurrentActionUserId == null && (u.PreliminaryAuditUserId == null || (u.PreliminaryAuditUserId != _userInfo.UserRoleId && u.ReviewAuditUserId == null))).Count() : 0,


                    // CRC  质疑待回复 --区分人
                    QC_CRC_ToBeDealedCount =
-                    (t.User.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator || t.User.UserTypeEnum == UserTypeEnum.CRA) ?
+                    (t.UserRole.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator || t.UserRole.UserTypeEnum == UserTypeEnum.CRA) ?
                    t.Trial.SubjectVisitList.Where(c => c.TrialSite.CRCUserList.Any(u => u.UserId == t.UserId))
                    .SelectMany(c => c.QCChallengeList).Where(u => u.IsClosed == false && u.LatestReplyUser.UserTypeEnum == UserTypeEnum.IQC).Count() : 0,


                    //IQC 质疑待处理  --区分人
                    QC_IQC_ToBeDealedCount =
-                    (t.User.UserTypeEnum == UserTypeEnum.IQC) ?
+                    (t.UserRole.UserTypeEnum == UserTypeEnum.IQC) ?
                    t.Trial.SubjectVisitList.SelectMany(c => c.QCChallengeList)
                    .Where(u => u.CreateUserId == t.UserId && u.IsClosed == false && u.LatestReplyUser.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).Count() : 0,

@ -1531,33 +1531,33 @@ namespace IRaCIS.Core.Application

                    // IQC  待审核
                    QC_IQC_ToBeReviewedCount =
-                    (t.User.UserTypeEnum == UserTypeEnum.IQC) ?
+                    (t.UserRole.UserTypeEnum == UserTypeEnum.IQC) ?
                    t.Trial.SubjectVisitList.Where(u => u.CurrentActionUserId == t.UserId).Count() : 0,



                    //PM 核查待处理
                    Check_PM_ToBeDealedCount =
-                    (t.User.UserTypeEnum == UserTypeEnum.APM || t.User.UserTypeEnum == UserTypeEnum.ProjectManager) ?
+                    (t.UserRole.UserTypeEnum == UserTypeEnum.APM || t.UserRole.UserTypeEnum == UserTypeEnum.ProjectManager) ?
                    t.Trial.SubjectVisitList.Where(u => u.CheckState == CheckStateEnum.ToCheck).Count() : 0,

                    //PM 质疑待处理
                    Check_PM_ToBeReplyedCount =
-                    (t.User.UserTypeEnum == UserTypeEnum.APM || t.User.UserTypeEnum == UserTypeEnum.ProjectManager) ?
+                    (t.UserRole.UserTypeEnum == UserTypeEnum.APM || t.UserRole.UserTypeEnum == UserTypeEnum.ProjectManager) ?
                    t.Trial.SubjectVisitList.Where(u => u.CheckState == CheckStateEnum.CVIng &&
                    u.CheckChallengeDialogList.OrderByDescending(t => t.CreateTime).First().UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).Count() : 0,


                    // CRC  核查  质疑待处理  --区分人
                    Check_CRC_ToBeDealedCount =
-                    (t.User.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator || t.User.UserTypeEnum == UserTypeEnum.CRA) ?
+                    (t.UserRole.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator || t.UserRole.UserTypeEnum == UserTypeEnum.CRA) ?
                    t.Trial.SubjectVisitList.Where(c => c.TrialSite.CRCUserList.Any(u => u.UserId == t.UserId))
                    .Where(u => u.CheckState == CheckStateEnum.CVIng && u.CheckChallengeState == CheckChanllengeTypeEnum.PMWaitCRCReply).Count() : 0,


                    //IR  未读   --区分人
                    Reading_IR_UnReadCount =
-                    (t.User.UserTypeEnum == UserTypeEnum.IndependentReviewer) ?
+                    (t.UserRole.UserTypeEnum == UserTypeEnum.IndependentReviewer) ?
                    t.Trial.VisitTaskList
                   .Where(c => c.DoctorUserId == t.UserId && c.ReadingTaskState != ReadingTaskState.HaveSigned && c.TaskState == TaskState.Effect)
                   // 前序 不存在 未一致性核查未通过的
@ -1570,30 +1570,30 @@ namespace IRaCIS.Core.Application

                    //SPM   PM重阅审批
                    Reading_SPM_ToBeApprovalCount =
-                    (t.User.UserTypeEnum == UserTypeEnum.SPM || t.User.UserTypeEnum == UserTypeEnum.CPM) ?
+                    (t.UserRole.UserTypeEnum == UserTypeEnum.SPM || t.UserRole.UserTypeEnum == UserTypeEnum.CPM) ?
                    t.Trial.VisitTaskReReadingList.Where(t => t.OriginalReReadingTask.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed).Count() : 0,

                    //PM   IR重阅审批
                    Reading_PM_ToBeApprovalCount =
-                    (t.User.UserTypeEnum == UserTypeEnum.APM || t.User.UserTypeEnum == UserTypeEnum.ProjectManager) ?
+                    (t.UserRole.UserTypeEnum == UserTypeEnum.APM || t.UserRole.UserTypeEnum == UserTypeEnum.ProjectManager) ?
                    t.Trial.VisitTaskReReadingList.Where(t => t.OriginalReReadingTask.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed).Count() : 0,

                    //IR 医学审核    --区分人
                    Medical_IR_ToBeDealedCount =
-                    (t.User.UserTypeEnum == UserTypeEnum.IndependentReviewer) ?
+                    (t.UserRole.UserTypeEnum == UserTypeEnum.IndependentReviewer) ?
                    t.Trial.TaskMedicalReviewList
                    .Where(c => c.IsClosedDialog == false && c.VisitTask.DoctorUserId == t.UserId && c.IsInvalid == false)
                    .Where(u => u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First().UserTypeEnumInt == (int)UserTypeEnum.MIM).Count() : 0,


                    Medical_MIM_ToBeDealedCount =
-                    (t.User.UserTypeEnum == UserTypeEnum.MIM) ?
+                    (t.UserRole.UserTypeEnum == UserTypeEnum.MIM) ?
                    t.Trial.TaskMedicalReviewList
                    .Where(t => t.IsClosedDialog == false)
                .Where(u => u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First().UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer).Count() : 0,

                    Medical_MIM_ToBeReviewedCount =
-                    (t.User.UserTypeEnum == UserTypeEnum.MIM) ?
+                    (t.UserRole.UserTypeEnum == UserTypeEnum.MIM) ?
                    t.Trial.TaskMedicalReviewList
                    .Where(t => t.IsClosedDialog == false && t.IsInvalid == false)
                    .Where(u => !u.IsInvalid && u.AuditState != MedicalReviewAuditState.HaveSigned).Count() : 0
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs
@ -22,7 +22,8 @@ namespace IRaCIS.Core.Application.Service
    [ApiExplorerSettings(GroupName = "Trial")]
    public class TrialExternalUserService(IRepository<TrialExternalUser> _trialExternalUseRepository,
        IRepository<UserRole> _userRoleRepository,
-        IRepository<TrialUser> _trialUserRepository,
+         IRepository<IdentityUser> _identityUserRepository,
+        IRepository<TrialUserRole> _trialUserRepository,
        IRepository<Trial> _trialRepository,
        IRepository<UserType> _userTypeRepository,
        IMailVerificationService _mailVerificationService,
@ -64,7 +65,7 @@ namespace IRaCIS.Core.Application.Service

                using (await @lock.AcquireAsync())
                {
-                    var existSysUser = await _userRoleRepository.FirstOrDefaultAsync(t => t.EMail == addOrEditTrialExternalUser.Email && t.UserTypeId == addOrEditTrialExternalUser.UserTypeId);
+                    var existSysUser = await _identityUserRepository.Where(t => t.EMail == addOrEditTrialExternalUser.Email, true).Include(t => t.UserRoleList).FirstOrDefaultAsync();

                    if (existSysUser != null)
                    {
@ -93,13 +94,12 @@ namespace IRaCIS.Core.Application.Service
                    await _trialExternalUseRepository.AddAsync(addEntity);


-                    var existUser = await _userRoleRepository.FirstOrDefaultAsync(t => t.EMail == addOrEditTrialExternalUser.Email && t.UserTypeId == addOrEditTrialExternalUser.UserTypeId);
                    var trialType = await _trialRepository.Where(t => t.Id == addOrEditTrialExternalUser.TrialId).Select(t => t.TrialType).FirstOrDefaultAsync();

-                    if (existUser != null)
+                    if (existSysUser != null)
                    {
                        addEntity.IsSystemUser = true;
-                        addEntity.SystemUserId = existUser.Id;
+                        addEntity.SystemUserId = existSysUser.Id;

                    }
                    else
@ -107,7 +107,7 @@ namespace IRaCIS.Core.Application.Service

                        //生成账户  并插入

-                        var generateUser = _mapper.Map<UserRole>(addOrEditTrialExternalUser);
+                        var generateUser = _mapper.Map<IdentityUser>(addOrEditTrialExternalUser);

                        if (trialType == TrialType.NoneOfficial)
                        {
@ -124,20 +124,24 @@ namespace IRaCIS.Core.Application.Service

                        generateUser.UserName = generateUser.UserCode;

-                        generateUser.UserTypeEnum = _userTypeRepository.Where(t => t.Id == generateUser.UserTypeId).Select(t => t.UserTypeEnum).First();

                        generateUser.Password = MD5Helper.Md5(IRCEmailPasswordHelper.GenerateRandomPassword(10));

                        generateUser.Status = UserStateEnum.Disable;

-                        var newAddUser = await _userRoleRepository.AddAsync(generateUser);
+                        var addRole = _mapper.Map<UserRole>(generateUser);
+                        addRole.UserTypeEnum = _userTypeRepository.Where(t => t.Id == addOrEditTrialExternalUser.UserTypeId).Select(t => t.UserTypeEnum).First();
+                        addRole.UserTypeId = addOrEditTrialExternalUser.UserTypeId;

+                        generateUser.UserRoleList = new List<UserRole>() { addRole };
+
+                        var newAddUser = await _identityUserRepository.AddAsync(generateUser);

                        addEntity.IsSystemUser = false;
                        addEntity.SystemUserId = newAddUser.Id;


-                        existUser = newAddUser;
+                        existSysUser = newAddUser;

                    }

@ -146,7 +150,7 @@ namespace IRaCIS.Core.Application.Service
                    if (trialType == TrialType.OfficialTrial || trialType == TrialType.Training)
                    {

-                        if (existUser.IsTestUser)
+                        if (existSysUser.IsTestUser)
                        {
                            //---正式类型 、培训类型的项目 不允许加入测试用户 
                            throw new BusinessValidationFailedException(_localizer["TrialExternalUser_TestUserNotAllowed"]);
@ -157,7 +161,7 @@ namespace IRaCIS.Core.Application.Service
                    if (trialType == TrialType.NoneOfficial)
                    {

-                        if (existUser.IsTestUser == false)
+                        if (existSysUser.IsTestUser == false)
                        {
                            //---测试项目  不允许加入正式用户 
                            throw new BusinessValidationFailedException(_localizer["TrialExternalUser_FormalUserNotAllowed"]);
@ -185,7 +189,8 @@ namespace IRaCIS.Core.Application.Service
                                Id = addEntity.Id,
                                Email=addEntity.Email,
                                IsSystemUser=addEntity.IsSystemUser,
-                                SystemUserId=addEntity.SystemUserId
+                                SystemUserId=addEntity.SystemUserId,
+                                UserTypeId=addOrEditTrialExternalUser.UserTypeId
                            }
                        }
                        });
@ -243,7 +248,7 @@ namespace IRaCIS.Core.Application.Service
            foreach (var userInfo in sendEmail.SendUsers)
            {
                var userId = userInfo.SystemUserId;
-
+                var userTypeId = userInfo.UserTypeId;



@ -251,7 +256,7 @@ namespace IRaCIS.Core.Application.Service
                if (!await _trialUserRepository.AnyAsync(t => t.TrialId == trialId && t.UserId == userId, true))
                {

-                    await _trialUserRepository.AddAsync(new TrialUser() { TrialId = trialId, UserId = userId, JoinTime = DateTime.Now });
+                    await _trialUserRepository.AddAsync(new TrialUserRole() { TrialId = trialId, UserId = userId, JoinTime = DateTime.Now });

                    await _userRoleRepository.BatchUpdateNoTrackingAsync(t => t.Id == userId, u => new UserRole() { Status = UserStateEnum.Enable });

--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
@ -8,7 +8,7 @@ using Microsoft.AspNetCore.Mvc;
 namespace IRaCIS.Core.Application.Service
 {
    [ApiExplorerSettings(GroupName = "Trial")]
-    public class TrialMaintenanceService(IRepository<TrialUser> _trialUseRepository,
+    public class TrialMaintenanceService(IRepository<TrialUserRole> _trialUseRoleRepository,
        IRepository<UserRole> _userRoleRepository,
        IRepository<TrialSiteUser> _trialSiteUserRepository,
        IRepository<SubjectVisit> _subjectVisitRepository,
@ -18,8 +18,8 @@ namespace IRaCIS.Core.Application.Service
        [HttpGet]
        public async Task<List<TrialUserBasicInfo>> GetTrialUserList(Guid trialId)
        {
-            return await _trialUseRepository.Where(t => t.TrialId == trialId, ignoreQueryFilters: true)
-                  .Select(t => new TrialUserBasicInfo() { FullName = t.User.FullName, UserId = t.UserId, UserTypeId = t.User.UserTypeId, UserName = t.User.UserName })
+            return await _trialUseRoleRepository.Where(t => t.TrialId == trialId, ignoreQueryFilters: true)
+                  .Select(t => new TrialUserBasicInfo() { FullName = t.UserRole.FullName, UserId = t.UserId, UserTypeId = t.UserRole.UserTypeId, UserName = t.UserRole.UserName })
                  .ToListAsync();
        }

@ -32,13 +32,13 @@ namespace IRaCIS.Core.Application.Service
        public async Task<PageOutput<TrialMaintenanceDTO>> GetMaintenanceUserList(TrialMaintenanceQuery inQuery)
        {

-            var query = _trialUseRepository.Where(t => t.TrialId == inQuery.TrialId).IgnoreQueryFilters()
-                .WhereIf(inQuery.UserTypeId != null, t => t.User.UserTypeId == inQuery.UserTypeId)
-                .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserName), t => t.User.UserName.Contains(inQuery.UserName))
+            var query = _trialUseRoleRepository.Where(t => t.TrialId == inQuery.TrialId).IgnoreQueryFilters()
+                .WhereIf(inQuery.UserTypeId != null, t => t.UserRole.UserTypeId == inQuery.UserTypeId)
+                .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserName), t => t.UserRole.UserName.Contains(inQuery.UserName))

                 .WhereIf(inQuery.IsDeleted != null, t => t.IsDeleted == inQuery.IsDeleted)
-                .WhereIf(!string.IsNullOrWhiteSpace(inQuery.OrganizationName), t => t.User.OrganizationName.Contains(inQuery.OrganizationName))
-                .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserRealName), t => (t.User.FullName).Contains(inQuery.UserRealName))
+                .WhereIf(!string.IsNullOrWhiteSpace(inQuery.OrganizationName), t => t.UserRole.OrganizationName.Contains(inQuery.OrganizationName))
+                .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserRealName), t => (t.UserRole.FullName).Contains(inQuery.UserRealName))
                .ProjectTo<TrialMaintenanceDTO>(_mapper.ConfigurationProvider);

            return await query.ToPagedListAsync(inQuery, nameof(TrialMaintenanceDTO.UpdateTime));
@ -55,11 +55,11 @@ namespace IRaCIS.Core.Application.Service
        {
            // 最开始过滤site已经选择的用户 现在又改回去。。。 

-            var query = _trialUseRepository.Where(t => t.TrialId == inQuery.TrialId).IgnoreQueryFilters()
-                .Where(t => t.User.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator || t.User.UserTypeEnum == UserTypeEnum.CRA)
-                 .WhereIf(inQuery.UserTypeId != null, t => t.User.UserTypeId == inQuery.UserTypeId)
-                .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserRealName), t => (t.User.FullName).Contains(inQuery.UserRealName))
-                .WhereIf(!string.IsNullOrWhiteSpace(inQuery.OrganizationName), t => t.User.OrganizationName.Contains(inQuery.OrganizationName))
+            var query = _trialUseRoleRepository.Where(t => t.TrialId == inQuery.TrialId).IgnoreQueryFilters()
+                .Where(t => t.UserRole.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator || t.UserRole.UserTypeEnum == UserTypeEnum.CRA)
+                 .WhereIf(inQuery.UserTypeId != null, t => t.UserRole.UserTypeId == inQuery.UserTypeId)
+                .WhereIf(!string.IsNullOrWhiteSpace(inQuery.UserRealName), t => (t.UserRole.FullName).Contains(inQuery.UserRealName))
+                .WhereIf(!string.IsNullOrWhiteSpace(inQuery.OrganizationName), t => t.UserRole.OrganizationName.Contains(inQuery.OrganizationName))
                .ProjectTo<AssginSiteCRCListDTO>(_mapper.ConfigurationProvider, new { trialSiteId = inQuery.TrialSiteId });

            return await query.ToPagedListAsync(inQuery);
@ -119,9 +119,9 @@ namespace IRaCIS.Core.Application.Service
        public async Task<IResponseOutput> AddTrialUsers(TrialUserAddCommand[] userTrialCommands)
        {

-            var addArray = _mapper.Map<TrialUser[]>(userTrialCommands);
+            var addArray = _mapper.Map<TrialUserRole[]>(userTrialCommands);

-            var trialUsers = await _trialUseRepository.AddRangeAsync(addArray);
+            var trialUsers = await _trialUseRoleRepository.AddRangeAsync(addArray);

            foreach (var item in trialUsers)
            {
@ -129,7 +129,7 @@ namespace IRaCIS.Core.Application.Service
            }


-            var success = await _trialUseRepository.SaveChangesAsync();
+            var success = await _trialUseRoleRepository.SaveChangesAsync();

            return ResponseOutput.Result(success);
        }
@ -141,7 +141,7 @@ namespace IRaCIS.Core.Application.Service
        [HttpPut]
        public async Task<IResponseOutput> UpdateTrialUser(UpdateTrialUserCommand updateTrialUserCommand)
        {
-            var trialUser = await _trialUseRepository.Where(t => t.Id == updateTrialUserCommand.Id, true, true).FirstOrDefaultAsync();
+            var trialUser = await _trialUseRoleRepository.Where(t => t.Id == updateTrialUserCommand.Id, true, true).FirstOrDefaultAsync();

            if (trialUser == null) return Null404NotFound(trialUser);

@ -163,7 +163,7 @@ namespace IRaCIS.Core.Application.Service

            _mapper.Map(updateTrialUserCommand, trialUser);

-            await _trialUseRepository.SaveChangesAsync();
+            await _trialUseRoleRepository.SaveChangesAsync();

            return ResponseOutput.Ok();

@ -180,7 +180,7 @@ namespace IRaCIS.Core.Application.Service
        public async Task<IResponseOutput> DeleteMaintenanceUser(Guid id, bool isDelete)
        {

-            var trialUser = await _trialUseRepository.AsQueryable().IgnoreQueryFilters().FirstOrDefaultAsync(t => t.Id == id);
+            var trialUser = await _trialUseRoleRepository.AsQueryable().IgnoreQueryFilters().FirstOrDefaultAsync(t => t.Id == id);

            if (trialUser == null) return Null404NotFound(trialUser);

@ -195,9 +195,9 @@ namespace IRaCIS.Core.Application.Service
                await _subjectVisitRepository.BatchUpdateNoTrackingAsync(t => t.CurrentActionUserId == trialUser.UserId && t.TrialId == trialUser.TrialId && t.IsTake, u => new SubjectVisit() { CurrentActionUserId = null, CurrentActionUserExpireTime = null, IsTake = false });
            }

-            await _trialUseRepository.BatchUpdateNoTrackingAsync(t => t.Id == id, u => new TrialUser() { IsDeleted = isDelete, RemoveTime = isDelete ? DateTime.Now : null });
+            await _trialUseRoleRepository.BatchUpdateNoTrackingAsync(t => t.Id == id, u => new TrialUserRole() { IsDeleted = isDelete, RemoveTime = isDelete ? DateTime.Now : null });

-            await _trialUseRepository.SaveChangesAsync();
+            await _trialUseRoleRepository.SaveChangesAsync();

            return ResponseOutput.Ok();
        }
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs
@ -16,7 +16,7 @@ namespace IRaCIS.Core.Application.Service
    [ApiExplorerSettings(GroupName = "Trial")]

    public class TrialService(IRepository<Trial> _trialRepository,
-        IRepository<TrialUser> _trialUserRepository,
+        IRepository<TrialUserRole> _trialUserRepository,
        IRepository<CRO> _croRepository,
        IRepository<EnrollDetail> _enrollDetailRepository,
        IRepository<Dictionary> _dictionaryRepository,
@ -208,7 +208,7 @@ namespace IRaCIS.Core.Application.Service

                //如果是PM， 则需要将该人员添加到 运维人员表
                //添加运维人员PM 
-                await _trialUserRepository.AddAsync(new TrialUser() { TrialId = trial.Id, UserId = _userInfo.UserRoleId, JoinTime = DateTime.Now });
+                await _trialUserRepository.AddAsync(new TrialUserRole() { TrialId = trial.Id, UserId = _userInfo.UserRoleId, JoinTime = DateTime.Now });

                // 添加扩展信息表记录
                await _trialPaymentPriceRepository.AddAsync(new TrialPaymentPrice() { TrialId = trial.Id });
@ -550,7 +550,7 @@ namespace IRaCIS.Core.Application.Service
                await _repository.BatchDeleteNoTrackingAsync<TrialSiteUserSurvey>(t => t.TrialSiteSurvey.TrialId == trialId);
                await _repository.BatchDeleteNoTrackingAsync<TrialSiteEquipmentSurvey>(t => t.TrialSiteSurvey.TrialId == trialId);

-                await _repository.BatchDeleteNoTrackingAsync<TrialUser>(t => t.TrialId == trialId);
+                await _repository.BatchDeleteNoTrackingAsync<TrialUserRole>(t => t.TrialId == trialId);
                await _repository.BatchDeleteNoTrackingAsync<TrialSiteUser>(t => t.TrialId == trialId);
                await _repository.BatchDeleteNoTrackingAsync<VisitStage>(t => t.TrialId == trialId);
                await _repository.BatchDeleteNoTrackingAsync<VisitPlanInfluenceStat>(t => t.TrialId == trialId);
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/_MapConfig.cs
@ -37,22 +37,22 @@ namespace IRaCIS.Core.Application.Service



-            CreateMap<UserTrialCommand, TrialUser>();
+            CreateMap<UserTrialCommand, TrialUserRole>();

            CreateMap<TrialSiteCommand, TrialSite>()
                .ForMember(x => x.Id, x => x.Ignore());

            CreateMap<EditTrialSiteCommand, TrialSite>();

-            CreateMap<UpdateTrialUserCommand, TrialUser>();
+            CreateMap<UpdateTrialUserCommand, TrialUserRole>();



-            CreateMap<AssginSiteCRCCommand, TrialUser>();
+            CreateMap<AssginSiteCRCCommand, TrialUserRole>();

-            CreateMap<TrialUserAddCommand, TrialUser>();
+            CreateMap<TrialUserAddCommand, TrialUserRole>();

-            CreateMap<SiteCRCCommand, TrialUser>();
+            CreateMap<SiteCRCCommand, TrialUserRole>();


            //临床项目
@ -86,16 +86,16 @@ namespace IRaCIS.Core.Application.Service



-            CreateMap<TrialUser, TrialMaintenanceDTO>().IncludeMembers(t => t.User)
-            .ForMember(d => d.UserRealName, u => u.MapFrom(s => s.User.FullName))
-            .ForMember(t => t.UserType, u => u.MapFrom(t => t.User.UserTypeRole.UserTypeShortName));
+            CreateMap<TrialUserRole, TrialMaintenanceDTO>().IncludeMembers(t => t.UserRole)
+            .ForMember(d => d.UserRealName, u => u.MapFrom(s => s.UserRole.FullName))
+            .ForMember(t => t.UserType, u => u.MapFrom(t => t.UserRole.UserTypeRole.UserTypeShortName));
            CreateMap<UserRole, TrialMaintenanceDTO>();

            var trialSiteId = Guid.Empty;
-            CreateMap<TrialUser, AssginSiteCRCListDTO>().IncludeMembers(t => t.User)
-              .ForMember(d => d.UserRealName, u => u.MapFrom(s => s.User.FullName))
+            CreateMap<TrialUserRole, AssginSiteCRCListDTO>().IncludeMembers(t => t.UserRole)
+              .ForMember(d => d.UserRealName, u => u.MapFrom(s => s.UserRole.FullName))
              .ForMember(d => d.TrialSiteId, u => u.MapFrom(t => trialSiteId))
-              .ForMember(d => d.UserType, u => u.MapFrom(t => t.User.UserTypeRole.UserTypeShortName))
+              .ForMember(d => d.UserType, u => u.MapFrom(t => t.UserRole.UserTypeRole.UserTypeShortName))
              .ForMember(d => d.IsSelect, u => u.MapFrom(t => t.Trial.TrialSiteUserList.Any(k => k.UserId == t.UserId && k.TrialSiteId== trialSiteId)));
            CreateMap<UserRole, AssginSiteCRCListDTO>();

--- a/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs
+++ b/IRaCIS.Core.Application/Service/WorkLoad/EnrollService.cs
@ -17,7 +17,7 @@ namespace IRaCIS.Core.Application.Service
        IRepository<EnrollDetail> _enrollDetailRepository,
        IRepository<Workload> _workloadRepository,
        IRepository<UserRole> _userRoleRepository,
-        IRepository<TrialUser> _trialUserRepository,
+        IRepository<TrialUserRole> _trialUserRepository,
        IRepository<ReadingQuestionCriterionTrial> _ReadingQuestionCriterionTrialRepository,

       IRepository<TrialExperience> _trialExperienceRepository,
@ -174,7 +174,7 @@ namespace IRaCIS.Core.Application.Service

            var trial = await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialId);

-            var hasSPMOrCPM = await _trialUserRepository.Where(t => t.TrialId == trialId).AnyAsync(t => t.User.UserTypeEnum == UserTypeEnum.SPM || t.User.UserTypeEnum == UserTypeEnum.CPM);
+            var hasSPMOrCPM = await _trialUserRepository.Where(t => t.TrialId == trialId).AnyAsync(t => t.UserRole.UserTypeEnum == UserTypeEnum.SPM || t.UserRole.UserTypeEnum == UserTypeEnum.CPM);

           var  isSPMjoin= trial.IsSPMJoinReviewerSelect && hasSPMOrCPM;

@ -354,7 +354,7 @@ namespace IRaCIS.Core.Application.Service
        //[Authorize(Policy = IRaCISPolicy.PM_APM_SPM_CPM_SMM_CMM)]
        [UnitOfWork]
        public async Task<IResponseOutput> ConfirmReviewer(ConfirmReviewerCommand confirmReviewerCommand,
-            [FromServices] IRepository<TrialUser> _trialUserRepository,
+            [FromServices] IRepository<TrialUserRole> _trialUserRepository,
             [FromServices] IRepository<TaskAllocationRule> _taskAllocationRuleRepository)
        {
            //var trial = _trialRepository.FirstOrDefault(t => t.Id == trialId);
@ -412,7 +412,7 @@ namespace IRaCIS.Core.Application.Service

                            if (!await _trialUserRepository.AnyAsync(t => t.TrialId == trialId && t.UserId == userId, true))
                            {
-                                await _trialUserRepository.AddAsync(new TrialUser() { TrialId = trialId, UserId = userId, JoinTime = DateTime.Now });
+                                await _trialUserRepository.AddAsync(new TrialUserRole() { TrialId = trialId, UserId = userId, JoinTime = DateTime.Now });
                            }

                            await _enrollRepository.BatchUpdateNoTrackingAsync(t => t.Id == intoGroupItem.Id, u => new Enroll() { DoctorUserId = userId });
--- a/IRaCIS.Core.Application/TestService.cs
+++ b/IRaCIS.Core.Application/TestService.cs
@ -182,6 +182,40 @@ namespace IRaCIS.Core.Application.Service
            return ResponseOutput.Ok();
        }

+        /// <summary>
+        /// 项目用户 维护数据
+        /// </summary>
+        /// <param name="_trialIdentityUserRepository"></param>
+        /// <returns></returns>
+        public async Task<IResponseOutput> UserTrialUser([FromServices] IRepository<TrialIdentityUser> _trialIdentityUserRepository, [FromServices] IRepository<TrialUserRole> _trialUserRoleReposiotry)
+        {
+            var list = _trialUserRoleReposiotry.Where().Select(t => new { t.TrialId, t.UserRole.IdentityUserId, t.JoinTime, t.RemoveTime }).ToList();
+
+
+            foreach (var item in list.GroupBy(t => new { t.IdentityUserId, t.TrialId }))
+            {
+                var userRoleList = item.ToList();
+
+                var first = userRoleList.First();
+
+                var haveJoin = userRoleList.Any(t => t.JoinTime != null);
+
+                if (haveJoin)
+                {
+                    await _trialIdentityUserRepository.AddAsync(new TrialIdentityUser() { IdentityUserId = item.Key.IdentityUserId, TrialId = item.Key.TrialId, JoinTime = userRoleList.Min(t => t.JoinTime) });
+
+                }
+                else
+                {
+                    await _trialIdentityUserRepository.AddAsync(new TrialIdentityUser() { IdentityUserId = item.Key.IdentityUserId, TrialId = item.Key.TrialId, RemoveTime = userRoleList.Max(t => t.RemoveTime) });
+                }
+
+            }
+
+            await _trialIdentityUserRepository.SaveChangesAsync();
+
+            return ResponseOutput.Ok();
+        }



--- a/IRaCIS.Core.Application/Triggers/BeforeSaveTrigger/AddlTrialUserTrigger.cs
+++ b/IRaCIS.Core.Application/Triggers/BeforeSaveTrigger/AddlTrialUserTrigger.cs
@ -10,11 +10,11 @@ namespace IRaCIS.Core.Application.Triggers
    public class AddlTrialUserTrigger(
      IStringLocalizer _localizer,
      IRepository<Trial> _trialRepository,
-      IRepository<UserRole> _userRoleRepository) : IBeforeSaveTrigger<TrialUser>
+      IRepository<UserRole> _userRoleRepository) : IBeforeSaveTrigger<TrialUserRole>

    {

-        public async Task BeforeSave(ITriggerContext<TrialUser> context, CancellationToken cancellationToken)
+        public async Task BeforeSave(ITriggerContext<TrialUserRole> context, CancellationToken cancellationToken)
        {
            var trialUser = context.Entity;

--- a/IRaCIS.Core.Domain/Management/User.cs
+++ b/IRaCIS.Core.Domain/Management/User.cs
@ -22,7 +22,7 @@ public class UserRole : BaseFullAuditEntity
    public List<SystemDocConfirmedUser> SystemDocConfirmedList { get; set; }

    [JsonIgnore]
-    public List<TrialUser> UserTrials { get; set; } = new List<TrialUser>();
+    public List<TrialUserRole> UserTrials { get; set; } = new List<TrialUserRole>();

    [JsonIgnore]
    public List<VisitTask> VisitTaskList { get; set; }
--- a/IRaCIS.Core.Domain/Trial/Trial.cs
+++ b/IRaCIS.Core.Domain/Trial/Trial.cs
@ -38,7 +38,7 @@ public partial class Trial : BaseFullDeleteAuditEntity
    [JsonIgnore]
    public List<Workload> WorkloadList { get; set; } = new List<Workload>();
    [JsonIgnore]
-    public List<TrialUser> TrialUserList { get; set; } = new List<TrialUser>();
+    public List<TrialUserRole> TrialUserList { get; set; } = new List<TrialUserRole>();
    [JsonIgnore]
    public List<ReadingQuestionCriterionTrial> TrialReadingCriterionList { get; set; } = new List<ReadingQuestionCriterionTrial>();
    [JsonIgnore]
--- a/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs
+++ b/IRaCIS.Core.Domain/TrialSiteUser/TrialUser.cs
@ -1,9 +1,9 @@
 namespace IRaCIS.Core.Domain.Models;


-[Comment("运维人员与项目关联关系表 - 实体")]
+[Comment("项目用户角色表")]
 [Table("TrialUser")]
-public class TrialUser : BaseFullDeleteAuditEntity
+public class TrialUserRole : BaseFullDeleteAuditEntity
 {
    #region 导航属性
    [JsonIgnore]
@ -11,7 +11,7 @@ public class TrialUser : BaseFullDeleteAuditEntity

    [JsonIgnore]
    [ForeignKey("UserId")]
-    public UserRole User { get; set; }
+    public UserRole UserRole { get; set; }
    #endregion

    public Guid UserId { get; set; }
@ -21,3 +21,30 @@ public class TrialUser : BaseFullDeleteAuditEntity

    public DateTime? JoinTime { get; set; }
 }
+
+
+
+[Comment("项目用户表")]
+[Table("TrialIdentityUser")]
+public class TrialIdentityUser : BaseFullDeleteAuditEntity
+{
+    #region 导航属性
+
+    [JsonIgnore]
+    public Trial Trial { get; set; }
+
+    [JsonIgnore]
+    [ForeignKey("IdentityUserId")]
+    public IdentityUser IdentityUser { get; set; }
+
+    #endregion
+
+
+    public Guid TrialId { get; set; }
+
+    public Guid IdentityUserId { get; set; }
+
+    public DateTime? RemoveTime { get; set; }
+
+    public DateTime? JoinTime { get; set; }
+}
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@ -61,7 +61,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
            {
                return new List<Type>()
                {
-                   typeof(TrialUser),
+                   typeof(TrialUserRole),
                   typeof(TrialSiteSurvey),
                   typeof(TrialSiteUser),
                   typeof(VisitStage),
@ -1719,13 +1719,13 @@ namespace IRaCIS.Core.Infra.EFCore.Common


            // 项目人员
-            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialUser)))
+            foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(TrialUserRole)))
            {
                var type = GetEntityAuditOpt(item);

-                var entity = item.Entity as TrialUser;
+                var entity = item.Entity as TrialUserRole;
                //var user = await _dbContext.Users.Include(x => x.UserTypeRole).FirstOrDefaultAsync(x => x.Id == entity.UserId);
-                await InsertInspection<TrialUser>(entity, type, x => new InspectionConvertDTO
+                await InsertInspection<TrialUserRole>(entity, type, x => new InspectionConvertDTO
                {
                    IsDistinctionInterface = type == AuditOpt.Update ? true : false,
                    TrialId = x.TrialId,
--- a/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
+++ b/IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs
@ -447,7 +447,7 @@ public class IRaCISDBContext : DbContext

    public virtual DbSet<TrialDictionary> TrialDictionary { get; set; }
    public virtual DbSet<TrialStatusDetail> TrialDetail { get; set; }
-    public virtual DbSet<TrialUser> UserTrial { get; set; }
+    public virtual DbSet<TrialUserRole> UserTrial { get; set; }

    public virtual DbSet<TrialDictionary> ProjectDictionary { get; set; }

@ -632,6 +632,10 @@ public class IRaCISDBContext : DbContext

    public virtual DbSet<IdentityUser> IdentityUser { get; set; }

+    public virtual DbSet<TrialIdentityUser> TrialIdentityUser { get; set; }
+
+    
+
 }

 public class TestLength : Entity
--- a/IRaCIS.Core.Infra.EFCore/EntityConfigration/SubjectConfigration.cs
+++ b/IRaCIS.Core.Infra.EFCore/EntityConfigration/SubjectConfigration.cs
@ -75,13 +75,13 @@ namespace IRaCIS.Core.Infra.EFCore.EntityConfigration
        }
    }

-    public class TrialUserConfigration : IEntityTypeConfiguration<TrialUser>
+    public class TrialUserConfigration : IEntityTypeConfiguration<TrialUserRole>
    {
        //当一个实体，针对同一个类，有两个一对一导航属性，但是是不同的外键，一个外键是一对一，一个是一对多，那么需要显示配置一对多的关系
-        public void Configure(EntityTypeBuilder<TrialUser> builder)
+        public void Configure(EntityTypeBuilder<TrialUserRole> builder)
        {
            //TrialUser  和User 之间 一对多 （一个用户可以参与多个项目）
-            builder.HasOne(s => s.User)
+            builder.HasOne(s => s.UserRole)
              .WithMany(t => t.UserTrials)
              .HasForeignKey(s => s.UserId);

--- a/IRaCIS.Core.Infra.EFCore/Migrations/20241225021839_TrialIdentityUser.Designer.cs
+++ b/IRaCIS.Core.Infra.EFCore/Migrations/20241225021839_TrialIdentityUser.Designer.cs
--- a/IRaCIS.Core.Infra.EFCore/Migrations/20241225021839_TrialIdentityUser.cs
+++ b/IRaCIS.Core.Infra.EFCore/Migrations/20241225021839_TrialIdentityUser.cs
@ -0,0 +1,88 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class TrialIdentityUser : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterTable(
+                name: "TrialUser",
+                comment: "项目用户角色表",
+                oldComment: "运维人员与项目关联关系表 - 实体");
+
+            migrationBuilder.CreateTable(
+                name: "TrialIdentityUser",
+                columns: table => new
+                {
+                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    TrialId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    IdentityUserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    RemoveTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    JoinTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    DeleteUserId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    IsDeleted = table.Column<bool>(type: "bit", nullable: false),
+                    DeletedTime = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    CreateUserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    CreateTime = table.Column<DateTime>(type: "datetime2", nullable: false),
+                    UpdateUserId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    UpdateTime = table.Column<DateTime>(type: "datetime2", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_TrialIdentityUser", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_TrialIdentityUser_IdentityUser_IdentityUserId",
+                        column: x => x.IdentityUserId,
+                        principalTable: "IdentityUser",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_TrialIdentityUser_Trial_TrialId",
+                        column: x => x.TrialId,
+                        principalTable: "Trial",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                    table.ForeignKey(
+                        name: "FK_TrialIdentityUser_User_CreateUserId",
+                        column: x => x.CreateUserId,
+                        principalTable: "User",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                },
+                comment: "项目用户表");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TrialIdentityUser_CreateUserId",
+                table: "TrialIdentityUser",
+                column: "CreateUserId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TrialIdentityUser_IdentityUserId",
+                table: "TrialIdentityUser",
+                column: "IdentityUserId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_TrialIdentityUser_TrialId",
+                table: "TrialIdentityUser",
+                column: "TrialId");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "TrialIdentityUser");
+
+            migrationBuilder.AlterTable(
+                name: "TrialUser",
+                comment: "运维人员与项目关联关系表 - 实体",
+                oldComment: "项目用户角色表");
+        }
+    }
+}
--- a/IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs
+++ b/IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs