From 4c4d19b0d6f5e9160a02b1744bdf9e25c3a63b23 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 7 Feb 2025 16:17:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRC.Core.SCP/Program.cs                  | 27 ++++++++++++++++--------
 IRC.Core.SCP/Service/CStoreSCPService.cs |  8 +++++--
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/IRC.Core.SCP/Program.cs b/IRC.Core.SCP/Program.cs
index e550314dd..dd1f7b646 100644
--- a/IRC.Core.SCP/Program.cs
+++ b/IRC.Core.SCP/Program.cs
@@ -125,19 +125,25 @@ builder.Services.Configure<ForwardedHeadersOptions>(options =>
         ForwardedHeaders.XForwardedFor | ForwardedHeaders.XForwardedProto;
 });
 
-//Dicom影像渲染图片  跨平台
-//builder.Services.AddDicomSetup();
-new DicomSetupBuilder()
-       .RegisterServices(s =>
-            s.AddFellowOakDicom()
-              .AddTranscoderManager<NativeTranscoderManager>()
+builder.Services.AddFellowOakDicom().AddTranscoderManager<NativeTranscoderManager>()
               //.AddTranscoderManager<FellowOakDicom.Imaging.NativeCodec.NativeTranscoderManager>()
-              .AddImageManager<ImageSharpImageManager>())
-       .SkipValidation()
-       .Build();
+              .AddImageManager<ImageSharpImageManager>();
 
 
 
+////Dicom影像渲染图片  跨平台
+////builder.Services.AddDicomSetup();
+//new DicomSetupBuilder()
+//       .RegisterServices(s =>
+//            s.AddFellowOakDicom()
+//              .AddTranscoderManager<NativeTranscoderManager>()
+//              //.AddTranscoderManager<FellowOakDicom.Imaging.NativeCodec.NativeTranscoderManager>()
+//              .AddImageManager<ImageSharpImageManager>())
+//       .SkipValidation()
+       
+//       .Build();
+
+
 #endregion
 
 // Add services to the container.
@@ -210,6 +216,9 @@ else
 
 #endregion
 
+DicomSetupBuilder.UseServiceProvider(app.Services);
+
+
 var logger = app.Services.GetService<Microsoft.Extensions.Logging.ILogger<Program>>();
 
 var server = DicomServerFactory.Create<CStoreSCPService>(_configuration.GetSection("DicomSCPServiceConfig").GetValue<int>("ServerPort"), userState: app.Services,logger: logger);
diff --git a/IRC.Core.SCP/Service/CStoreSCPService.cs b/IRC.Core.SCP/Service/CStoreSCPService.cs
index 5820bac6d..6c07801a6 100644
--- a/IRC.Core.SCP/Service/CStoreSCPService.cs
+++ b/IRC.Core.SCP/Service/CStoreSCPService.cs
@@ -37,6 +37,7 @@ namespace IRaCIS.Core.SCP.Service
 
     public class CStoreSCPService : DicomService, IDicomServiceProvider, IDicomCStoreProvider, IDicomCEchoProvider
     {
+        //private IServiceProvider _injectServiceProvider { get; set; }
         private IServiceProvider _serviceProvider { get; set; }
 
         private List<Guid> _SCPStudyIdList { get; set; } = new List<Guid>();
@@ -71,9 +72,10 @@ namespace IRaCIS.Core.SCP.Service
         };
 
 
-        public CStoreSCPService(INetworkStream stream, Encoding fallbackEncoding, Microsoft.Extensions.Logging.ILogger log, DicomServiceDependencies dependencies)
+        public CStoreSCPService(INetworkStream stream, Encoding fallbackEncoding, Microsoft.Extensions.Logging.ILogger log, DicomServiceDependencies dependencies, IServiceProvider injectServiceProvider)
             : base(stream, fallbackEncoding, log, dependencies)
         {
+            _serviceProvider = injectServiceProvider;
         }
 
 
@@ -87,7 +89,9 @@ namespace IRaCIS.Core.SCP.Service
 
             Log.Logger.Warning($"接收到来自{association.CallingAE}的连接");
 
-            _serviceProvider = (IServiceProvider)this.UserState;
+            //_serviceProvider = (IServiceProvider)this.UserState;
+
+            //var tt = _injectServiceProvider;
 
             var option = _serviceProvider.GetService<IOptionsMonitor<DicomSCPServiceOption>>().CurrentValue;