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

2025-04-03 14:31:25 +08:00 · 2025-04-03 14:31:25 +08:00 · 1e4571a814
parent 848670d128 6d9b5fdb2d
commit 1e4571a814
15 changed files with 230 additions and 64 deletions
--- a/IRC.Core.SCP/IRC.Core.SCP.csproj
+++ b/IRC.Core.SCP/IRC.Core.SCP.csproj
@ -14,9 +14,9 @@
 	  <PackageReference Include="AWSSDK.SecurityToken" Version="3.7.400.36" />
 	  <PackageReference Include="DistributedLock.Core" Version="1.0.7" />
 	  <PackageReference Include="DistributedLock.SqlServer" Version="1.0.5" />
-	  <PackageReference Include="fo-dicom" Version="5.1.3" />
-	  <PackageReference Include="fo-dicom.Codecs" Version="5.15.1" />
-	  <PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.1.3" />
+	  <PackageReference Include="fo-dicom" Version="5.2.1" />
+	  <PackageReference Include="fo-dicom.Codecs" Version="5.16.0" />
+	  <PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.2.1" />
 	  <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
 	  <PackageReference Include="AutoMapper" Version="13.0.1" />
 	  <PackageReference Include="Minio" Version="6.0.3" />
--- a/IRaCIS.Core.API/IRaCIS.Core.API.csproj
+++ b/IRaCIS.Core.API/IRaCIS.Core.API.csproj
@ -69,6 +69,7 @@

 	<ItemGroup>
 		<PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.14" />

 		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.10">
 			<PrivateAssets>all</PrivateAssets>
@ -79,8 +80,6 @@
 		<PackageReference Include="Hangfire.Dashboard.BasicAuthorization" Version="1.0.2" />
 		<PackageReference Include="Hangfire.InMemory" Version="1.0.0" />
 		<PackageReference Include="Hangfire.SqlServer" Version="1.8.14" />
-		<PackageReference Include="Invio.Extensions.Authentication.JwtBearer" Version="2.0.1" />
-		<PackageReference Include="LogDashboard" Version="1.4.8" />
 		<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
 		<PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
 		<PackageReference Include="Serilog.Formatting.Compact" Version="3.0.0" />
--- a/IRaCIS.Core.API/Progranm.cs
+++ b/IRaCIS.Core.API/Progranm.cs
@ -7,7 +7,6 @@ using IRaCIS.Core.Application.Service;
 using IRaCIS.Core.Application.Service.BusinessFilter;
 using IRaCIS.Core.Infra.EFCore;
 using IRaCIS.Core.Infrastructure.Extention;
-using LogDashboard;
 using MassTransit;
 using MassTransit.NewIdProviders;
 using Microsoft.AspNetCore.Builder;
@ -136,7 +135,7 @@ builder.Services.AddFusionCache();
 builder.Services.AddhangfireSetup(_configuration);

 //Serilog 日志可视化 LogDashboard日志
-builder.Services.AddLogDashboardSetup();
+//builder.Services.AddLogDashboardSetup();

 //Dicom影像渲染图片  跨平台
 builder.Services.AddDicomSetup();
@ -221,7 +220,7 @@ app.UseResponseCompression();
 app.UseStaticFiles();

 //LogDashboard
-app.UseLogDashboard("/LogDashboard");
+//app.UseLogDashboard("/LogDashboard");

 //hangfire
 app.UseHangfireConfig(env);
--- a/IRaCIS.Core.API/_PipelineExtensions/LogDashboard/LogDashBoardAuthFilter.cs
+++ b/IRaCIS.Core.API/_PipelineExtensions/LogDashboard/LogDashBoardAuthFilter.cs
@ -1,15 +1,15 @@
-using LogDashboard;
-using LogDashboard.Authorization;
+//using LogDashboard;
+//using LogDashboard.Authorization;

-namespace IRaCIS.Core.API.Filter
-{
+//namespace IRaCIS.Core.API.Filter
+//{

-    public class LogDashBoardAuthFilter : ILogDashboardAuthorizationFilter
-    {
-        //在此可以利用 本系统的UerTypeEnum 判断
-        public bool Authorization(LogDashboardContext context)
-        {
-            return context.HttpContext.User.Identity.IsAuthenticated;
-        }
-    }
-}
+//    public class LogDashBoardAuthFilter : ILogDashboardAuthorizationFilter
+//    {
+//        //在此可以利用 本系统的UerTypeEnum 判断
+//        public bool Authorization(LogDashboardContext context)
+//        {
+//            return context.HttpContext.User.Identity.IsAuthenticated;
+//        }
+//    }
+//}
--- a/IRaCIS.Core.API/_ServiceExtensions/LogDashboardSetup.cs
+++ b/IRaCIS.Core.API/_ServiceExtensions/LogDashboardSetup.cs
@ -1,25 +1,25 @@

-using LogDashboard;
-using Microsoft.Extensions.DependencyInjection;
+//using LogDashboard;
+//using Microsoft.Extensions.DependencyInjection;

-namespace IRaCIS.Core.API
-{
-    public static class LogDashboardSetup
-    {
-        public static void AddLogDashboardSetup(this IServiceCollection services)
-        {
-            //IIS 配置虚拟路径部署，会出现IIS静态文件404
-            services.AddLogDashboard(opt =>
-            {
-                //opt.PathMatch = "/api/LogDashboard";
-                opt.PathMatch = "/LogDashboard";
+//namespace IRaCIS.Core.API
+//{
+//    public static class LogDashboardSetup
+//    {
+//        public static void AddLogDashboardSetup(this IServiceCollection services)
+//        {
+//            //IIS 配置虚拟路径部署，会出现IIS静态文件404
+//            services.AddLogDashboard(opt =>
+//            {
+//                //opt.PathMatch = "/api/LogDashboard";
+//                opt.PathMatch = "/LogDashboard";

-                //opt.AddAuthorizationFilter(new LogDashboardBasicAuthFilter("admin", "zhizhun2018"));
+//                //opt.AddAuthorizationFilter(new LogDashboardBasicAuthFilter("admin", "zhizhun2018"));

-                //opt.AddAuthorizationFilter(new LogDashBoardAuthFilter());
+//                //opt.AddAuthorizationFilter(new LogDashBoardAuthFilter());

-            });
+//            });

-        }
-    }
-}
+//        }
+//    }
+//}
--- a/IRaCIS.Core.API/appsettings.Event_IRC.json
+++ b/IRaCIS.Core.API/appsettings.Event_IRC.json
@ -7,8 +7,8 @@
    }
  },
  "ConnectionStrings": {
-    "RemoteNew": "Server=47.117.164.182,1434;Database=Event_IRC;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
-    "Hangfire": "Server=47.117.164.182,1434;Database=Event_IRC_Hangfire;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
+    "RemoteNew": "Server=101.132.253.119,1435;Database=irc_Prpd_bak;User ID=sa;Password=xc@123456;TrustServerCertificate=true",
+    "Hangfire": "Server=101.132.253.119,1435;Database=irc_Hangfire_bak;User ID=sa;Password=xc@123456;TrustServerCertificate=true"
  },
  "ObjectStoreService": {
    "ObjectStoreUse": "AliyunOSS",
--- a/IRaCIS.Core.Application/BusinessFilter/LegacyController/TrialGlobalLimitActionFilter.cs
+++ b/IRaCIS.Core.Application/BusinessFilter/LegacyController/TrialGlobalLimitActionFilter.cs
@ -62,9 +62,9 @@ public class TrialGlobalLimitActionFilter(IFusionCache _fusionCache, IUserInfo _
                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["self-Referer"].ToString().Contains("trialId"))
+            else if (context.HttpContext.Request.Headers["Referer"].ToString().Contains("trialId"))
            {
-                var headerStr = context.HttpContext.Request.Headers["self-Referer"].ToString();
+                var headerStr = context.HttpContext.Request.Headers["Referer"].ToString();

                var trialIdIndex = headerStr.IndexOf("trialId");

--- a/IRaCIS.Core.Application/BusinessFilter/MinimalAPI/TrialGlobalLimitEndpointFilter.cs
+++ b/IRaCIS.Core.Application/BusinessFilter/MinimalAPI/TrialGlobalLimitEndpointFilter.cs
@ -71,9 +71,9 @@ public class TrialGlobalLimitEndpointFilter(IFusionCache _fusionCache, IUserInfo
                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["self-Referer"].ToString().Contains("trialId"))
+            else if (context.HttpContext.Request.Headers["Referer"].ToString().Contains("trialId"))
            {
-                var headerStr = context.HttpContext.Request.Headers["self-Referer"].ToString();
+                var headerStr = context.HttpContext.Request.Headers["Referer"].ToString();

                var trialIdIndex = headerStr.IndexOf("trialId");

--- a/IRaCIS.Core.Application/Helper/OtherTool/ImageHelper.cs
+++ b/IRaCIS.Core.Application/Helper/OtherTool/ImageHelper.cs
@ -15,14 +15,20 @@ public static class ImageHelper

        fileStorePath = fileStorePath ?? filePath + ".preview.jpeg";

-        using (var image = SixLabors.ImageSharp.Image.Load(filePath))
-        {
+        // 读取 DICOM 文件
+        var dicomImage = new DicomImage(filePath);

+        // 渲染 DICOM 图像到 ImageSharp 格式
+        using (var image = dicomImage.RenderImage().AsSharpImage())
+        {
+            // 生成缩略图（调整大小）
            image.Mutate(x => x.Resize(500, 500));

-            image.Save(fileStorePath);
-
+            // 保存缩略图为 JPEG
+            image.Save(fileStorePath, new JpegEncoder());
        }
+
+       
    }


--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.csproj
@ -37,16 +37,16 @@
 		<PackageReference Include="AWSSDK.SecurityToken" Version="3.7.400.36" />
 		<PackageReference Include="Aliyun.OSS.SDK.NetCore" Version="2.14.1" />
 		<PackageReference Include="AWSSDK.S3" Version="3.7.405" />
-		<PackageReference Include="DocX" Version="3.0.1" />	
+		<PackageReference Include="DocX" Version="4.0.25105.5786" />	
 		<PackageReference Include="FreeSpire.Doc" Version="12.2.0" />
 		<PackageReference Include="Hangfire.Core" Version="1.8.14" />
 		<PackageReference Include="ExcelDataReader" Version="3.7.0" />
 		<PackageReference Include="ExcelDataReader.DataSet" Version="3.7.0" />
 		<PackageReference Include="DistributedLock.Redis" Version="1.0.3" />
 		<PackageReference Include="DistributedLock.SqlServer" Version="1.0.5" />
-		<PackageReference Include="fo-dicom" Version="5.1.3" />
-		<PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.1.3" />
-		<PackageReference Include="fo-dicom.Codecs" Version="5.15.1" />
+		<PackageReference Include="fo-dicom" Version="5.2.1" />
+		<PackageReference Include="fo-dicom.Imaging.ImageSharp" Version="5.2.1" />
+		<PackageReference Include="fo-dicom.Codecs" Version="5.16.0" />
 		<PackageReference Include="IP2Region.Net" Version="2.0.2" />
 		<PackageReference Include="MailKit" Version="4.7.1.1" />
 		<PackageReference Include="Masa.Contrib.Service.MinimalAPIs" Version="1.0.0" />
@ -54,14 +54,14 @@
 		<PackageReference Include="MimeKit" Version="4.7.1" />
 		<PackageReference Include="MiniExcel" Version="1.34.2" />
 		<PackageReference Include="Minio" Version="6.0.3" />
-		<PackageReference Include="MiniWord" Version="0.8.0" />
+		<PackageReference Include="MiniWord" Version="0.9.2" />
 		<PackageReference Include="My.Extensions.Localization.Json" Version="3.3.0">
 		  <TreatAsUsed>true</TreatAsUsed>
 		</PackageReference>
 		<PackageReference Include="NPOI" Version="2.7.1" />
 		<PackageReference Include="Panda.DynamicWebApi" Version="1.2.2" />
 		<PackageReference Include="RestSharp" Version="112.1.0" />
-		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.5" />
+		<PackageReference Include="SixLabors.ImageSharp" Version="3.1.7" />
 		<PackageReference Include="Swashbuckle.AspNetCore.Filters" Version="8.0.2" />
 		<PackageReference Include="ZiggyCreatures.FusionCache" Version="1.4.0" />
 	</ItemGroup>
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@ -13888,6 +13888,22 @@
            <param name="_readingConsistentClinicalDataRepository"></param>
            <returns></returns>
        </member>
+        <member name="M:IRaCIS.Core.Application.Service.TestService.IQCBackToUpload(System.Guid[],IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.SubjectVisit},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.TrialQCQuestionAnswer},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingClinicalData})">
+            <summary>
+            IQC 回退到影像上传
+            </summary>
+            <param name="subjectVisitIdList"></param>
+            <param name="_subjectVisitRepository"></param>
+            <param name="_trialQCQuestionAnswerRepository"></param>
+            <param name="_readingClinicalDataReposiotry"></param>
+            <returns></returns>
+        </member>
+        <member name="M:IRaCIS.Core.Application.Service.TestService.BackImageResize(System.Guid,System.Guid)">
+            <summary>
+            后端处理某个中心缩略图有问题  先下载，生成缩略图上传，然后更新数据库
+            </summary>
+            <returns></returns>
+        </member>
        <member name="M:IRaCIS.Core.Application.Service.TestService.DealTialFileSie(IRaCIS.Core.Application.Helper.IOSSService,IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.NoneDicomStudyFile},IRaCIS.Core.Infra.EFCore.IRepository{IRaCIS.Core.Domain.Models.ReadingClinicalDataPDF})">
            <summary>
            非dicom 临床数据
--- a/IRaCIS.Core.Application/TestService.cs
+++ b/IRaCIS.Core.Application/TestService.cs
@ -1,5 +1,6 @@
 using Aliyun.OSS;
 using DocumentFormat.OpenXml.Spreadsheet;
+using FellowOakDicom.Imaging;
 using IRaCIS.Application.Contracts;
 using IRaCIS.Core.Application.BusinessFilter;
 using IRaCIS.Core.Application.Contracts;
@ -7,6 +8,7 @@ using IRaCIS.Core.Application.Helper;
 using IRaCIS.Core.Application.Service.BusinessFilter;
 using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain;
+using IRaCIS.Core.Domain.Models;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infra.EFCore;
 using IRaCIS.Core.Infrastructure;
@ -26,8 +28,13 @@ using Microsoft.Extensions.Options;
 using MiniExcelLibs;
 using NPOI.SS.Formula.Functions;
 using NPOI.XWPF.UserModel;
+using SharpCompress.Common;
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.Formats.Jpeg;
+using SixLabors.ImageSharp.Processing;
 using System.Globalization;
 using System.Linq.Dynamic.Core;
+using System.Reactive.Subjects;
 using System.Reflection.Metadata.Ecma335;
 using System.Runtime.InteropServices;
 using System.Text;
@ -53,6 +60,7 @@ namespace IRaCIS.Core.Application.Service
        IRepository<DicomSeries> _dicomSeriesRepository,
        IRepository<UserRole> _userRoleRepository,
        IRepository<TrialBodyPart> _trialBodyPartRepository,
+        IOSSService _IOSSService,
        IDistributedLockProvider _distributedLockProvider,
        ILogger<TestService> _logger, IMapper _mapper, IUserInfo _userInfo, IStringLocalizer _localizer) : BaseService
    {
@ -86,6 +94,144 @@ namespace IRaCIS.Core.Application.Service
            await _readingConsistentClinicalDataRepository.SaveChangesAsync();
            return ResponseOutput.Ok();
        }
+
+
+        /// <summary>
+        /// IQC 回退到影像上传
+        /// </summary>
+        /// <param name="subjectVisitIdList"></param>
+        /// <param name="_subjectVisitRepository"></param>
+        /// <param name="_trialQCQuestionAnswerRepository"></param>
+        /// <param name="_readingClinicalDataReposiotry"></param>
+        /// <returns></returns>
+        [AllowAnonymous]
+        [HttpPost]
+        public async Task<IResponseOutput> IQCBackToUpload(Guid[] subjectVisitIdList,
+            [FromServices] IRepository<SubjectVisit> _subjectVisitRepository,
+             [FromServices] IRepository<TrialQCQuestionAnswer> _trialQCQuestionAnswerRepository,
+              [FromServices] IRepository<ReadingClinicalData> _readingClinicalDataReposiotry)
+        {
+
+            foreach (var subjectVisitId in subjectVisitIdList)
+            {
+                var sv = (await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == subjectVisitId)).IfNullThrowException();
+
+
+                //需要重新产生任务  
+                sv.IsVisitTaskGenerated = false;
+                sv.IsPMBackOrReReading = true;
+
+                sv.AuditState = AuditStateEnum.None;
+                sv.SubmitState = SubmitStateEnum.ToSubmit;
+                sv.ReadingStatus = ReadingStatusEnum.ImageNotSubmit;
+
+                //回退后，回退状态恢复
+                sv.RequestBackState = RequestBackStateEnum.NotRequest;
+                sv.IsCheckBack = false;
+                sv.CheckBackTime = null;
+                sv.CheckState = CheckStateEnum.None;
+                sv.CheckChallengeState = CheckChanllengeTypeEnum.None;
+
+                sv.SVENDTC = null;
+                sv.SVSTDTC = null;
+
+                sv.PreliminaryAuditTime = null;
+                sv.SubmitTime = null;
+                sv.ReviewAuditTime = null;
+                sv.CurrentActionUserExpireTime = null;
+
+
+                sv.IsTake = false;
+                sv.CurrentActionUserId = null;
+                sv.PreliminaryAuditUserId = null;
+                sv.ReviewAuditUserId = null;
+
+
+                if (sv.IsBaseLine)
+                {
+                    await _readingClinicalDataReposiotry.UpdatePartialFromQueryAsync(t => t.ReadingId == sv.Id && (t.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.Subject || t.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit), c => new ReadingClinicalData() { IsSign = false, ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded });
+
+                }
+                else
+                {
+                    await _readingClinicalDataReposiotry.UpdatePartialFromQueryAsync(t => t.ReadingId == sv.Id && t.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit, c => new ReadingClinicalData()
+                    {
+                        IsSign = false,
+                        ReadingClinicalDataState = ReadingClinicalDataStatus.HaveUploaded,
+                        IsBlind = null,
+                        IsComplete = null
+                    });
+                }
+
+
+                await _trialQCQuestionAnswerRepository.BatchDeleteNoTrackingAsync(t => t.SubjectVisitId == subjectVisitId);
+            }
+
+
+
+            var success = await _subjectVisitRepository.SaveChangesAsync();
+
+            return ResponseOutput.Ok();
+
+        }
+
+
+
+        /// <summary>
+        /// 后端处理某个中心缩略图有问题  先下载，生成缩略图上传，然后更新数据库
+        /// </summary>
+        /// <returns></returns>
+        [AllowAnonymous]
+        public async Task<IResponseOutput> BackImageResize(Guid trialSiteId ,Guid subjectId/* , [FromServices] IRepository<>*/)
+        {
+            ///${params.trialId}/ Image /${params.subjectId}/${params.subjectVisitId}/${ dicomInfo.studyUid}/${ v.seriesUid}.jpg
+
+            var dealSeriesList = await _dicomSeriesRepository.Where(t => t.DicomStudy.Subject.TrialSiteId == trialSiteId && t.SubjectId== subjectId).Select(t => new { t.Id, t.SubjectId, t.TrialId, t.SubjectVisitId, t.StudyInstanceUid, t.SeriesInstanceUid, t.ImageResizePath, t.UpdateUserId, FirstInstancePath = t.DicomInstanceList.First().Path }).ToListAsync();
+
+            //下载到本地
+            string tempFolderPath = Path.Combine(Directory.GetCurrentDirectory(), $"DownloadTemp_{NewId.NextGuid()}");
+            Directory.CreateDirectory(tempFolderPath);
+
+            foreach (var dealSeries in dealSeriesList)
+            {
+                var fileName = Path.GetFileNameWithoutExtension(dealSeries.FirstInstancePath);
+
+                var localFilePath = Path.Combine(tempFolderPath, fileName);
+
+                await _IOSSService.DownLoadFromOSSAsync(dealSeries.FirstInstancePath, localFilePath);
+
+
+                var resizePath = localFilePath + "_New.jpg";
+
+                //生成缩略图
+
+                // 读取 DICOM 文件
+                var dicomImage = new DicomImage(localFilePath);
+
+
+                // 渲染 DICOM 图像到 ImageSharp 格式
+                using (var image = dicomImage.RenderImage().AsSharpImage())
+                {
+                    // 生成缩略图（调整大小）
+                    image.Mutate(x => x.Resize(500, 500));
+
+                    // 保存缩略图为 JPEG
+                    image.Save(resizePath, new JpegEncoder());
+                }
+          
+                var ossFolder = $"{dealSeries.TrialId}/Image/{dealSeries.SubjectId}/{dealSeries.SubjectVisitId}/{dealSeries.StudyInstanceUid}";
+
+                var relativePath = await _IOSSService.UploadToOSSAsync(resizePath, ossFolder, false);
+
+                await _dicomSeriesRepository.BatchUpdateNoTrackingAsync(t => t.Id == dealSeries.Id, u => new DicomSeries() { ImageResizePath = relativePath, UpdateUserId = dealSeries.UpdateUserId });
+
+            }
+
+            return ResponseOutput.Ok();
+
+        }
+
+
        public async Task<IResponseOutput> DeleteOSSDate(string rootFolder,
            [FromServices] IOSSService _oSSService, [FromServices] IWebHostEnvironment _hostEnvironment)
        {
--- a/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj
+++ b/IRaCIS.Core.Infra.EFCore/IRaCIS.Core.Infra.EFCore.csproj
@ -21,7 +21,7 @@
 	</ItemGroup>

 	<ItemGroup>
-		<PackageReference Include="EFCore.BulkExtensions" Version="8.1.1" />
+		<PackageReference Include="EFCore.BulkExtensions" Version="8.1.3" />
 		<PackageReference Include="EntityFrameworkCore.Triggered" Version="3.2.2" />
 		<PackageReference Include="EntityFrameworkCore.Projectables" Version="3.0.4" />
 		<PackageReference Include="EntityFrameworkCore.Exceptions.SqlServer" Version="8.1.3" />
@ -30,7 +30,7 @@
 		<PackageReference Include="MassTransit.Hangfire" Version="8.3.0" />
 		<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="8.0.10" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.1" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.14" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.10">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
--- a/IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj
+++ b/IRaCIS.Core.Infrastructure/IRaCIS.Core.Infrastructure.csproj
@ -18,7 +18,7 @@
 		<PackageReference Include="SharpCompress" Version="0.38.0" />
 		<PackageReference Include="SharpZipLib" Version="1.4.2" />
 		<PackageReference Include="BouncyCastle.Cryptography" Version="2.4.0" />
-		<PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.6" />
+		<PackageReference Include="System.Linq.Dynamic.Core" Version="1.6.0.2" />
 	</ItemGroup>


--- a/IRaCIS.Core.Test/IRaCIS.Core.Test.csproj
+++ b/IRaCIS.Core.Test/IRaCIS.Core.Test.csproj
@ -49,11 +49,11 @@
 	</ItemGroup>

 	<ItemGroup>
-		<PackageReference Include="Fluid.Core" Version="2.11.1" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.10" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="8.0.10" />
-		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.10" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.10">
+		<PackageReference Include="Fluid.Core" Version="2.21.0" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.3" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="9.0.3" />
+		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.11" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.14">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>