修改缓存bug

IRC.Core.SCP/IRC.Core.SCP.csproj

@@ -36,4 +36,12 @@
     <ProjectReference Include="..\IRaCIS.Core.Infra.EFCore\IRaCIS.Core.Infra.EFCore.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Update="appsettings.Prod_HIR_SCP.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+      <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
+    </Content>
+  </ItemGroup>
+
 </Project>

IRC.Core.SCP/appsettings.Prod_HIR_SCP.json

@@ -0,0 +1,35 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft": "Warning",
+      "Microsoft.Hosting.Lifetime": "Information"
+    }
+  },
+  "ObjectStoreService": {
+    "ObjectStoreUse": "MinIO",
+    "MinIO": {
+      "EndPoint": "192.168.3.112",
+      "Port": "9000",
+      "UseSSL": false,
+      "AccessKeyId": "Jnywl9aIw83yewZIJKod",
+      "SecretAccessKey": "N83bTzoJGkg4OLW8x54IZRwwSvdxcdYi9UZ2BYII",
+      "BucketName": "hir-images",
+      "ViewEndpoint": "http://192.168.3.112:9000/hir-images"
+    }
+  },
+
+  "ConnectionStrings": {
+    "RemoteNew": "Server=192.168.3.114,1433;Database=Prod_HIR_Images;User ID=sa;Password=xc_123456;TrustServerCertificate=true",
+    "Hangfire": "Server=192.168.3.114,1433;Database=Prod_HIR_Hangfire;User ID=sa;Password=xc_123456;TrustServerCertificate=true"
+  },
+  "DicomSCPServiceConfig": {
+    "CalledAEList": [
+      "STORESCP",
+      "HIRAE",
+      "Value2",
+      "Value3"
+    ],
+    "ServerPort": 11112
+  }
+}

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

@@ -120,7 +120,7 @@ public class TrialGlobalLimitActionFilter(IFusionCache _fusionCache, IUserInfo _
 
                         trialIdStr = matchResult.Value;
 
-                        var trialInfo = await _fusionCache.GetOrSetAsync(CacheKeys.Trial(trialIdStr), _ => CacheHelper.GetTrialStatusAsync(Guid.Parse(trialIdStr), _trialRepository), TimeSpan.FromDays(7));
+                        var trialInfo = await _fusionCache.GetOrSetAsync(CacheKeys.Trial(trialIdStr), async _ =>await CacheHelper.GetTrialStatusAsync(Guid.Parse(trialIdStr), _trialRepository), TimeSpan.FromDays(7));
 
                         if (string.IsNullOrWhiteSpace(trialInfo?.TrialStatusStr))
                         {
@@ -152,9 +152,9 @@ public class TrialGlobalLimitActionFilter(IFusionCache _fusionCache, IUserInfo _
             //通过path 或者body 找到trialId 了  
             if (!string.IsNullOrWhiteSpace(trialIdStr))
             {
-                var trialInfo = await _fusionCache.GetOrSetAsync(CacheKeys.Trial(trialIdStr), _ => CacheHelper.GetTrialStatusAsync(Guid.Parse(trialIdStr), _trialRepository), TimeSpan.FromDays(7));
+                var trialInfo = await _fusionCache.GetOrSetAsync(CacheKeys.Trial(trialIdStr), async _ => await CacheHelper.GetTrialStatusAsync(Guid.Parse(trialIdStr), _trialRepository), TimeSpan.FromDays(7));
 
-                var hospitalInfo = await _fusionCache.GetOrSetAsync(CacheKeys.Hospital, _ => CacheHelper.GetHospitalCode(_hirHospitalRepository), TimeSpan.FromDays(7));
+                var hospitalInfo = await _fusionCache.GetOrSetAsync(CacheKeys.Hospital, async _ => await CacheHelper.GetHospitalCode(_hirHospitalRepository), TimeSpan.FromDays(7));
 
                 var trialStatusStr = string.Empty;
 

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

@@ -128,7 +128,7 @@ public class TrialGlobalLimitEndpointFilter(IFusionCache _fusionCache, IUserInfo
 
                         trialIdStr = matchResult.Value;
 
-                        var trialInfo = await _fusionCache.GetOrSetAsync(CacheKeys.Trial(trialIdStr), _ => CacheHelper.GetTrialStatusAsync(Guid.Parse(trialIdStr), _trialRepository), TimeSpan.FromDays(7));
+                        var trialInfo = await _fusionCache.GetOrSetAsync(CacheKeys.Trial(trialIdStr), async _ => await CacheHelper.GetTrialStatusAsync(Guid.Parse(trialIdStr), _trialRepository), TimeSpan.FromDays(7));
 
                         if (string.IsNullOrWhiteSpace(trialInfo?.TrialStatusStr))
                         {
@@ -158,9 +158,9 @@ public class TrialGlobalLimitEndpointFilter(IFusionCache _fusionCache, IUserInfo
             //通过path 或者body 找到trialId 了  
             if (!string.IsNullOrWhiteSpace(trialIdStr))
             {
-                var trialInfo = await _fusionCache.GetOrSetAsync(CacheKeys.Trial(trialIdStr), _ => CacheHelper.GetTrialStatusAsync(Guid.Parse(trialIdStr), _trialRepository), TimeSpan.FromDays(7));
+                var trialInfo = await _fusionCache.GetOrSetAsync(CacheKeys.Trial(trialIdStr), async _ => await CacheHelper.GetTrialStatusAsync(Guid.Parse(trialIdStr), _trialRepository), TimeSpan.FromDays(7));
 
-                var hospitalInfo = await _fusionCache.GetOrSetAsync(CacheKeys.Hospital, _ => CacheHelper.GetHospitalCode(_hirHospitalRepository), TimeSpan.FromDays(7));
+                var hospitalInfo = await _fusionCache.GetOrSetAsync(CacheKeys.Hospital, async _ => await CacheHelper.GetHospitalCode(_hirHospitalRepository), TimeSpan.FromDays(7));
 
                 var trialStatusStr = string.Empty;
 

IRaCIS.Core.Application/Helper/CacheHelper.cs

@@ -83,9 +83,9 @@ public static class CacheHelper
         return list;
     }
 
-    public static async Task<HIRHospital> GetHospitalCode(IRepository<HIRHospital> _hirHospitalRepository)
+    public static async Task<HIRHospital?> GetHospitalCode(IRepository<HIRHospital> _hirHospitalRepository)
     {
-       return await _hirHospitalRepository.Where(t => t.IsDefault == true).FirstNotNullAsync();
+       return await _hirHospitalRepository.Where(t => t.IsDefault == true).FirstOrDefaultAsync();
 
     }
 }

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

@@ -56,7 +56,7 @@ namespace IRaCIS.Core.Application.Services
             }
 
 
-            var anonymizeList = await _fusionCache.GetOrSetAsync(CacheKeys.SystemAnonymization, _ => CacheHelper.GetSystemAnonymizationListAsync(_systemAnonymizationRepository), TimeSpan.FromDays(7));
+            var anonymizeList = await _fusionCache.GetOrSetAsync(CacheKeys.SystemAnonymization, async _ => await CacheHelper.GetSystemAnonymizationListAsync(_systemAnonymizationRepository), TimeSpan.FromDays(7));
 
             var fixedFiledList = anonymizeList.Where(t => t.IsFixed).ToList();
             var ircFiledList = anonymizeList.Where(t => t.IsFixed == false).ToList();

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

@@ -782,7 +782,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
             // 写入dicom 固定的信息，以及组织路径的信息  以及匿名化的信息
             var otherData = GetSaveToDicomInfo(verifyInfo.SubjectVisitId);
 
-            var anonymizeList = _fusionCache.GetOrSetAsync(CacheKeys.SystemAnonymization, _ => CacheHelper.GetSystemAnonymizationListAsync(_systemAnonymizationRepository), TimeSpan.FromDays(7)).Result;
+            var anonymizeList = _fusionCache.GetOrSetAsync(CacheKeys.SystemAnonymization, async _ => await CacheHelper.GetSystemAnonymizationListAsync(_systemAnonymizationRepository), TimeSpan.FromDays(7)).Result;
 
             return ResponseOutput.Ok<List<VerifyStudyUploadResult>>(result, new
             {

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

@@ -279,7 +279,7 @@ namespace IRaCIS.Core.Application.Service
         [UnitOfWork]
         public async Task<IResponseOutput> ResetPassword(Guid userId)
         {
-            var hospitalInfo = await _fusionCache.GetOrSetAsync(CacheKeys.Hospital, _ => CacheHelper.GetHospitalCode(_hirHospitalRepository), TimeSpan.FromDays(7));
+            var hospitalInfo = await _fusionCache.GetOrSetAsync(CacheKeys.Hospital,async _ => await CacheHelper.GetHospitalCode(_hirHospitalRepository), TimeSpan.FromDays(7));
 
 
             //var pwd = IRCEmailPasswordHelper.GenerateRandomPassword(10);
@@ -433,7 +433,7 @@ namespace IRaCIS.Core.Application.Service
         [UnitOfWork]
         public async Task<IResponseOutput<UserAddedReturnDTO>> AddUser(UserCommand userAddModel)
         {
-            var hospitalInfo = await _fusionCache.GetOrSetAsync(CacheKeys.Hospital, _ => CacheHelper.GetHospitalCode(_hirHospitalRepository), TimeSpan.FromDays(7));
+            var hospitalInfo = await _fusionCache.GetOrSetAsync(CacheKeys.Hospital,  async _ => await CacheHelper.GetHospitalCode(_hirHospitalRepository), TimeSpan.FromDays(7));
 
 
             await VerifyUserNameAsync(null, userAddModel.UserName);
@@ -951,7 +951,7 @@ namespace IRaCIS.Core.Application.Service
         [HttpGet("{email}/{verifyCode}")]
         public async Task<List<UserAccountDto>> VerifyAnonymousVerifyCode(string email, string verifyCode)
         {
-            var hospitalInfo = await _fusionCache.GetOrSetAsync(CacheKeys.Hospital, _ => CacheHelper.GetHospitalCode(_hirHospitalRepository), TimeSpan.FromDays(7));
+            var hospitalInfo = await _fusionCache.GetOrSetAsync(CacheKeys.Hospital, async _ => await CacheHelper.GetHospitalCode(_hirHospitalRepository), TimeSpan.FromDays(7));
 
             if (hospitalInfo.IsCanConnectInternet)
             {