Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/BusinessFilter/LegacyController/TrialGlobalLimitActionFilter.cs

@@ -0,0 +1,188 @@
+using IRaCIS.Core.Application.BusinessFilter;
+using IRaCIS.Core.Application.Helper;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using static IRaCIS.Core.Domain.Share.StaticData;
+
+namespace IRaCIS.Core.Application.Filter;
+
+public class TrialGlobalLimitActionFilter(IFusionCache _fusionCache, IUserInfo _userInfo, IRepository<Trial> _trialRepository) : IAsyncActionFilter
+{
+    public async Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
+    {
+        // 检查当前 endpoint 是否包含 TrialGlobalLimitAttribute 特性
+        var trialLimitAttribute = context.HttpContext.GetEndpoint()?.Metadata.GetMetadata<TrialGlobalLimitAttribute>();
+
+        if (trialLimitAttribute != null)
+        {
+            var optActions = trialLimitAttribute._optActions;
+
+
+            // 这里开始执行原有的逻辑
+            var requestHost = context.HttpContext.Request.Host;
+
+            // 检查请求是否来自 localhost:6100
+            if (requestHost.Host == "localhost" && (requestHost.Port == 6100 || requestHost.Port == 3305))
+            {
+                await next();
+                return;
+            }
+
+            #region 特殊用户类型拦截
+            // 用户类型检查  
+            if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA && _userInfo.RequestUrl.ToLower() != "TrialDocument/userConfirm".ToLower())
+            {
+                //对不起，您的账户没有操作权限
+                context.Result = new JsonResult(ResponseOutput.NotOk(I18n.T("TrialResource_NoAccessPermission")));
+
+                return;
+            }
+            #endregion
+
+
+            #region 从多种途径取TrialId
+            //TrialId 传递的途径多种，可能在path 可能在body  可能在数组中，也可能在对象中，可能就在url
+            var trialIdStr = string.Empty;
+
+            if (!string.IsNullOrWhiteSpace(context.HttpContext.Request.Query["trialId"]))
+            {
+                trialIdStr = context.HttpContext.Request.Query["trialId"];
+            }
+
+            //先尝试从path中取TrialId 
+            else if (context.HttpContext.Request.RouteValues.Keys.Any(t => t.Contains("trialId")))
+            {
+                var index = context.HttpContext.Request.RouteValues.Keys.ToList().IndexOf("trialId");
+                trialIdStr = context.HttpContext.Request.RouteValues.Values.ToList()[index] as string;
+            }
+            else if (context.HttpContext.Request.Headers["Referer"].ToString().Contains("trialId"))
+            {
+                var headerStr = context.HttpContext.Request.Headers["Referer"].ToString();
+
+                var trialIdIndex = headerStr.IndexOf("trialId");
+
+
+                var matchResult = Regex.Match(headerStr.Substring(trialIdIndex), @"[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}");
+
+                if (matchResult.Success)
+                {
+                    trialIdStr = matchResult.Value;
+                }
+                else
+                {
+                    //---正则取请求Refer 中trialId 失败，请联系开发人员核查
+                    context.Result = new JsonResult(ResponseOutput.NotOk(I18n.T("TrialResource_ReferTrialIdFailed")));
+                    return;
+                }
+
+            }
+            else
+            {
+                #region body 中取数据
+
+                //设置可以多次读
+                context.HttpContext.Request.EnableBuffering();
+                var reader = new StreamReader(context.HttpContext.Request.Body);
+                var contentFromBody = await reader.ReadToEndAsync();
+                //读取后，流的位置还原
+                context.HttpContext.Request.Body.Seek(0, SeekOrigin.Begin);
+                //context.HttpContext.Request.Body.Position = 0;
+
+                //找到参数位置在字符串中的索引
+                var trialIdIndex = contentFromBody.IndexOf("\"TrialId\"", StringComparison.OrdinalIgnoreCase);
+
+                if (trialIdIndex > -1)
+                {
+                    //  (?<="trialId" *: *").*?(?=",)
+
+                    //使用正则 [0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}
+
+                    var matchResult = Regex.Match(contentFromBody.Substring(trialIdIndex), @"[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}");
+
+                    if (matchResult.Success)
+                    {
+                        //有可能匹配错误   "trialId":"","documentId":"b8180000-3e2c-0016-9fe0-08da33f96236"  从缓存里面验证下
+
+                        trialIdStr = matchResult.Value;
+
+                        var trialStatusStr = await _fusionCache.GetOrSetAsync(CacheKeys.Trial(trialIdStr), _ => CacheHelper.GetTrialStatusAsync(Guid.Parse(trialIdStr), _trialRepository), TimeSpan.FromDays(7));
+
+                        if (string.IsNullOrWhiteSpace(trialStatusStr))
+                        {
+
+                            //数据库 检查该项目Id不对
+                            context.Result = new JsonResult(ResponseOutput.NotOk(I18n.T("TrialResource_ReferTrialIdFailed")));
+                            return;
+
+                        }
+                    }
+                    else
+                    {
+                        //---正则取请求Refer 中trialId 失败，请联系开发人员核查
+                        context.Result = new JsonResult(ResponseOutput.NotOk(I18n.T("TrialResource_ReferTrialIdFailed")));
+                        return;
+
+                    }
+
+                    //使用字符串取 如果是swagger  可能有时取的不对  因为空格的原因
+                    //trialIdStr = contentFromBody.Substring(trialIdIndex + "TrialId".Length + 4, 3
+                }
+
+                #endregion
+            }
+            #endregion
+
+
+
+            //通过path 或者body 找到trialId 了  
+            if (!string.IsNullOrWhiteSpace(trialIdStr))
+            {
+                var trialStatusStr = await _fusionCache.GetOrSetAsync(CacheKeys.Trial(trialIdStr), _ => CacheHelper.GetTrialStatusAsync(Guid.Parse(trialIdStr), _trialRepository), TimeSpan.FromDays(7));
+
+                //  这里是统一拦截 项目有关的操作允许情况(特殊的地方，比如项目配置（有的在多种状态（初始化，ongoing）都可以操作，有的仅仅在Initializing）还有  项目添加和更新，不走这里，特殊处理,不然在这里显得很乱，判断是哪个接口)
+                if (trialStatusStr == StaticData.TrialState.TrialOngoing || optActions.Any(t => t == TrialOpt.BeforeOngoingCantOpt))
+                {
+
+                    await next();
+
+                }
+                //  项目停止、或者完成  不允许操作
+                else
+                {
+                    //---本次请求被配置规则拦截：项目状态处于进行中时,才允许操作,若此处逻辑有误，请联系开发人员修改
+                    context.Result = new JsonResult(ResponseOutput.NotOk(I18n.T("TrialResource_InterceptedProjectStatusRule")));
+
+                }
+
+            }
+            //添加项目  签名系统文档的时候  不做拦截   但是更新项目  签名项目文档的时候需要拦截
+            else if (optActions.Any(t => t == TrialOpt.AddOrUpdateTrial || t == TrialOpt.SignSystemDocNoTrialId))
+            {
+                await next();
+            }
+
+            else
+            {
+                //如果项目相关接口没有传递trialId 会来到这里,提醒，以便修改
+
+                //---该接口参数中，没有传递项目编号，请核对。
+                context.Result = new JsonResult(ResponseOutput.NotOk(I18n.T("TrialResource_MissingProjectNumber")));
+            }
+
+        }
+        else
+        {
+            // 如果没有 TrialGlobalLimitAttribute，则直接执行后续逻辑
+            await next();
+        }
+
+
+    }
+}

IRaCIS.Core.Application/BusinessFilter/MinimalAPI/Todo/TrialGlobalLimitEndpointFilter.cs

@@ -1,17 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace IRaCIS.Core.Application.BusinessFilter;
-
-public class TrialGlobalLimitEndpointFilter : IEndpointFilter
-
-{
-    public ValueTask<object?> InvokeAsync(EndpointFilterInvocationContext context, EndpointFilterDelegate next)
-    {
-        throw new NotImplementedException();
-    }
-}

IRaCIS.Core.Application/BusinessFilter/MinimalAPI/TrialGlobalLimitEndpointFilter.cs

@@ -0,0 +1,190 @@
+using IRaCIS.Core.Application.Helper;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using static IRaCIS.Core.Domain.Share.StaticData;
+
+namespace IRaCIS.Core.Application.BusinessFilter;
+
+public class TrialGlobalLimitAttribute : Attribute
+{
+    public readonly string[] _optActions;
+
+    public TrialGlobalLimitAttribute(params string[] optActions)
+    {
+        _optActions = optActions;
+    }
+}
+
+
+
+
+public class TrialGlobalLimitEndpointFilter(IFusionCache _fusionCache, IUserInfo _userInfo, IRepository<Trial> _trialRepository) : IEndpointFilter
+
+{
+    public async ValueTask<object?> InvokeAsync(EndpointFilterInvocationContext context, EndpointFilterDelegate next)
+    {
+        // 检查当前 endpoint 是否包含 TrialGlobalLimitAttribute 特性
+        var trialLimitAttribute = context.HttpContext.GetEndpoint()?.Metadata.GetMetadata<TrialGlobalLimitAttribute>();
+
+        if (trialLimitAttribute != null)
+        {
+            var optActions = trialLimitAttribute._optActions;
+
+
+            // 这里开始执行原有的逻辑
+            var requestHost = context.HttpContext.Request.Host;
+
+            // 检查请求是否来自 localhost:6100
+            if (requestHost.Host == "localhost" && (requestHost.Port == 6100 || requestHost.Port == 3305))
+            {
+                return await next(context);
+            }
+
+            #region 特殊用户类型拦截
+            // 用户类型检查  
+            if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA && _userInfo.RequestUrl.ToLower() != "TrialDocument/userConfirm".ToLower())
+            {
+                //对不起，您的账户没有操作权限
+                return Results.Json(ResponseOutput.NotOk(I18n.T("TrialResource_NoAccessPermission")));
+            }
+            #endregion
+
+
+            #region 从多种途径取TrialId
+            //TrialId 传递的途径多种，可能在path 可能在body  可能在数组中，也可能在对象中，可能就在url
+            var trialIdStr = string.Empty;
+
+            if (!string.IsNullOrWhiteSpace(context.HttpContext.Request.Query["trialId"]))
+            {
+                trialIdStr = context.HttpContext.Request.Query["trialId"];
+            }
+
+            //先尝试从path中取TrialId 
+            else if (context.HttpContext.Request.RouteValues.Keys.Any(t => t.Contains("trialId")))
+            {
+                var index = context.HttpContext.Request.RouteValues.Keys.ToList().IndexOf("trialId");
+                trialIdStr = context.HttpContext.Request.RouteValues.Values.ToList()[index] as string;
+            }
+            else if (context.HttpContext.Request.Headers["Referer"].ToString().Contains("trialId"))
+            {
+                var headerStr = context.HttpContext.Request.Headers["Referer"].ToString();
+
+                var trialIdIndex = headerStr.IndexOf("trialId");
+
+
+                var matchResult = Regex.Match(headerStr.Substring(trialIdIndex), @"[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}");
+
+                if (matchResult.Success)
+                {
+                    trialIdStr = matchResult.Value;
+                }
+                else
+                {
+                    //---正则取请求Refer 中trialId 失败，请联系开发人员核查
+                    return Results.Json(ResponseOutput.NotOk(I18n.T("TrialResource_ReferTrialIdFailed")));
+                }
+
+            }
+            else
+            {
+                #region body 中取数据
+
+                //设置可以多次读
+                context.HttpContext.Request.EnableBuffering();
+                var reader = new StreamReader(context.HttpContext.Request.Body);
+                var contentFromBody = await reader.ReadToEndAsync();
+                //读取后，流的位置还原
+                context.HttpContext.Request.Body.Seek(0, SeekOrigin.Begin);
+                //context.HttpContext.Request.Body.Position = 0;
+
+                //找到参数位置在字符串中的索引
+                var trialIdIndex = contentFromBody.IndexOf("\"TrialId\"", StringComparison.OrdinalIgnoreCase);
+
+                if (trialIdIndex > -1)
+                {
+                    //  (?<="trialId" *: *").*?(?=",)
+
+                    //使用正则 [0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}
+
+                    var matchResult = Regex.Match(contentFromBody.Substring(trialIdIndex), @"[0-9a-fA-F]{8}(-[0-9a-fA-F]{4}){3}-[0-9a-fA-F]{12}");
+
+                    if (matchResult.Success)
+                    {
+                        //有可能匹配错误   "trialId":"","documentId":"b8180000-3e2c-0016-9fe0-08da33f96236"  从缓存里面验证下
+
+                        trialIdStr = matchResult.Value;
+
+                        var trialStatusStr = await _fusionCache.GetOrSetAsync(CacheKeys.Trial(trialIdStr), _ => CacheHelper.GetTrialStatusAsync(Guid.Parse(trialIdStr), _trialRepository), TimeSpan.FromDays(7));
+
+                        if (string.IsNullOrWhiteSpace(trialStatusStr))
+                        {
+
+                            //数据库 检查该项目Id不对
+                            return Results.Json(ResponseOutput.NotOk(I18n.T("TrialResource_ReferTrialIdFailed")));
+
+                        }
+                    }
+                    else
+                    {
+                        //---正则取请求Refer 中trialId 失败，请联系开发人员核查
+                        return Results.Json(ResponseOutput.NotOk(I18n.T("TrialResource_ReferTrialIdFailed")));
+
+                    }
+
+                    //使用字符串取 如果是swagger  可能有时取的不对  因为空格的原因
+                    //trialIdStr = contentFromBody.Substring(trialIdIndex + "TrialId".Length + 4, 3
+                }
+
+                #endregion
+            }
+            #endregion
+
+
+
+            //通过path 或者body 找到trialId 了  
+            if (!string.IsNullOrWhiteSpace(trialIdStr))
+            {
+                var trialStatusStr = await _fusionCache.GetOrSetAsync(CacheKeys.Trial(trialIdStr), _ => CacheHelper.GetTrialStatusAsync(Guid.Parse(trialIdStr), _trialRepository), TimeSpan.FromDays(7));
+
+                //  这里是统一拦截 项目有关的操作允许情况(特殊的地方，比如项目配置（有的在多种状态（初始化，ongoing）都可以操作，有的仅仅在Initializing）还有  项目添加和更新，不走这里，特殊处理,不然在这里显得很乱，判断是哪个接口)
+                if (trialStatusStr == StaticData.TrialState.TrialOngoing || optActions.Any(t => t == TrialOpt.BeforeOngoingCantOpt))
+                {
+
+                    return await next(context);
+
+                }
+                //  项目停止、或者完成  不允许操作
+                else
+                {
+                    //---本次请求被配置规则拦截：项目状态处于进行中时,才允许操作,若此处逻辑有误，请联系开发人员修改
+                    return Results.Json(ResponseOutput.NotOk(I18n.T("TrialResource_InterceptedProjectStatusRule")));
+
+                }
+
+            }
+            //添加项目  签名系统文档的时候  不做拦截   但是更新项目  签名项目文档的时候需要拦截
+            else if (optActions.Any(t => t == TrialOpt.AddOrUpdateTrial || t == TrialOpt.SignSystemDocNoTrialId))
+            {
+                return await next(context);
+            }
+
+            else
+            {
+                //如果项目相关接口没有传递trialId 会来到这里,提醒，以便修改
+
+                //---该接口参数中，没有传递项目编号，请核对。
+                return Results.Json(ResponseOutput.NotOk(I18n.T("TrialResource_MissingProjectNumber")));
+            }
+
+        }
+
+        // 如果没有 TrialGlobalLimitAttribute，则直接执行后续逻辑
+        return await next(context);
+    }
+}

IRaCIS.Core.Application/GlobalUsings.cs

@@ -9,6 +9,6 @@ global using ZiggyCreatures.Caching.Fusion;
 global using Microsoft.Extensions.Localization;
 global using AutoMapper;
 global using IRaCIS.Core.Domain.Share;
-
+global using IRaCIS.Core.Application.BusinessFilter;
 
 

IRaCIS.Core.Application/Helper/FileDocProcess/ExcelExportHelper.cs

@@ -237,6 +237,11 @@ public static class ExcelExportHelper
         /// </summary>
         public string DynamicItemValueName { get; set; }
 
+        /// <summary>
+        /// Excel Title Name
+        /// </summary>
+        public string DynamicItemTitleName { get; set; }
+
         public List<int> RemoveColunmIndexList { get; set; } = new List<int>();
     }
 
@@ -385,6 +390,7 @@ public static class ExcelExportHelper
                 //原始表  最终索引
                 var originTotalEndIndex = dynamicColumnConfig.TempalteLastColumnIndex;
 
+                //减去动态移除后原始结束索引
                 var originRemoveEndIndex= originTotalEndIndex- dynamicRemoveColunmCount;
 
                 //最终表 动态列开始索引
@@ -496,15 +502,19 @@ public static class ExcelExportHelper
 
                 var itemList = itemDic[dynamicColumnConfig.DynamicListName] as IList;
 
+                //这个数组是动态的，有的多，有的少，所以在此对比Title 一致才赋值
                 foreach (var itemObj in itemList)
                 {
-                    var writeIndex = itemList.IndexOf(itemObj) + dynamicColumnConfig.AutoColumnStartIndex;
 
                     var iteObjDic = itemObj.ToDictionary();
 
                     var itemDicName = iteObjDic[dynamicColumnConfig.DynamicItemDicName]?.ToString();
                     var itemValue = iteObjDic[dynamicColumnConfig.DynamicItemValueName]?.ToString();
 
+                    //var writeIndex = itemList.IndexOf(itemObj) + dynamicColumnConfig.AutoColumnStartIndex;
+
+                    var writeIndex = dynamicColumnConfig.ColumnNameList.IndexOf(iteObjDic[dynamicColumnConfig.DynamicItemTitleName].ToString())  + dynamicColumnConfig.AutoColumnStartIndex;
+                   
                     if (itemDicName.IsNotNullOrEmpty())
                     {
 

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

@@ -92,6 +92,11 @@
             取值的属性名
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.ExcelExportHelper.DynamicColumnConfig.DynamicItemTitleName">
+            <summary>
+            Excel Title Name
+            </summary>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ExcelExportHelper.ExportTemplateAsync(IRaCIS.Application.Contracts.ExportTemplateServiceDto)">
             <summary>
             导出文件模板
@@ -339,7 +344,7 @@
             访视读片任务
             </summary>	
         </member>
-        <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},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.TaskAllocationRule},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Subject},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadModule},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTaskReReading},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TaskMedicalReview},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingClinicalData},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectCriteriaEvaluation},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectCriteriaEvaluationVisitFilter},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTaskQuestionAnswer},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomInstance},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomSeries},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectCanceDoctor},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTaskQuestionMark},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTableAnswerRowInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingCustomTag},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TaskInfluence},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialQCQuestionAnswer},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectCriteriaEvaluationVisitStudyFilter},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
+        <member name="M:IRaCIS.Core.Application.Service.Allocation.VisitTaskService.#ctor(IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTask},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.TaskAllocationRule},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.Subject},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectUser},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadModule},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.VisitTaskReReading},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TaskMedicalReview},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingClinicalData},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectCriteriaEvaluation},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectCriteriaEvaluationVisitFilter},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingQuestionCriterionTrial},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTaskQuestionAnswer},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomInstance},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.DicomSeries},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectCanceDoctor},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTaskQuestionMark},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingTableAnswerRowInfo},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingCustomTag},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TaskInfluence},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialQCQuestionAnswer},Microsoft.Extensions.Logging.ILogger{IRaCIS.Core.Application.Service.Allocation.VisitTaskService},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectCriteriaEvaluationVisitStudyFilter},AutoMapper.IMapper,IRaCIS.Core.Domain.Share.IUserInfo,Microsoft.Extensions.Localization.IStringLocalizer)">
             <summary>
             访视读片任务
             </summary>	

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

@@ -46,7 +46,7 @@ namespace IRaCIS.Core.Application.Service
 
 
 
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         public async Task<IResponseOutput> AddOrUpdateTaskAllocationRule(TaskAllocationRuleAddOrEdit addOrEditTaskAllocationRule)
         {
@@ -77,7 +77,7 @@ namespace IRaCIS.Core.Application.Service
 
         }
 
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         [HttpDelete("{taskAllocationRuleId:guid}")]
         public async Task<IResponseOutput> DeleteTaskAllocationRule(Guid taskAllocationRuleId)

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

@@ -136,7 +136,7 @@ namespace IRaCIS.Core.Application.Service
         /// <returns></returns>
         [HttpPost]
         [UnitOfWork]
-        //[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        //[TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         public async Task<IResponseOutput> ConfirmGenerateSelfConsistentTask(ConsistentConfirmGenerateCommand inCommand)
         {
@@ -330,7 +330,7 @@ namespace IRaCIS.Core.Application.Service
         /// <returns></returns>
         [HttpPost]
         [UnitOfWork]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         public async Task<IResponseOutput> ConfirmGenerateGroupConsistentTask(GroupConsistentConfirmGenrateCommand inCommand)
         {
@@ -860,7 +860,7 @@ namespace IRaCIS.Core.Application.Service
 
         [HttpPost]
         [UnitOfWork]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> UpdateTrialVirtualSiteCode(UpdateTrialSiteCodeCommand inCommand)
         {
 
@@ -896,7 +896,7 @@ namespace IRaCIS.Core.Application.Service
         }
 
 
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         public async Task<IResponseOutput> AddOrUpdateTaskConsistentRule(TaskConsistentRuleAddOrEdit addOrEditTaskConsistentRule)
         {
@@ -936,7 +936,7 @@ namespace IRaCIS.Core.Application.Service
 
         }
 
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         [HttpDelete("{taskConsistentRuleId:guid}")]
         public async Task<IResponseOutput> DeleteTaskConsistentRule(Guid taskConsistentRuleId)

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

@@ -35,7 +35,7 @@ namespace IRaCIS.Core.Application.Service
         }
 
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         public async Task<IResponseOutput> AddOrUpdateTaskMedicalReviewRule(TaskMedicalReviewRuleAddOrEdit addOrEditTaskTaskMedicalReviewRule)
         {
@@ -55,7 +55,7 @@ namespace IRaCIS.Core.Application.Service
 
 
         [HttpDelete("{taskMedicalReviewRuleId:guid}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         public async Task<IResponseOutput> DeleteTaskMedicalReviewRule(Guid taskMedicalReviewRuleId)
         {

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

@@ -111,7 +111,7 @@ namespace IRaCIS.Core.Application.Service
         /// </summary>
         /// <param name="command"></param>
         /// <returns></returns>
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> ManuallyGeneratedAndAssignedMedicalReview(ManuallyGeneratedAndAssignedMedicalReviewCommand command)
         {
 
@@ -279,7 +279,7 @@ namespace IRaCIS.Core.Application.Service
         /// <returns></returns>
         [UnitOfWork]
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         public async Task<IResponseOutput> AssignMedicalReviewTask(AssignMedicalReviewTaskCommand command)
         {

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

@@ -14,6 +14,7 @@ using IRaCIS.Core.Infra.EFCore.Common;
 using IRaCIS.Core.Infrastructure;
 using MassTransit;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
 using System.Linq.Dynamic.Core;
 using Subject = IRaCIS.Core.Domain.Models.Subject;
 
@@ -46,6 +47,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
     IRepository<ReadingCustomTag> _readingCustomTagRepository,
     IRepository<TaskInfluence> _taskInfluenceRepository,
     IRepository<TrialQCQuestionAnswer> _trialQCQuestionAnswerRepository,
+    ILogger<VisitTaskService> _logger,
     IRepository<SubjectCriteriaEvaluationVisitStudyFilter> _subjectCriteriaEvaluationVisitStudyFilterRepository, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService, IVisitTaskService
 {
 
@@ -152,7 +154,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
     /// </summary>
     /// <param name="command"></param>
     /// <returns></returns>
-    [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+    [TrialGlobalLimit("AfterStopCannNotOpt")]
     public async Task<IResponseOutput> BatchAssignDoctorToSubject(BatchAssignDoctorToSubjectCommand command)
     {
         //var inOrder = _trialRepository.Where(t => t.Id == command.TrialId).Select(t => t.IsReadingTaskViewInOrder).FirstOrDefault();
@@ -254,7 +256,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
     /// <returns></returns>
     /// <exception cref="BusinessValidationFailedException"></exception>
     [HttpPost]
-    [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+    [TrialGlobalLimit("AfterStopCannNotOpt")]
     public async Task<IResponseOutput> CancelSubjectAssignedDoctor(CancelSubjectDoctorCommand cancelCommand)
     {
         foreach (var command in cancelCommand.CancelList.Where(t => t.IsCancelAssign))
@@ -295,7 +297,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
     /// <returns></returns>
     [HttpPost]
     [UnitOfWork]
-    [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+    [TrialGlobalLimit("AfterStopCannNotOpt")]
     public async Task<IResponseOutput> AssignSubjectTaskToDoctor(AssignSubjectTaskToDoctorCommand assignSubjectTaskToDoctorCommand)
     {
         var visitTask = await _visitTaskRepository.FirstOrDefaultAsync(t => t.Id == assignSubjectTaskToDoctorCommand.Id);
@@ -425,7 +427,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
     /// <returns></returns>
     [HttpPost]
     [UnitOfWork]
-    [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+    [TrialGlobalLimit("AfterStopCannNotOpt")]
     public async Task<IResponseOutput> AssignSubjectDoctor(AssginSubjectDoctorCommand assginSubjectDoctorCommand)
     {
         var trialId = assginSubjectDoctorCommand.TrialId;
@@ -504,7 +506,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
     /// </summary>
     /// <returns></returns> 数量
     [HttpPost]
-    [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+    [TrialGlobalLimit("AfterStopCannNotOpt")]
     public async Task<IResponseOutput> CancelSubjectAssignDoctor(CancelSubjectAssignCommand cancelSubjectAssignCommand)
     {
         if (cancelSubjectAssignCommand.IsJudgeDoctor)
@@ -547,7 +549,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
     /// <returns></returns>
     [HttpPost]
     [UnitOfWork]
-    [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+    [TrialGlobalLimit("AfterStopCannNotOpt")]
     public async Task<IResponseOutput> ManualAssignDoctorApplyTask(AssignConfirmCommand assignConfirmCommand)
     {
         var trialId = assignConfirmCommand.TrialId;
@@ -1309,7 +1311,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
     /// <returns></returns>
     [HttpPost]
     [UnitOfWork]
-    [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+    [TrialGlobalLimit("AfterStopCannNotOpt")]
 
     public async Task<IResponseOutput> ApplyReReading(ApplyReReadingCommand applyReReadingCommand)
     {
@@ -1332,6 +1334,8 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
                 throw new BusinessValidationFailedException(_localizer["VisitTask_BackendData"]);
             }
 
+            _logger.LogError("重阅申请状态"+ (int)task.ReReadingApplyState);
+
             if (task.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed || task.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed || task.ReReadingApplyState == ReReadingApplyState.Agree)
             {
                 //---重阅已申请，或者重阅已同意状态下不允许申请重阅
@@ -1579,7 +1583,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
     /// <returns></returns>
     [HttpPost]
     [UnitOfWork]
-    [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+    [TrialGlobalLimit("AfterStopCannNotOpt")]
 
     public async Task<IResponseOutput> ConfirmReReading(ConfirmReReadingCommand agreeReReadingCommand, [FromServices] IVisitTaskHelpeService _visitTaskCommonService)
     {
@@ -2118,7 +2122,6 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
             }
             else if (agreeReReadingCommand.RequestReReadingResultEnum == RequestReReadingResult.Reject)
             {
-
                 if (origenalTask.ReReadingApplyState == ReReadingApplyState.DocotorHaveApplyed || origenalTask.ReReadingApplyState == ReReadingApplyState.TrialGroupHaveApplyed)
                 {
                     await _visitTaskRepository.UpdatePartialFromQueryAsync(t => t.Id == origenalTask.Id, u => new VisitTask()
@@ -2223,7 +2226,7 @@ public class VisitTaskService(IRepository<VisitTask> _visitTaskRepository,
     /// <returns></returns>
     [HttpPut("{trialId:guid}/{taskId:guid}")]
     [UnitOfWork]
-    [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+    [TrialGlobalLimit("AfterStopCannNotOpt")]
 
     public async Task<IResponseOutput> PMSetTaskBack(Guid trialId, Guid taskId)
     {

IRaCIS.Core.Application/Service/Common/ExcelExportService.cs

@@ -1644,21 +1644,21 @@ namespace IRaCIS.Core.Application.Service.Common
                     else
                     {
                         //如果没有产生裁判，默认选择R1
-                        if (item.ArmEnum== Arm.DoubleReadingArm1)
+                        if (item.ArmEnum == Arm.DoubleReadingArm1)
                         {
                             item.IsJudgeSelect = true;
                         }
-                    }        
+                    }
                 }
-             
+
             }
             if (arbitrationRule == ArbitrationRule.Reading)
             {
                 //处理访视裁判标记
                 foreach (var visitItem in resultExceptJudgeList.Where(t => t.ReadingCategory == ReadingCategory.Visit))
                 {
-                    //默认设置为false  只处理为true 和 空的情况
-                    visitItem.IsJudgeSelect = false;
+                    ////默认设置为false  只处理为true 和 空的情况
+                    //visitItem.IsJudgeSelect = false;
 
                     if (judegeList.Count > 0)
                     {
@@ -1667,23 +1667,27 @@ namespace IRaCIS.Core.Application.Service.Common
 
                         var maxNotFinishedJudge = judegeList.Where(t => t.ReadingTaskState != ReadingTaskState.HaveSigned).FirstOrDefault();
 
+                        //仅有一个未完成的全局裁判，那么都是null
                         if (maxFinishedJudge == null && maxNotFinishedJudge != null)
                         {
-                            //仅有一个未完成的全局裁判，那么都是null
                             if (visitItem.VisitTaskNum < maxNotFinishedJudge.VisitTaskNum)
                             {
                                 visitItem.IsJudgeSelect = null;
                             }
                         }
+                        //全局裁判都完成了，那么以最后一次裁判选择的为准
                         else if (maxFinishedJudge != null && maxNotFinishedJudge == null)
                         {
-                            //全局裁判都完成了，那么以最后一次裁判选择的为准
-
                             if (visitItem.ArmEnum == maxFinishedJudge.JudgeArmEnum && visitItem.VisitTaskNum < maxFinishedJudge.VisitTaskNum)
                             {
                                 visitItem.IsJudgeSelect = true;
                                 visitItem.JudgeNote = maxFinishedJudge.JudgeNote;
                             }
+                            //裁判没选择的人设置为false
+                            else if (visitItem.VisitTaskNum < maxFinishedJudge.VisitTaskNum)
+                            {
+                                visitItem.IsJudgeSelect = false;
+                            }
                         }
                         else
                         {
@@ -1699,7 +1703,10 @@ namespace IRaCIS.Core.Application.Service.Common
                                 visitItem.IsJudgeSelect = true;
                                 visitItem.JudgeNote = maxFinishedJudge.JudgeNote;
                             }
-
+                            else if (visitItem.VisitTaskNum < maxFinishedJudge.VisitTaskNum)
+                            {
+                                visitItem.IsJudgeSelect = false;
+                            }
 
                         }
                     }
@@ -2049,44 +2056,54 @@ namespace IRaCIS.Core.Application.Service.Common
                 var dynamicLessionTitleList = lessionAnserList.Select(t => new DymamicQuestionInfo { QuestionMark = t.QuestionMark, QuestionName = t.QuestionName, TranslateDicName = t.TranslateDicName }).Distinct();
                 var dynamicTitleList = dynamicExtraAddTitleList.Union(dynamicLessionTitleList).ToList();
 
-                //最终的病灶列表
+                //最终的病灶列表  要把裁判的也要加进去
                 list = new List<CommonEvaluationExport>();
 
 
                 foreach (var item in taskList)
                 {
-
-                    foreach (var lession in item.LesionList)
+                    if (item.LesionList.Count > 0)
                     {
-                        var firstLessionAnser = lession.LessionAnswerList.FirstOrDefault() ?? new CommonLessionQuestionAnswerInfo();
-
-                        var addLessionInfoList = new List<CommonQuesionInfo>();
-
-                        if (criterion.CriterionType == CriterionType.RECIST1Point1 || criterion.CriterionType == CriterionType.RECIST1Pointt1_MB
-                       || criterion.CriterionType == CriterionType.IRECIST1Point1 || criterion.CriterionType == CriterionType.Lugano2014 || criterion.CriterionType == CriterionType.Lugano2014WithoutPET)
+                        foreach (var lession in item.LesionList)
                         {
-                            //病灶编号 和病灶类型没有配置，但是需要有的
-                            addLessionInfoList.Add(new CommonQuesionInfo() { QuestionName = _userInfo.IsEn_Us ? "Lesion ID" : "病灶编号", QuestionValue = firstLessionAnser.LessionCode });
-                            addLessionInfoList.Add(new CommonQuesionInfo() { QuestionName = _userInfo.IsEn_Us ? "Lesion Type" : "病灶类型", QuestionValue = firstLessionAnser.LessionType, TranslateDicName = "LesionType" });
+                            var firstLessionAnser = lession.LessionAnswerList.FirstOrDefault() ?? new CommonLessionQuestionAnswerInfo();
 
+                            var addLessionInfoList = new List<CommonQuesionInfo>();
+
+                            if (criterion.CriterionType == CriterionType.RECIST1Point1 || criterion.CriterionType == CriterionType.RECIST1Pointt1_MB
+                           || criterion.CriterionType == CriterionType.IRECIST1Point1 || criterion.CriterionType == CriterionType.Lugano2014 || criterion.CriterionType == CriterionType.Lugano2014WithoutPET)
+                            {
+                                //病灶编号 和病灶类型没有配置，但是需要有的
+                                addLessionInfoList.Add(new CommonQuesionInfo() { QuestionName = _userInfo.IsEn_Us ? "Lesion ID" : "病灶编号", QuestionValue = firstLessionAnser.LessionCode });
+                                addLessionInfoList.Add(new CommonQuesionInfo() { QuestionName = _userInfo.IsEn_Us ? "Lesion Type" : "病灶类型", QuestionValue = firstLessionAnser.LessionType, TranslateDicName = "LesionType" });
+
+                            }
+                            else if (criterion.CriterionType == CriterionType.PCWG3)
+                            {
+                                addLessionInfoList.Add(new CommonQuesionInfo() { QuestionName = _userInfo.IsEn_Us ? "Lesion Type" : "病灶类型", QuestionValue = firstLessionAnser.LessionType, TranslateDicName = "LesionType" });
+                            }
+
+
+                            var dynamicPartialLessionInfoList = lession.LessionAnswerList.Select(t => new CommonQuesionInfo() { QuestionName = t.QuestionName, QuestionValue = t.QuestionValue, TranslateDicName = t.TranslateDicName });
+
+
+                            //有三部分组成  外层问题+ 没有配置的编号和类型+ 动态的表格问题
+                            var dynamicLessionInfoList = addLessionInfoList.Union(dynamicPartialLessionInfoList).Union(item.QuestionAnswerList).ToList();
+
+                            var cloneItem = item.Clone();
+                            cloneItem.QuestionAnswerList = dynamicLessionInfoList;
+
+                            list.Add(cloneItem);
                         }
-                        else if (criterion.CriterionType == CriterionType.PCWG3)
-                        {
-                            addLessionInfoList.Add(new CommonQuesionInfo() { QuestionName = _userInfo.IsEn_Us ? "Lesion Type" : "病灶类型", QuestionValue = firstLessionAnser.LessionType, TranslateDicName = "LesionType" });
-                        }
-
-
-                        var dynamicPartialLessionInfoList = lession.LessionAnswerList.Select(t => new CommonQuesionInfo() { QuestionName = t.QuestionName, QuestionValue = t.QuestionValue, TranslateDicName = t.TranslateDicName });
-
-
-                        //有三部分组成  外层问题+ 没有配置的编号和类型+ 动态的表格问题
-                        var dynamicLessionInfoList = addLessionInfoList.Union(dynamicPartialLessionInfoList).Union(item.QuestionAnswerList).ToList();
-
-                        var cloneItem = item.Clone();
-                        cloneItem.QuestionAnswerList = dynamicLessionInfoList;
-
-                        list.Add(cloneItem);
                     }
+                    else
+                    {
+                        //要把裁判任务加进去
+
+                        list.Add(item);
+                    }
+
+
 
 
                 }
@@ -2110,32 +2127,31 @@ namespace IRaCIS.Core.Application.Service.Common
 
             var translateDicNameList = list.SelectMany(t => t.QuestionAnswerList).Where(t => t.TranslateDicName.IsNotNullOrEmpty()).Select(t => t.TranslateDicName).Distinct().ToList();
 
+
             //针对1.1 整体肿瘤评估 有的两列要合并一列
             if (criterion.CriterionType == CriterionType.RECIST1Point1 || criterion.CriterionType == CriterionType.RECIST1Pointt1_MB || criterion.CriterionType == CriterionType.IRECIST1Point1)
             {
                 foreach (var item in list)
                 {
                     //处理合并表头
-                    if (list.IndexOf(item) == 0)
+
+                    var questionType = item.IsBaseline == true ? QuestionType.ExistDisease : QuestionType.Tumor;
+
+                    var findItem = item.QuestionAnswerList.Where(t => t.QuestionType == questionType).FirstOrDefault();
+
+                    if (findItem != null)
                     {
-                        var questionType = item.IsBaseline == true ? QuestionType.ExistDisease : QuestionType.Tumor;
-
-                        var findItem = item.QuestionAnswerList.Where(t => t.QuestionType == questionType).FirstOrDefault();
-
-                        if (findItem != null)
-                        {
-                            findItem.QuestionName = _userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估";
-                        }
-
+                        findItem.QuestionName = _userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估";
                     }
 
+
                     if (item.IsBaseline == true)
                     {
                         item.QuestionAnswerList = item.QuestionAnswerList.Where(t => t.QuestionType != QuestionType.Tumor).ToList();
                     }
                     else
                     {
-                        item.QuestionAnswerList = item.QuestionAnswerList = item.QuestionAnswerList.Where(t => t.QuestionType != QuestionType.ExistDisease).ToList();
+                        item.QuestionAnswerList = item.QuestionAnswerList.Where(t => t.QuestionType != QuestionType.ExistDisease).ToList();
                     }
                 }
             }
@@ -2145,16 +2161,14 @@ namespace IRaCIS.Core.Application.Service.Common
                 foreach (var item in list)
                 {
                     //处理合并表头
-                    if (list.IndexOf(item) == 0)
+
+                    var questionType = item.IsBaseline == true ? QuestionType.ExistDisease : QuestionType.ImgOncology;
+
+                    var findItem = item.QuestionAnswerList.Where(t => t.QuestionType == questionType).FirstOrDefault();
+
+                    if (findItem != null)
                     {
-                        var questionType = item.IsBaseline == true ? QuestionType.ExistDisease : QuestionType.ImgOncology;
-
-                        var findItem = item.QuestionAnswerList.Where(t => t.QuestionType == questionType).FirstOrDefault();
-
-                        if (findItem != null)
-                        {
-                            findItem.QuestionName = _userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估";
-                        }
+                        findItem.QuestionName = _userInfo.IsEn_Us ? "Overall Response" : "整体肿瘤评估";
                     }
 
                     if (item.IsBaseline == true)
@@ -2163,7 +2177,7 @@ namespace IRaCIS.Core.Application.Service.Common
                     }
                     else
                     {
-                        item.QuestionAnswerList = item.QuestionAnswerList = item.QuestionAnswerList.Where(t => t.QuestionType != QuestionType.ExistDisease).ToList();
+                        item.QuestionAnswerList = item.QuestionAnswerList.Where(t => t.QuestionType != QuestionType.ExistDisease).ToList();
                     }
                 }
             }
@@ -2172,6 +2186,8 @@ namespace IRaCIS.Core.Application.Service.Common
 
             }
 
+            var columNameList = list.SelectMany(t => t.QuestionAnswerList).Where(t => t.QuestionName.IsNotNullOrEmpty()).Select(t => t.QuestionName).Distinct().ToList();
+
             #endregion
 
 
@@ -2186,9 +2202,10 @@ namespace IRaCIS.Core.Application.Service.Common
                 TempalteLastColumnIndex = 8,
                 DynamicItemDicName = "TranslateDicName",
                 DynamicItemValueName = "QuestionValue",
+                DynamicItemTitleName = "QuestionName",
                 DynamicListName = "QuestionAnswerList",
                 RemoveColunmIndexList = new List<int>() { },
-                ColumnNameList = list.FirstOrDefault()?.QuestionAnswerList.Select(t => t.QuestionName).ToList() ?? new List<string>(),
+                ColumnNameList = columNameList ?? new List<string>(),
                 TranslateDicNameList = translateDicNameList ?? new List<string>()
             };
 
@@ -2240,10 +2257,10 @@ namespace IRaCIS.Core.Application.Service.Common
                 //2、完成阅片的病例数Q：R1,R2均完成阅片的访视数；
 
                 exportInfo.VisitCount = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingCategory == ReadingCategory.Visit && t.ReadingTaskState == ReadingTaskState.HaveSigned)
-                    .GroupBy(t => new { t.SubjectId, t.DoctorUserId, t.SourceSubjectVisitId })
+                    .GroupBy(t => new { t.SubjectId, t.SourceSubjectVisitId })
                     .Where(g => g.Count() == 2).Select(g => g.Key.SourceSubjectVisitId).Distinct().Count();
 
-                exportInfo.JudgeVisitCount = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingCategory == ReadingCategory.Judge && t.ReadingTaskState == ReadingTaskState.HaveSigned).Count();
+                exportInfo.JudgeVisitCount = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingCategory == ReadingCategory.Judge ).Count();
 
                 //3、裁判认同数M：触发裁判的受试者访视中，阅片人被裁判认同的访视数量；
                 //4、总裁判数N：阅片人所阅的受试者访视中，触发裁判的访视数量；
@@ -2262,7 +2279,7 @@ namespace IRaCIS.Core.Application.Service.Common
                         JudgeAgreeCount = g.Where(t => t.JudgeVisitTaskId != null && t.JudgeVisitTask.JudgeResultTaskId == t.Id).Count(),
 
 
-                    });
+                    }).ToList();
 
                 exportInfo.List = ExportExcelConverterDate.ConvertToClientTimeInObject(doctorList, _userInfo.TimeZoneId);
 
@@ -2312,11 +2329,11 @@ namespace IRaCIS.Core.Application.Service.Common
                 //2、总样本量Q：R1,R2均完成阅片的阅片期数量；
 
                 exportInfo.ReadingPeriodCount = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingCategory == ReadingCategory.Global && t.ReadingTaskState == ReadingTaskState.HaveSigned)
-                    .GroupBy(t => new { t.SubjectId, t.DoctorUserId, t.SouceReadModuleId })
+                    .GroupBy(t => new { t.SubjectId,  t.SouceReadModuleId })
                     .Where(g => g.Count() == 2).Select(g => g.Key.SouceReadModuleId).Distinct().Count();
 
                 exportInfo.judgeReadingPeriodCount = _visitTaskRepository.Where(comonTaskFilter).Where(t => t.ReadingCategory == ReadingCategory.Global && t.ReadingTaskState == ReadingTaskState.HaveSigned)
-                   .GroupBy(t => new { t.SubjectId, t.DoctorUserId, t.SouceReadModuleId })
+                   .GroupBy(t => new { t.SubjectId,  t.SouceReadModuleId })
                    .Where(g => g.Count() == 2 && g.Any(c => c.JudgeVisitTaskId != null)).Select(g => g.Key.SouceReadModuleId).Distinct().Count();
 
                 //3、裁判认同数J：触发裁判的阅片期中，阅片人被裁判认同的阅片期数量；

IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs

@@ -185,6 +185,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         public int SignViewMinimumMinutes { get; set; }
 
+        public DocUserSignType DocUserSignType { get; set; }
+
     }
 
     public class AddOrEditSystemDocument : SystemDocumentAddOrEdit

IRaCIS.Core.Application/Service/Document/SystemDocumentService.cs

@@ -149,7 +149,7 @@ namespace IRaCIS.Core.Application.Services
             var query = from sysDoc in _systemDocumentRepository.Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId))
                     .WhereIf(!string.IsNullOrEmpty(inQuery.Name), t => t.Name.Contains(inQuery.Name))
                     //外部人员 只签署 文档类型枚举值有值的
-                    .WhereIf(isInternal == false, t => t.FileType.Code.Length == 0)
+                    .WhereIf(isInternal == false, t => t.DocUserSignType == DocUserSignType.InnerAndOuter)
                     .WhereIf(inQuery.FileTypeId != null, t => t.FileTypeId == inQuery.FileTypeId)
                         join confirm in _systemDocConfirmedUserRepository.Where() on new { ConfirmUserId = _userInfo.Id, SystemDocumentId = sysDoc.Id } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc
                         from confirm in cc.DefaultIfEmpty()

IRaCIS.Core.Application/Service/Document/TrialDocumentService.cs

@@ -513,7 +513,7 @@ namespace IRaCIS.Core.Application.Services
             return ResponseOutput.Ok(result);
         }
 
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "BeforeOngoingCantOpt", "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.PM)]
         public async Task<IResponseOutput> AddOrUpdateTrialDocument(AddOrEditTrialDocument addOrEditTrialDocument)
         {
@@ -585,7 +585,7 @@ namespace IRaCIS.Core.Application.Services
         /// <returns></returns>
         [HttpDelete("{trialId:guid}/{trialDocumentId:guid}")]
         //[Authorize(Policy = IRaCISPolicy.PM)]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "BeforeOngoingCantOpt", "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> DeleteTrialDocument(Guid trialDocumentId, Guid trialId)
         {
             if (await _trialDocumentRepository.AsQueryable(true).Where(t => t.Id == trialDocumentId).AnyAsync(t => t.TrialDocConfirmedUserList.Any()))
@@ -671,7 +671,7 @@ namespace IRaCIS.Core.Application.Services
         /// 用户 签名某个文档   可能是系统的，也可能是项目的
         /// </summary>
         /// <returns></returns>
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "BeforeOngoingCantOpt", "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> UserConfirm(UserConfirmCommand userConfirmCommand)
         {
 
@@ -738,7 +738,7 @@ namespace IRaCIS.Core.Application.Services
         /// <param name="isSystemDoc"></param>
         /// <returns></returns>
         [HttpPut("{documentId:guid}/{isSystemDoc:bool}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt", "SignSystemDocNoTrialId" })]
+        [TrialGlobalLimit( "BeforeOngoingCantOpt", "AfterStopCannNotOpt", "SignSystemDocNoTrialId" )]
         public async Task<IResponseOutput> UserAbandonDoc(Guid documentId, bool isSystemDoc)
         {
             if (isSystemDoc)

IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs

@@ -1335,7 +1335,7 @@ namespace IRaCIS.Core.Application.Service
         }
 
 
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> AddOrUpdateTrialEmailNoticeConfig(TrialEmailNoticeConfigAddOrEdit addOrEditTrialEmailNoticeConfig)
         {
             await TestEmailConfigAsync(addOrEditTrialEmailNoticeConfig);
@@ -1522,7 +1522,7 @@ namespace IRaCIS.Core.Application.Service
 
         }
 
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         [HttpDelete("{trialEmailNoticeConfigId:guid}")]
         public async Task<IResponseOutput> DeleteTrialEmailNoticeConfig(Guid trialEmailNoticeConfigId)
         {

IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs

@@ -257,7 +257,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         }
 
 
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         public async Task<IResponseOutput> PreArchiveDicomStudy(PriArchiveTaskStudyCommand preArchiveStudyCommand)
         {
@@ -356,7 +356,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         }
 
 
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> AddOrUpdateArchiveTaskStudy(TaskArchiveStudyCommand incommand)
         {
             #region 获取该subject 已生成任务的访视的检查

IRaCIS.Core.Application/Service/ImageAndDoc/NoneDicomStudyService.cs

@@ -58,7 +58,7 @@ namespace IRaCIS.Core.Application.Contracts
 
 
         [UnitOfWork]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput<NoneDicomStudyAddReturnDto>> AddOrUpdateNoneDicomStudy(NoneDicomStudyAddOrEdit addOrEditNoneDicomStudy)
         {
 
@@ -105,7 +105,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         }
 
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         [HttpDelete("{trialId:guid}/{subjectVisitId:guid}/{noneDicomStudyId:guid}")]
         public async Task<IResponseOutput> DeleteNoneDicomStudy(Guid noneDicomStudyId, Guid subjectVisitId)
         {
@@ -128,7 +128,7 @@ namespace IRaCIS.Core.Application.Contracts
 
 
         [HttpDelete("{trialId:guid}/{subjectVisitId:guid}/{noneDicomStudyFileId:guid}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> DeleteNoneDicomStudyFile(Guid noneDicomStudyFileId, Guid subjectVisitId)
         {
             //提交了 但是IQC同意的时候 是可以删除的 | 普通提交后也不能删除

IRaCIS.Core.Application/Service/ImageAndDoc/StudyService.cs

@@ -65,7 +65,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         }
 
 
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         public async Task<IResponseOutput> PreArchiveDicomStudy(PreArchiveDicomStudyCommand preArchiveStudyCommand)
         {
@@ -122,7 +122,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
 
 
 
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> AddOrUpdateArchiveStudy(NewArchiveStudyCommand incommand)
         {
 

IRaCIS.Core.Application/Service/Management/DTO/UserModel.cs

@@ -165,6 +165,8 @@ namespace IRaCIS.Application.Contracts
         public string PositionName { get; set; } = String.Empty;
 
         public bool IsTestUser { get; set; }
+
+        public DateTime? LastLoginTime { get; set; }
     }
 
     /// <summary>
@@ -225,6 +227,10 @@ namespace IRaCIS.Application.Contracts
         public DateTime? EndCreateTime { get; set; }
 
         public string? EMail { get; set; }
+
+        public DateTime? BeginLastLoginTime { get; set; }
+
+        public DateTime? EndLastLoginTime { get; set; }
     }
 
     public class UserRoleInfoDTO

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

@@ -461,6 +461,8 @@ namespace IRaCIS.Core.Application.Service
                   .WhereIf(!string.IsNullOrWhiteSpace(inQuery.EMail), t => t.EMail.Contains(inQuery.EMail))
                   .WhereIf(inQuery.BeginCreateTime != null, t => t.CreateTime >= inQuery.BeginCreateTime)
                   .WhereIf(inQuery.EndCreateTime != null, t => t.CreateTime <= inQuery.EndCreateTime)
+                  .WhereIf(inQuery.BeginLastLoginTime != null, t => t.LastLoginTime >= inQuery.BeginLastLoginTime)
+                  .WhereIf(inQuery.EndLastLoginTime != null, t => t.LastLoginTime <= inQuery.EndLastLoginTime)
                   .WhereIf(inQuery.UserType != null, t => t.UserTypeId == inQuery.UserType)
                   .WhereIf(inQuery.UserState != null, t => t.Status == inQuery.UserState)
                   .WhereIf(inQuery.IsTestUser != null, t => t.IsTestUser == inQuery.IsTestUser)

IRaCIS.Core.Application/Service/MinimalApiService/TestMinimalApiService.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Authorization;
+using IRaCIS.Core.Application.BusinessFilter;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Mvc;
 using System;
@@ -24,7 +25,7 @@ namespace IRaCIS.Core.Application.Service.MinimalApiService
     {
 
 
-
+        [TrialGlobalLimit("AddOrUpdateTrial", "BeforeOngoingCantOpt", "AfterStopCannNotOpt")]
         public Task<List<string>> GetProjectList1Async()
         {
             var list = new List<string>()
@@ -37,6 +38,7 @@ namespace IRaCIS.Core.Application.Service.MinimalApiService
         }
 
         [AllowAnonymous]
+        [TrialGlobalLimit( "BeforeOngoingCantOpt")]
         public IResponseOutput GetTest()
         {
 

IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs

@@ -292,6 +292,7 @@ namespace IRaCIS.Core.Application.Contracts
         public string LatestReplyUserName { get; set; } = String.Empty;
 
         public string Content { get; set; } = string.Empty;
+        public string ContentReplaced => Content.Replace("<br>","").Replace("<br/>", "").Replace("<div style='margin-left:20px'>", "").Replace("</div>","");
 
         [DictionaryTranslateAttribute("ChallengeIsClosed")]
         public bool IsClosed { get; set; }
@@ -350,6 +351,8 @@ namespace IRaCIS.Core.Application.Contracts
         public string UserName { get; set; }
 
         public string Content { get; set; }
+
+        public string ContentReplaced => Content.Replace("<br>", "").Replace("<br>", "").Replace("<br/>", "").Replace("<div style='text-indent: 20px;'>", "").Replace("</div>", "");
     }
 
 
@@ -724,9 +727,10 @@ namespace IRaCIS.Core.Application.Contracts
 
         public string CheckResult { get; set; } = String.Empty;
 
+        //public string CheckResultReplaced => CheckResult.Replace("<br>", "").Replace("<div style='text-indent: 20px;'>", "").Replace("</div>", "");
 
         public List<DialogInfo> CheckDialogList { get; set; }
-        public string CheckDialogStr => string.Join("\n\n", CheckDialogList.OrderBy(t => t.CreateTime).Select(c => c.UserName + " (" + ExportExcelConverterDate.DateTimeInternationalToString(c.CreateTime) + ") :" + c.Content));
+        public string CheckDialogStr => string.Join("\n\n", CheckDialogList.OrderBy(t => t.CreateTime).Select(c => c.UserName + " (" + ExportExcelConverterDate.DateTimeInternationalToString(c.CreateTime) + ") :" + c.ContentReplaced));
 
         public DateTime? CheckBackTime { get; set; }
 

IRaCIS.Core.Application/Service/QC/QCOperationService.cs

@@ -43,7 +43,7 @@ namespace IRaCIS.Core.Application.Image.QA
         #region QC质疑 以及回复 关闭
 
         [HttpGet("{trialId:guid}/{subjectVisitId:guid}/{currentQCType:int}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.IQC)]
         public async Task<IResponseOutput> VerifyQCCanAddChallenge(Guid subjectVisitId, [FromRoute] CurrentQC currentQCType)
         {
@@ -67,7 +67,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <param name="currentQCType"></param>
         /// <returns></returns>
         [HttpPost("{trialId:guid}/{trialQCProcess:int}/{currentQCType:int}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.IQC)]
         public async Task<IResponseOutput> AddOrUpdateQCChallenge(QCChallengeCommand qaQuestionCommand, Guid trialId, [FromRoute] TrialQCProcess trialQCProcess, [FromRoute] CurrentQC currentQCType)
         {
@@ -126,7 +126,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// </summary>
         /// <returns></returns>
         [HttpPut]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         [UnitOfWork]
         //[Authorize(Policy = IRaCISPolicy.IQC)]
         public async Task<IResponseOutput> CloseQCChallenge(CloseQCChallengeInDto input)
@@ -181,7 +181,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// </summary>
         /// <returns></returns>
         [HttpDelete("{trialId:guid}/{subjectVisitId:guid}/{qcChallengeId:guid}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.IQC)]
         public async Task<IResponseOutput> DeleteQCChallenge(Guid qcChallengeId)
         {
@@ -209,7 +209,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <param name="qaDialogCommand"></param>
         /// <returns></returns>
         [HttpPost("{trialId:guid}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         // [Authorize(Policy = IRaCISPolicy.CRC_IQC)]
         public async Task<IResponseOutput> AddQCChallengeReply(QADialogCommand qaDialogCommand)
         {
@@ -244,7 +244,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <param name="checkDialogCommand"></param>
         /// <returns></returns>
         [HttpPost("{trialId:guid}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.PM_APM_CRC)]
         public async Task<IResponseOutput> AddCheckChallengeReply(CheckChallengeDialogCommand checkDialogCommand)
         {
@@ -284,7 +284,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// </summary>
         /// <returns></returns>
         [HttpPut("{trialId:guid}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
         public async Task<IResponseOutput> CloseCheckChallenge(CloseCheckChallengeDto input)
         {
@@ -320,7 +320,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// </summary>
         /// <returns></returns>
         [HttpPut("{trialId:guid}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
         [UnitOfWork]
         public async Task<IResponseOutput> SetCheckPass(SetCheckPassDt data)
@@ -367,7 +367,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <param name="subjectVisitId"></param>
         /// <returns></returns>
         [HttpPut("{trialId:guid}/{subjectVisitId:guid}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.CRC)]
         public async Task<IResponseOutput> CRCRequstCheckBack(Guid subjectVisitId)
         {
@@ -413,7 +413,7 @@ namespace IRaCIS.Core.Application.Image.QA
 
         [HttpPut("{trialId:guid}/{subjectVisitId:guid}")]
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> RejectCheckBack(Guid subjectVisitId)
         {
             //if (_userInfo.UserTypeEnumInt != (int)UserTypeEnum.ProjectManager && _userInfo.UserTypeEnumInt != (int)UserTypeEnum.APM)
@@ -446,7 +446,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// </summary>
         /// <returns></returns>
         [HttpPut("{trialId:guid}/{subjectVisitId:guid}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
         [UnitOfWork]
         public async Task<IResponseOutput> CheckBack(Guid subjectVisitId)
@@ -525,7 +525,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// 添加或者更新 QC核对问题列表   两个人不能同时操作，就算意外进去了，提交数据，也不会覆盖前一个人数据， 后台已经做好判断
         /// </summary>
         [HttpPost("{trialId:guid}/{subjectVisitId:guid}/{trialQCProcess:int}/{currentQCType:int}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.IQC)]
         public async Task<IResponseOutput> AddOrUpdateQCQuestionAnswerList(QCQuestionAnswerCommand[] qcQuestionAnswerCommands, Guid trialId, Guid subjectVisitId, [FromRoute] TrialQCProcess trialQCProcess, [FromRoute] CurrentQC currentQCType)
         {
@@ -597,7 +597,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <param name="state"></param>
         /// <returns></returns>
         [HttpPut("{trialId:guid}/{subjectVisitId:guid}/{studyId:guid}/{seriesId:guid}/{state:int}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.IQC)]
         public async Task<IResponseOutput> SetSeriesState(Guid subjectVisitId, Guid studyId, Guid seriesId, int state)
         {
@@ -664,7 +664,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// </summary>
         /// <returns></returns>
         [HttpPost("{trialId:guid}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         // [Authorize(Policy = IRaCISPolicy.CRC_IQC)]
         public async Task<IResponseOutput> UpdateModality(UpdateModalityCommand updateModalityCommand)
         {
@@ -744,7 +744,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <param name="trialId"></param>
         /// <returns></returns>SeriesCount
         [HttpPost, Route("{trialId:guid}/{subjectVisitId:guid}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         [UnitOfWork]
         // [Authorize(Policy = IRaCISPolicy.CRC_IQC)]
         public async Task<IResponseOutput> DeleteStudyList(Guid[] ids, Guid subjectVisitId, Guid trialId)
@@ -848,7 +848,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <summary>替换当前领取人 </summary>
         [HttpPut("{trialId:guid}/{subjectVisitId:guid}")]
         //[Authorize(Policy = IRaCISPolicy.IQC)]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> ReplaceQCTaskActionUser(Guid trialId, Guid subjectVisitId)
         {
             var dbSubjectVisit = (await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == subjectVisitId)).IfNullThrowException();
@@ -994,7 +994,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <param name="obtaionOrCancel">true 获取  false是取消领取</param>
         /// <returns></returns>
         [HttpPut("{trialId:guid}/{subjectVisitId:guid}/{obtaionOrCancel:bool}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.IQC)]
         public async Task<IResponseOutput> ObtainOrCancelQCTask(Guid trialId, Guid subjectVisitId, bool obtaionOrCancel)
         {
@@ -1219,7 +1219,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.CRC)]
         public async Task<IResponseOutput> CRCRequestToQC(CRCRequestToQCCommand cRCRequestToQCCommand)
         {
@@ -1507,7 +1507,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <param name="auditState"></param>
         /// <returns></returns>
         [HttpPost("{trialId:guid}/{subjectVisitId:guid}/{auditState:int}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.IQC)]
         [UnitOfWork]
         public async Task<IResponseOutput> QCPassedOrFailed(Guid trialId, Guid subjectVisitId, [FromRoute] AuditStateEnum auditState)
@@ -1741,7 +1741,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <param name="setOrCancel"></param>
         /// <returns></returns>
         [HttpPut("{trialId:guid}/{subjectVisitId:guid}/{setOrCancel:bool}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.IQC)]
         public async Task<IResponseOutput> SetVisitUrgent(Guid trialId, Guid subjectVisitId, bool setOrCancel)
         {
@@ -1779,7 +1779,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <param name="qcChallengeId"></param>
         /// <returns></returns>
         [HttpPut("{trialId:guid}/{subjectVisitId:guid}/{qcChallengeId:guid}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.IQC)]
         public async Task<IResponseOutput> SetNeedReupload(Guid trialId, Guid qcChallengeId)
         {
@@ -1880,7 +1880,7 @@ namespace IRaCIS.Core.Application.Image.QA
 
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.CRC)]
         public async Task<IResponseOutput> SetReuploadFinished(CRCReuploadFinishedCommand cRCReuploadFinishedCommand)
         {
@@ -1993,7 +1993,7 @@ namespace IRaCIS.Core.Application.Image.QA
 
 
         [HttpPut("{trialId:guid}/{subjectVisitId:guid}/{qcChallengeId:guid}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.CRC)]
         public async Task<IResponseOutput> CRCRequestReUpload(Guid qcChallengeId)
         {
@@ -2040,7 +2040,7 @@ namespace IRaCIS.Core.Application.Image.QA
         /// <returns></returns>
 
         [HttpPut("{trialId:guid}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> UpdateSubjectAndSVInfo(UploadSubjectAndVisitCommand command)
         {
             var dbSubjectVisit = (await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == command.SubjectVisitId)).IfNullThrowException();
@@ -2080,7 +2080,7 @@ namespace IRaCIS.Core.Application.Image.QA
         #region 转发影像  暂时不用 废弃
         //[HttpPost("{trialId:guid}")]
         ////[Authorize(Policy = IRaCISPolicy.PM_APM)]
-        //[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        //[TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //public async Task<IResponseOutput> ForwardSVDicomImage(Guid[] subjectVisitIdList)
         //{
 

IRaCIS.Core.Application/Service/QC/TrialQCQuestionService.cs

@@ -173,7 +173,7 @@ namespace IRaCIS.Core.Application.Contracts
         /// <returns></returns>
         [HttpPost("{trialId:guid}")]
         //[Authorize(Policy = IRaCISPolicy.IQC)]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> BatchAddTrialQCQuestionConfigure(List<TrialQCQuestionConfigureBatchAdd> batchList, Guid trialId)
         {
 
@@ -280,7 +280,7 @@ namespace IRaCIS.Core.Application.Contracts
         }
 
         //[Authorize(Policy = IRaCISPolicy.IQC)]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> AddOrUpdateTrialQCQuestionConfigure(TrialQCQuestionAddOrEdit addOrEditTrialQCQuestionConfigure)
         {
 
@@ -323,7 +323,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         [HttpDelete("{trialId:guid}/{trialQCQuestionConfigureId:guid}")]
         //[Authorize(Policy = IRaCISPolicy.IQC)]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> DeleteTrialQCQuestionConfigure(Guid trialQCQuestionConfigureId, Guid trialId)
         {
             await VerifyIsQCConfirmedAsync(trialId);

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

@@ -248,7 +248,7 @@ namespace IRaCIS.Core.Application.Service
                 {
                     QuestionType = c.ReadingQuestionTrial.QuestionType,
                     QuestionName = isEn_Us ? c.ReadingQuestionTrial.QuestionEnName : c.ReadingQuestionTrial.QuestionName,
-                    QuestionValue = c.Answer,
+                    QuestionValue =  c.IsGlobalChange?c.GlobalChangeAnswer: c.Answer,
                     TranslateDicName = c.ReadingQuestionTrial.DictionaryCode
                 })))
                ;

IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicalReviewService.cs

@@ -367,7 +367,7 @@ namespace IRaCIS.Core.Application.Service
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> SaveMedicineQuestion(SaveMedicineQuestionInDto inDto)
         {
             var medicalReviewInfo = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
@@ -411,7 +411,7 @@ namespace IRaCIS.Core.Application.Service
         /// </summary>
         /// <param name="inDto"></param>
         /// <returns></returns>
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> SaveMedicalReviewInfo(SaveMedicalReviewInfoInDto inDto)
         {
             var medicalReviewInfo = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
@@ -466,7 +466,7 @@ namespace IRaCIS.Core.Application.Service
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> ClosedMedicalReviewDialog(ClosedMedicalReviewDialogInDto inDto)
         {
             await _taskMedicalReviewRepository.UpdatePartialFromQueryAsync(inDto.TaskMedicalReviewId, x => new TaskMedicalReview()
@@ -499,7 +499,7 @@ namespace IRaCIS.Core.Application.Service
         /// </summary>
         /// <param name="inDto"></param>
         /// <returns></returns>
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> SendMedicalReviewDialog(SendMedicalReviewDialogInDto inDto)
         {
             var medicalReviewInfo = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
@@ -539,7 +539,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inDto"></param>
         /// <returns></returns>
         [UnitOfWork]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> IRSendMedicalReviewDialog(IRSendMedicalReviewDialogInDto inDto)
         {
             var medicalReviewInfo = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();
@@ -699,7 +699,7 @@ namespace IRaCIS.Core.Application.Service
         /// <returns></returns>
         [HttpPost]
         [UnitOfWork]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> IRConfirmMedicalReview(IRConfirmMedicalReviewInDto inDto)
         {
             var medicalReviewInfo = await _taskMedicalReviewRepository.Where(x => x.Id == inDto.TaskMedicalReviewId).FirstNotNullAsync();

IRaCIS.Core.Application/Service/Reading/MedicalAudit/ReadingMedicineQuestionService.cs

@@ -269,7 +269,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> DeleteReadingMedicineTrialQuestion(DeleteReadingMedicineTrialQuestion inDto)
         {
             if (await _readingMedicineTrialQuestionRepository.AnyAsync(x => x.ParentId == inDto.Id))

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs

@@ -54,7 +54,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> BatchSubmitGlobalReadingInfo(BatchSubmitGlobalReadingInfo inDto)
         {
             await VerifyTaskIsSign(inDto.GlobalTaskId);
@@ -107,7 +107,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> SaveGlobalReadingInfo(SaveGlobalReadingInfoInDto inDto)
         {
             await VerifyTaskIsSign(inDto.GlobalTaskId);

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -329,7 +329,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task ChangeCalculationAnswer(ChangeCalculationAnswerInDto inDto)
         {
             var visitTask = await _visitTaskRepository.Where(x => x.Id == inDto.VisitTaskId).FirstNotNullAsync();
@@ -405,7 +405,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task ReadClinicalData(ReadClinicalDataInDto inDto)
         {
             await _visitTaskRepository.UpdatePartialFromQueryAsync(inDto.VisitTaskId, x => new VisitTask
@@ -1493,7 +1493,7 @@ namespace IRaCIS.Core.Application.Service
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task SplitLesion(SplitLesionInDto inDto)
         {
             await VerifyTaskIsSign(inDto.VisitTaskId);
@@ -1731,7 +1731,7 @@ namespace IRaCIS.Core.Application.Service
         /// <returns></returns>
         [HttpPost]
 
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> SaveImageQuality(ChangeDicomReadingQuestionAnswerInDto inDto)
         {
             inDto.UpdateMark = true;
@@ -1790,7 +1790,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> ChangeDicomReadingQuestionAnswer(ChangeDicomReadingQuestionAnswerInDto inDto)
         {
             await VerifyTaskIsSign(inDto.VisitTaskId);
@@ -1907,7 +1907,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> DeleteReadingRowAnswer(DeleteReadingRowAnswerInDto inDto)
         {
             await VerifyTaskIsSign(inDto.VisitTaskId);
@@ -2094,7 +2094,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<SubmitTableQuestionOutDto> SubmitTableQuestion(SubmitTableQuestionInDto inDto)
         {
             SubmitTableQuestionOutDto result = new SubmitTableQuestionOutDto();
@@ -2493,7 +2493,7 @@ namespace IRaCIS.Core.Application.Service
         /// </summary>
         /// <param name="inDto"></param>
         /// <returns></returns>
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> SubmitDicomVisitTask(SubmitDicomVisitTaskInDto inDto)
         {
 
@@ -3394,7 +3394,7 @@ namespace IRaCIS.Core.Application.Service
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task AddReadingTask(Guid visitTaskId, Guid? trialId = null)
         {
             // ****** 先生成阅片期  阅片期任务阅片完成之后生成肿瘤学的  如果没有阅片期 直接生成肿瘤学 *********////

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs

@@ -63,7 +63,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> SetTrialCriterionJudgeQuestionAnswerGroup(SetTrialCriterionJudgeQuestionAnswerGroupInDto inDto)
         {
             await _readingQuestionTrialRepository.UpdatePartialFromQueryAsync(inDto.ReadingQuestionTrialId, x => new ReadingQuestionTrial()
@@ -424,7 +424,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> SaveJudgeVisitTaskResult(SaveJudgeVisitTaskResult inDto)
         {
             await VerifyTaskIsSign(inDto.VisitTaskId);
@@ -447,7 +447,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> SubmitJudgeVisitTaskResult(SaveJudgeVisitTaskResult inDto)
         {
             await VerifyTaskIsSign(inDto.VisitTaskId);

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingNoDicomTaskService.cs

@@ -37,7 +37,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> SaveVisitTaskQuestions(SubmitVisitTaskQuestionsInDto inDto)
         {
             await VerifyTaskIsSign(inDto.VisitTaskId);

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingOncologyTaskService.cs

@@ -319,7 +319,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> SetOncologyReadingInfo(SetOncologyReadingInfoInDto inDto)
         {
             await VerifyTaskIsSign(inDto.OncologyTaskId);

IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadModuleService.cs

@@ -896,7 +896,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="dto"></param>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> AddReadModule(ReadModuleAddDto dto)
         {
 
@@ -1053,7 +1053,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="readModuleId"></param>
         /// <returns></returns>
         [HttpDelete("{readModuleId:guid}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> DeleteReadModule(Guid readModuleId)
         {
 

IRaCIS.Core.Application/Service/Reading/ReadingPeriod/ReadingPeriodSetService.cs

@@ -37,7 +37,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="addOrEditReadingPeriodSet"></param>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> AddOrUpdateReadingPeriodSet(ReadingPeriodSetAddOrEdit addOrEditReadingPeriodSet)
         {
             if (await _readingPeriodSetRepository.AnyAsync(x => x.Id != addOrEditReadingPeriodSet.Id && x.IsTakeEffect != ReadingPeriodStatus.Revocation
@@ -101,7 +101,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="readingPeriodSetId"></param>
         /// <returns></returns>
         [HttpDelete("{readingPeriodSetId:guid}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> DeleteReadingPeriodSet(Guid readingPeriodSetId)
         {
             await _readingPeriodSetRepository.UpdatePartialFromQueryAsync(t => t.Id == readingPeriodSetId, x => new ReadingPeriodSet()
@@ -125,7 +125,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="indto"></param>
         /// <returns></returns>
         [HttpPut]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> SetReadingPeriodSetEffect(SetReadingPeriodSetEffect indto)
         {
             var readingPeriodSet = await _readingPeriodSetRepository.Where(x => x.Id == indto.Id).FirstNotNullAsync();
@@ -350,7 +350,7 @@ namespace IRaCIS.Core.Application.Service
         /// </summary>
         /// <param name="inDto"></param>
         /// <returns></returns>
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> GenerateReadingTask(ReadingToGenerateInDto inDto)
         {
             List<ReadingPeriodPlan> plans = new List<ReadingPeriodPlan>();

IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteEquipmentSurveyService.cs

@@ -30,7 +30,7 @@ namespace IRaCIS.Core.Application.Contracts
             return await trialSiteEquipmentSurveyQueryable.ToListAsync();
         }
 
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         [HttpPost("{trialId:guid}")]
         public async Task<IResponseOutput> AddOrUpdateTrialSiteEquipmentSurvey(TrialSiteEquipmentSurveyAddOrEdit addOrEditTrialSiteEquipmentSurvey)
         {
@@ -46,7 +46,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         }
 
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         [HttpDelete("{trialSiteEquipmentSurveyId:guid}/{trialId:guid}")]
         public async Task<IResponseOutput> DeleteTrialSiteEquipmentSurvey(Guid trialSiteEquipmentSurveyId)
         {

IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs

@@ -213,7 +213,7 @@ namespace IRaCIS.Core.Application.Contracts
         [HttpPost]
         [UnitOfWork]
         [AllowAnonymous]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> VerifySendCode(LoginDto userInfo, [FromServices] ITokenService _tokenService)
         {
 
@@ -447,7 +447,7 @@ namespace IRaCIS.Core.Application.Contracts
         /// </summary>
         /// <param name="addOrEditTrialSiteSurvey"></param>
         /// <returns></returns>
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> AddOrUpdateTrialSiteSurvey(TrialSiteSurveyAddOrEdit addOrEditTrialSiteSurvey)
         {
 
@@ -592,7 +592,7 @@ namespace IRaCIS.Core.Application.Contracts
         /// 驳回 New  
         /// </summary>
         /// <returns></returns>
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         public async Task<IResponseOutput> SubmissionRejection(TrialSiteSubmitBackCommand trialSiteSubmitBackCommand, [FromServices] IMailVerificationService _IMailVerificationService)
         {
@@ -666,7 +666,7 @@ namespace IRaCIS.Core.Application.Contracts
 
 
         [HttpPut("{trialId:guid}/{trialSiteSurveyId:guid}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         public async Task<IResponseOutput> AbandonSiteSurvey(Guid trialSiteSurveyId)
         {
@@ -694,7 +694,7 @@ namespace IRaCIS.Core.Application.Contracts
         /// <param name="siteSurvyeSubmit"></param>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         [UnitOfWork]
         public async Task<IResponseOutput> TrialSurveySubmit(TrialSiteSurvyeSubmitDTO siteSurvyeSubmit)
         {

IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteUserSurveyService.cs

@@ -33,7 +33,7 @@ namespace IRaCIS.Core.Application.Contracts
         }
 
 
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         [HttpPost("{trialId:guid}")]
         public async Task<IResponseOutput> AddOrUpdateTrialSiteUserSurvey(TrialSiteUserSurveyAddOrEdit addOrEditTrialSiteUserSurvey)
         {
@@ -126,7 +126,7 @@ namespace IRaCIS.Core.Application.Contracts
 
         }
 
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         [HttpDelete("{trialSiteUserSurveyId:guid}/{trialId:guid}")]
         public async Task<IResponseOutput> DeleteTrialSiteUserSurvey(Guid trialSiteUserSurveyId)
         {

IRaCIS.Core.Application/Service/Third-partyProject/UltrasonicDicomService.cs

@@ -191,7 +191,7 @@ namespace IRaCIS.Core.Application.Service.Third_partyProject
         /// <param name="_dicomInstanceRepository"></param>
         /// <returns></returns>
 
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> AddOrUpdateArchiveStudy(NewArchiveStudyCommand incommand,
            [FromServices] IRepository<StudyMonitor> _studyMonitorRepository,
            [FromServices] IDistributedLockProvider _distributedLockProvider,

IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs

@@ -1112,6 +1112,8 @@ namespace IRaCIS.Core.Application
             var isSPMOrCPM = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.SPM || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CPM;
             var isIR = _userInfo.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer;
 
+            var isInternal = _userInfo.IsZhiZhun;
+
             var needSignTrialCount = await _trialRepository.Where(t => t.TrialStatusStr != StaticData.TrialState.TrialStopped)
                 .Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
                .Where(c => c.TrialDocumentList.Where(t => t.IsDeleted == false && t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId)
@@ -1119,6 +1121,8 @@ namespace IRaCIS.Core.Application
 
             var needSignSysDocCont = await _systemDocumentRepository
                         .Where(t => t.IsDeleted == false && !t.SystemDocConfirmedUserList.Any(t => t.ConfirmUserId == _userInfo.Id && t.ConfirmTime != null))
+                    //外部人员 只签署 文档类型枚举值有值的
+                    .WhereIf(isInternal == false, t => t.DocUserSignType == DocUserSignType.InnerAndOuter)
                         .SelectMany(t => t.NeedConfirmedUserTypeList)
                         .CountAsync(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId);
 

IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs

@@ -319,7 +319,7 @@ namespace IRaCIS.Core.Application
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> SetGlobalReadingInfo(SetGlobalReadingInfoInDto inDto)
         {
 
@@ -404,7 +404,7 @@ namespace IRaCIS.Core.Application
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> SetOncologySet(SetOncologySetInDto inDto)
         {
 
@@ -511,7 +511,7 @@ namespace IRaCIS.Core.Application
         ///// 设置项目阅片标准
         ///// </summary>
         ///// <returns></returns>
-        //[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        //[TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //public async Task<IResponseOutput> SetTrialReadingCriterion(SetTrialReadingCriterionInDto inDto)
         //{
         //    if (inDto.IsSignSave)
@@ -548,7 +548,7 @@ namespace IRaCIS.Core.Application
         /// <param name="inDto"></param>
         /// <returns></returns>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> SetCriterionReadingInfo(SetCriterionReadingInfoInDto inDto)
         {
             ArbitrationRule arbitration = ArbitrationRule.NA;
@@ -898,7 +898,7 @@ namespace IRaCIS.Core.Application
         /// <returns></returns>
         [HttpPut]
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "BeforeOngoingCantOpt", "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> ConfigTrialBasicInfo(BasicTrialConfig trialConfig)
         {
             await VerifyOnlyInOngoingOrInitialIzingOptAsync(trialConfig.TrialId);
@@ -923,7 +923,7 @@ namespace IRaCIS.Core.Application
         /// <returns></returns>
         /// <exception cref="BusinessValidationFailedException"></exception>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "BeforeOngoingCantOpt", "AfterStopCannNotOpt" )]
         public async Task ConfigTrialProcessInfoVerification(ConfigTrialProcessInfoVerificationInDto trialConfig)
         {
             if (!await _trialRepository.Where(t => t.Id == trialConfig.TrialId).IgnoreQueryFilters().AnyAsync(t => t.TrialStatusStr == StaticData.TrialState.TrialInitializing))
@@ -950,7 +950,7 @@ namespace IRaCIS.Core.Application
         /// <returns></returns>
         [HttpPut]
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "BeforeOngoingCantOpt", "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> ConfigTrialProcessInfo(TrialProcessConfig trialConfig)
         {
             if (!await _trialRepository.Where(t => t.Id == trialConfig.TrialId).IgnoreQueryFilters().AnyAsync(t => t.TrialStatusStr == StaticData.TrialState.TrialInitializing))
@@ -1078,7 +1078,7 @@ namespace IRaCIS.Core.Application
         /// <returns></returns>
         [HttpPut]
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "BeforeOngoingCantOpt", "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> ConfigTrialUrgentInfo(TrialUrgentConfig trialConfig)
         {
 
@@ -1113,7 +1113,7 @@ namespace IRaCIS.Core.Application
         /// <param name="trialConfig"></param>
         /// <returns></returns>
         [HttpPut]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "BeforeOngoingCantOpt", "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> ConfigTrialPACSInfo(TrialPACSConfig trialConfig)
         {
             var trialInfo = (await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialConfig.TrialId)).IfNullThrowException();
@@ -1146,7 +1146,7 @@ namespace IRaCIS.Core.Application
         [HttpPut("{trialId:guid}/{trialStatusStr}/{reason?}")]
         [UnitOfWork]
         //[Authorize(Policy = IRaCISPolicy.PM)]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> UpdateTrialState(Guid trialId, string trialStatusStr, string? reason)
         {
 
@@ -1221,7 +1221,7 @@ namespace IRaCIS.Core.Application
         /// <returns></returns>
         [HttpPut("{trialId:guid}/{isAbandon:bool}")]
         //[Authorize(Policy = IRaCISPolicy.PM)]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "BeforeOngoingCantOpt", "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> AbandonTrial(Guid trialId, /*Guid? signId,*/ bool isAbandon)
         {
 
@@ -1260,8 +1260,8 @@ namespace IRaCIS.Core.Application
         /// <param name="trialConfig"></param>
         /// <returns></returns>
         [HttpPut]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })]
-        //[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "BeforeOngoingCantOpt", "AfterStopCannNotOpt" )]
+        //[TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> ConfigTrialTaskInfo(TrialTaskConfig trialConfig)
         {
             var trialInfo = (await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialConfig.TrialId)).IfNullThrowException();
@@ -1278,8 +1278,8 @@ namespace IRaCIS.Core.Application
         /// <param name="trialConfig"></param>
         /// <returns></returns>
         [HttpPut]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })]
-        //[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "BeforeOngoingCantOpt", "AfterStopCannNotOpt" )]
+        //[TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> ConfigTrialReadingTaskViewRule(TrialReadingTaskViewConfig trialConfig)
         {
             var trialInfo = (await _trialRepository.FirstOrDefaultAsync(t => t.Id == trialConfig.TrialId)).IfNullThrowException();

IRaCIS.Core.Application/Service/TrialSiteUser/TrialExternalUserService.cs

@@ -54,7 +54,7 @@ namespace IRaCIS.Core.Application.Service
         /// <returns></returns>
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
         [UnitOfWork]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> AddOrUpdateTrialExternalUser(TrialExternalUserAddAndSendEmail addOrEditTrialExternalUser)
         {
 
@@ -234,7 +234,7 @@ namespace IRaCIS.Core.Application.Service
         //New  省掉邀请流程
         [HttpPost]
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         [UnitOfWork]
         public async Task<IResponseOutput> SendExternalUserJoinEmail(TrialExternalUserSendEmail sendEmail)
         {

IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs

@@ -114,7 +114,7 @@ namespace IRaCIS.Core.Application.Service
         /// <returns></returns>
         //[TrialAudit(AuditType.TrialAudit, AuditOptType.AddTrialStaff)]
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
         public async Task<IResponseOutput> AddTrialUsers(TrialUserAddCommand[] userTrialCommands)
         {
@@ -136,7 +136,7 @@ namespace IRaCIS.Core.Application.Service
 
 
 
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
         [HttpPut]
         public async Task<IResponseOutput> UpdateTrialUser(UpdateTrialUserCommand updateTrialUserCommand)
@@ -174,7 +174,7 @@ namespace IRaCIS.Core.Application.Service
         /// <summary> 项目参与人员退出   其中IQC退出 回去释放工作量 </summary>
         //[TrialAudit(AuditType.TrialAudit, AuditOptType.DeleteTrailStaff)]
         [HttpDelete, Route("{id:guid}/{trialId:guid}/{isDelete:bool}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         [UnitOfWork]
         [Obsolete]
         public async Task<IResponseOutput> DeleteMaintenanceUser(Guid id, bool isDelete)

IRaCIS.Core.Application/Service/TrialSiteUser/TrialService.cs

@@ -630,7 +630,7 @@ namespace IRaCIS.Core.Application.Service
         /// <returns></returns>
         [HttpPost("{trialId:guid}/{status:int}")]
 
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> UpdateEnrollStatus(Guid trialId, EnrollStatus status)
         {
             await _enrollDetailRepository.AddAsync(new EnrollDetail()

IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs

@@ -111,7 +111,7 @@ namespace IRaCIS.Core.Application.Services
         [HttpPost]
         [UnitOfWork]
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> AddTrialSites(List<TrialSiteCommand> trialSites)
         {
             var addArray = _mapper.Map<List<TrialSite>>(trialSites);
@@ -205,7 +205,7 @@ namespace IRaCIS.Core.Application.Services
 
         /// <summary> 批量添加Site下  CRC的负责人 </summary>
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
         public async Task<IResponseOutput> AssignSiteCRC(List<AssginSiteCRCCommand> trialSiteCRCList)
         {
@@ -219,7 +219,7 @@ namespace IRaCIS.Core.Application.Services
 
         /// <summary> 删除CRC人员</summary>
         [HttpDelete, Route("{id:guid}/{trialId:guid}/{isDelete:bool}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
         public async Task<IResponseOutput> DeleteSiteCRC(Guid id, bool isDelete)
         {
@@ -280,7 +280,7 @@ namespace IRaCIS.Core.Application.Services
 
         /// <summary>删除  项目  下某一site </summary>
         [HttpDelete("{id:guid}/{trialId:guid}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         [Obsolete]
         public async Task<IResponseOutput> DeleteTrialSite(Guid id)
         {

IRaCIS.Core.Application/Service/Visit/PatientService.cs

@@ -377,7 +377,7 @@ namespace IRaCIS.Core.Application.Service
         /// <returns></returns>
         [HttpPost]
         [UnitOfWork]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> SubmitVisitStudyBinding(SubmitVisitStudyBindingCommand inCommand,
             [FromServices] IRepository<DicomStudy> _dicomstudyRepository,
             [FromServices] IRepository<DicomSeries> _dicomSeriesRepository,

IRaCIS.Core.Application/Service/Visit/SubjectService.cs

@@ -19,7 +19,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="subjectCommand">state:1-访视中，2-出组。0-全部</param>
         /// <returns></returns>
 
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.PM_APM_CRC_QC)]
         public async Task<IResponseOutput<string>> AddOrUpdateSubject([FromBody] SubjectCommand subjectCommand)
         {
@@ -64,7 +64,7 @@ namespace IRaCIS.Core.Application.Service
         [HttpPut]
         [UnitOfWork]
         //[Authorize(Policy = IRaCISPolicy.PM_APM_CRC_QC)]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> UpdateSubjectStatus(SubjectStatusChangeCommand subjectStatusChangeCommand)
         {
             await _subjectRepository.UpdateFromDTOAsync(subjectStatusChangeCommand, true);
@@ -73,7 +73,7 @@ namespace IRaCIS.Core.Application.Service
 
 
         [HttpDelete("{trialId:guid}/{id:guid}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         [UnitOfWork]
         //[Authorize(Policy = IRaCISPolicy.PM_APM_CRC)]
         public async Task<IResponseOutput> DeleteSubject(Guid id)

IRaCIS.Core.Application/Service/Visit/SubjectVisitService.cs

@@ -31,7 +31,7 @@ namespace IRaCIS.Core.Application.Services
 
 
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         [UnitOfWork]
         //[Authorize(Policy = IRaCISPolicy.CRC)]
         public async Task<IResponseOutput<string>> AddOrUpdateSV(SubjectVisitCommand svCommand)
@@ -161,7 +161,7 @@ namespace IRaCIS.Core.Application.Services
 
 
         [HttpPut("{trialId:guid}/{subjectVisitId:guid}/{isUrgent:bool}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.PM_IQC)]
         public async Task<IResponseOutput> SetSubjectVisitUrgent(Guid subjectVisitId, bool isUrgent)
         {
@@ -173,7 +173,7 @@ namespace IRaCIS.Core.Application.Services
 
 
         [HttpDelete, Route("{trialId:guid}/{id:guid}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.CRC)]
         public async Task<IResponseOutput> DeleteSV(Guid id)
         {
@@ -738,7 +738,7 @@ namespace IRaCIS.Core.Application.Services
         /// <param name="subjectVisitId"></param>
         /// <returns></returns>
         [HttpPut("{trialId:guid}/{subjectVisitId:guid}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         [Obsolete]
         public async Task<IResponseOutput> SetSVExecuted(Guid subjectVisitId)
         {

IRaCIS.Core.Application/Service/Visit/VisitPlanService.cs

@@ -57,7 +57,7 @@ namespace IRaCIS.Core.Application.Service
             };
         }
 
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "BeforeOngoingCantOpt", "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> UpdateVisitBlindName(VisitBlindNameCommand command)
         {
 
@@ -87,8 +87,8 @@ namespace IRaCIS.Core.Application.Service
         [UnitOfWork]
         [HttpPost]
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })]
-        //[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "BeforeOngoingCantOpt", "AfterStopCannNotOpt" )]
+        //[TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> AddOrUpdateVisitStage(VisitPlanCommand visitPlan)
         {
 
@@ -198,8 +198,8 @@ namespace IRaCIS.Core.Application.Service
         [UnitOfWork]
         [HttpPost("{trialId:guid}")]
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "BeforeOngoingCantOpt", "AfterStopCannNotOpt" })]
-        //[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "BeforeOngoingCantOpt", "AfterStopCannNotOpt" )]
+        //[TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> ConfirmTrialVisitPlan(Guid trialId)
         {
             if (!await _trialRepository.AnyAsync(t => t.Id == trialId && (t.TrialStatusStr == StaticData.TrialState.TrialInitializing || t.TrialStatusStr == StaticData.TrialState.TrialOngoing)))

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

@@ -31,7 +31,7 @@ namespace IRaCIS.Core.Application.Service
         ///// </summary>
         //[HttpPost("{trialId}")]
 
-        //[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        //[TrialGlobalLimit( "AfterStopCannNotOpt" )]
         ////[Authorize(Policy = IRaCISPolicy.PM_APM)]
         //public async Task<IResponseOutput> UploadReviewerAckSOW(Guid trialId,
         //    ReviewerAckDTO attachmentViewModel)
@@ -61,7 +61,7 @@ namespace IRaCIS.Core.Application.Service
         ///// </summary>
         //[HttpDelete, Route("{trialId}/{doctorId}/{attachmentId}")]
 
-        //[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        //[TrialGlobalLimit( "AfterStopCannNotOpt" )]
         ////[Authorize(Policy = IRaCISPolicy.PM_APM)]
         //public async Task<IResponseOutput> DeleteReviewerAckSOW(Guid trialId, Guid doctorId, Guid attachmentId)
         //{
@@ -118,7 +118,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inDto"></param>
         /// <returns></returns>
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> SetEnrollReadingCategory(SetEnrollReadingCategoryInDto inDto)
         {
 
@@ -167,7 +167,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="inCommand"></param>
         /// <returns></returns>
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> UpdateTrialReviewerState(SetEnrollEnableCommand inCommand)
         {
             await _taskAllocationRuleRepository.UpdatePartialFromQueryAsync(t => t.TrialId == inCommand.TrialId && t.EnrollId == inCommand.EnrollId, u => new TaskAllocationRule() { IsEnable = inCommand.IsEnable }, true);
@@ -181,7 +181,7 @@ namespace IRaCIS.Core.Application.Service
         /// </summary>
         /// <returns></returns>
         [HttpPost("{trialId}/{doctorId}/{type}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.PM_APM)]
         public async Task<IResponseOutput> UpdateReviewerReadingType(Guid trialId, Guid doctorId, int type)
         {

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

@@ -105,7 +105,7 @@ namespace IRaCIS.Core.Application.Service
         /// <returns></returns>
 
         [HttpPost("{trialId:guid}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.PM_APM_SPM_CPM_SMM_CMM)]
         public async Task<IResponseOutput> SelectReviewers(Guid trialId, Guid[] doctorIdArray)
         {
@@ -158,7 +158,7 @@ namespace IRaCIS.Core.Application.Service
         /// </summary>
 
         [HttpPost("{trialId:guid}/{commitState:int}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.PM_APM_SPM_CPM_SMM_CMM)]
         public async Task<IResponseOutput> SubmitReviewer(Guid trialId, Guid[] doctorIdArray, int commitState)
         {
@@ -253,7 +253,7 @@ namespace IRaCIS.Core.Application.Service
         /// </summary>
 
         [HttpPost("{trialId:guid}/{auditState:int}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.PM_APM_SPM_CPM_SMM_CMM)]
         public async Task<IResponseOutput> ApproveReviewer(Guid trialId, Guid[] doctorIdArray, int auditState)
         {
@@ -339,7 +339,7 @@ namespace IRaCIS.Core.Application.Service
         /// </summary>
 
         [HttpPost]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.PM_APM_SPM_CPM_SMM_CMM)]
         [UnitOfWork]
         public async Task<IResponseOutput> ConfirmReviewer(ConfirmReviewerCommand confirmReviewerCommand,
@@ -460,7 +460,7 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="outEnrollTime"></param>
         /// <returns></returns>
         [HttpPost("{trialId:guid}/{doctorId:guid}/{optType:int}")]
-        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         //[Authorize(Policy = IRaCISPolicy.PM_APM_SPM_CPM)]
         [Obsolete]
         public async Task<IResponseOutput> EnrollBackOrOut(Guid trialId, Guid doctorId, int optType, DateTime? outEnrollTime)