修复bug

IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -227,7 +227,7 @@ namespace IRaCIS.Core.API.Controllers
         [HttpPost, Route("Study/ArchiveStudy")]
         [DisableFormValueModelBinding]
         [DisableRequestSizeLimit]
-        //[TypeFilter(typeof(TrialResourceFilter))]
+        [TypeFilter(typeof(TrialResourceFilter))]
         public async Task<IResponseOutput> ArchiveStudyNew(/*[FromForm] ArchiveStudyCommand archiveStudyCommand,*/ Guid trialId, Guid subjectVisitId, string studyInstanceUid, Guid? abandonStudyId,
              [FromServices] ILogger<UploadDownLoadController> _logger,
              [FromServices] IEasyCachingProvider _provider,

IRaCIS.Core.API/SignalRHub/UploadHub.cs

@@ -29,10 +29,10 @@ namespace IRaCIS.Core.API
     {
 
         public ILogger<UploadHub> _logger { get; set; }
-        public IUserInfo _userInfo { get; set; }
+        //public IUserInfo _userInfo { get; set; }
-        public UploadHub(IUserInfo userInfo, ILogger<UploadHub> logger)
+        public UploadHub(/*IUserInfo userInfo,*/ ILogger<UploadHub> logger)
         {
-            _userInfo = userInfo;
+            //_userInfo = userInfo;
 
             _logger = logger;
         }
@@ -40,11 +40,11 @@ namespace IRaCIS.Core.API
         public override Task OnConnectedAsync()
         {
             //base.Context.User.id
-            var a = Context.User.Identity;
+   
-            var b = _userInfo.Id;
 
             _logger.LogError("连接: " + Context.ConnectionId);
 
+
             return base.OnConnectedAsync();
         }
 

IRaCIS.Core.API/appsettings.json

@@ -79,7 +79,9 @@
 
     "DefaultPassword": "123456",
 
-    "DefaultInternalOrganizationName": "ExtImaging"
+    "DefaultInternalOrganizationName": "ExtImaging",
+
+    "ImageShareExpireDays": 10
   }
 
   //<EFBFBD><EFBFBD>վ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ַ<EFBFBD><EFBFBD>Ϊ<EFBFBD>˷<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD> dicom <EFBFBD><EFBFBD><EFBFBD>ϴ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD>... ʵ<EFBFBD>ⷢ<EFBFBD>ֲ<EFBFBD><EFBFBD>ý<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ƴ<EFBFBD>ӷ<EFBFBD><EFBFBD>أ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Զ<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ϵ<EFBFBD>ǰip<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>˶໷<EFBFBD><EFBFBD><EFBFBD><EFBFBD>ȡ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ļ<EFBFBD>

IRaCIS.Core.Application/BusinessFilter/TrialResourceFilter.cs

@@ -29,11 +29,11 @@ namespace IRaCIS.Core.Application.Filter
             #region 处理新的用户类型，不能操作项目相关接口
 
             // 后期列举出具体的类型，其他任何用户类型，都不允许操作
-            if( _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA)
+            if (_userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA)
             {
                 context.Result = new JsonResult(ResponseOutput.NotOk("对不起，您的账户没有操作权限。"));
 
-                return ;
+                return;
             }
 
             #endregion
@@ -43,8 +43,13 @@ namespace IRaCIS.Core.Application.Filter
             //TrialId 传递的途径多种，可能在path 可能在body  可能在数组中，也可能在对象中，可能就在url
             var trialIdStr = string.Empty;
 
+            if (!string.IsNullOrWhiteSpace(context.HttpContext.Request.Query["trialId"]))
+            {
+                trialIdStr = context.HttpContext.Request.Query["trialId"];
+            }
+
             //先尝试从path中取TrialId 
-            if (context.RouteData.Values.Keys.Any(t => t.Contains("trialId")))
+            else if (context.RouteData.Values.Keys.Any(t => t.Contains("trialId")))
             {
                 var index = context.RouteData.Values.Keys.ToList().IndexOf("trialId");
                 trialIdStr = context.RouteData.Values.Values.ToList()[index] as string;

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

@@ -68,7 +68,9 @@ namespace IRaCIS.Core.Application.Services
             imageShareCommand.Password = verificationPassWord.ToString();
 
             //配置文件读取过期时间
-            var days = int.Parse(_configuration.GetSection("imageShare:ExpireDays").Value);
+
+            var days = AppSettings.ImageShareExpireDays;
+
 
             imageShareCommand.ExpireTime = DateTime.Now.AddDays(days);
 

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

@@ -336,7 +336,7 @@ namespace IRaCIS.Core.Application.Services
                           .WhereIf(_userInfo.UserTypeEnumInt == (int)UserTypeEnum.ClinicalResearchCoordinator || _userInfo.UserTypeEnumInt == (int)UserTypeEnum.CRA, t => t.CRCUserList.Any(t => t.UserId == _userInfo.Id))
                           .Select(t=>  t.TrialSiteCode).ToListAsync();
 
-            var virtualList = await _repository.Where<VisitTask>(t => t.IsSelfAnalysis==true).Select(t => t.BlindTrialSiteCode).Distinct().ToListAsync();
+            var virtualList = await _repository.Where<VisitTask>(t => t.IsSelfAnalysis==true && t.TrialId==trialId).Select(t => t.BlindTrialSiteCode).Distinct().ToListAsync();
 
             return  isIncludeVirtualSite?  list.Concat(virtualList): list;
         }

IRaCIS.Core.Domain/_Config/_AppSettings.cs

@@ -36,6 +36,8 @@ namespace IRaCIS.Core.Domain.Share
 
         public static string DefaultInternalOrganizationName { get; set; }
 
+        public static int ImageShareExpireDays { get; set; } = 7;
+
 
         /// <summary>
         /// 用户默认密码
@@ -59,7 +61,9 @@ namespace IRaCIS.Core.Domain.Share
             NoneDicomStudyCodePrefix = configuration.GetSection("IRaCISBasicConfig").GetValue<string>("NoneDicomStudyCodePrefix");
             DicomStudyCodePrefix = configuration.GetSection("IRaCISBasicConfig").GetValue<string>("DicomStudyCodePrefix");
             DefaultPassword= configuration.GetSection("IRaCISBasicConfig").GetValue<string>("DefaultPassword");
-            DefaultPassword = configuration.GetSection("IRaCISBasicConfig").GetValue<string>("DefaultInternalOrganizationName");
+            DefaultInternalOrganizationName = configuration.GetSection("IRaCISBasicConfig").GetValue<string>("DefaultInternalOrganizationName");
+
+            ImageShareExpireDays = configuration.GetSection("IRaCISBasicConfig").GetValue<int>("ImageShareExpireDays");
         }