构造函数优化

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

@@ -1,175 +0,0 @@
-using FellowOakDicom.Network;
-using FellowOakDicom;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Logging;
-using IRaCIS.Core.Application.Contracts.Dicom;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Hosting;
-
-namespace IRaCIS.Core.Application.Service.ImageAndDoc
-{
-    /// <summary>
-    /// 后台托管服务的方式运行
-    /// </summary>
-    //public class CStoreSCPHostedService : IHostedService
-    //{
-    //    private readonly ILogger<CStoreSCPHostedService> _logger;
-    //    private readonly IDicomServerFactory _dicomServerFactory;
-    //    private IDicomServer? _server;
-
-    //    public CStoreSCPHostedService(ILogger<CStoreSCPHostedService> logger, IDicomServerFactory dicomServerFactory)
-    //    {
-    //        _logger = logger ?? throw new ArgumentNullException(nameof(logger));
-    //        _dicomServerFactory = dicomServerFactory ?? throw new ArgumentNullException(nameof(dicomServerFactory));
-    //    }
-
-    //    public async Task StartAsync(CancellationToken cancellationToken)
-    //    {
-    //        _logger.LogInformation("Starting DICOM server");
-    //        _server = _dicomServerFactory.Create<CStoreSCPService>(104);
-    //        _logger.LogInformation("DICOM server is running");
-    //    }
-
-    //    public Task StopAsync(CancellationToken cancellationToken)
-    //    {
-    //        if (_server != null)
-    //        {
-    //            _server.Stop();
-    //            _server.Dispose();
-    //            _server = null;
-    //        }
-    //        return Task.CompletedTask;
-    //    }
-    //}
-
-
-    public class CStoreSCPService : DicomService, IDicomServiceProvider, IDicomCStoreProvider, IDicomCEchoProvider
-    {
-        private  IServiceProvider _serviceProvider { get; set; }
-
-
-        private static readonly DicomTransferSyntax[] _acceptedTransferSyntaxes = new DicomTransferSyntax[]
-        {
-               DicomTransferSyntax.ExplicitVRLittleEndian,
-               DicomTransferSyntax.ExplicitVRBigEndian,
-               DicomTransferSyntax.ImplicitVRLittleEndian
-        };
-
-        private static readonly DicomTransferSyntax[] _acceptedImageTransferSyntaxes = new DicomTransferSyntax[]
-        {
-               // Lossless
-               DicomTransferSyntax.JPEGLSLossless,
-               DicomTransferSyntax.JPEG2000Lossless,
-               DicomTransferSyntax.JPEGProcess14SV1,
-               DicomTransferSyntax.JPEGProcess14,
-               DicomTransferSyntax.RLELossless,
-               // Lossy
-               DicomTransferSyntax.JPEGLSNearLossless,
-               DicomTransferSyntax.JPEG2000Lossy,
-               DicomTransferSyntax.JPEGProcess1,
-               DicomTransferSyntax.JPEGProcess2_4,
-               // Uncompressed
-               DicomTransferSyntax.ExplicitVRLittleEndian,
-               DicomTransferSyntax.ExplicitVRBigEndian,
-               DicomTransferSyntax.ImplicitVRLittleEndian
-        };
-
-
-        public CStoreSCPService(INetworkStream stream, Encoding fallbackEncoding, ILogger log, DicomServiceDependencies dependencies)
-            : base(stream, fallbackEncoding, log, dependencies)
-        {
-            var tt = base.UserState;
-            //_dicomArchiveService = dicomArchiveService;
-        }
-
-
-
-
-        public Task OnReceiveAssociationRequestAsync(DicomAssociation association)
-        {
-            _serviceProvider =(IServiceProvider) this.UserState;
-
-            if (association.CalledAE != "STORESCP")
-            {
-                return SendAssociationRejectAsync(
-                    DicomRejectResult.Permanent,
-                    DicomRejectSource.ServiceUser,
-                    DicomRejectReason.CalledAENotRecognized);
-            }
-
-            foreach (var pc in association.PresentationContexts)
-            {
-                if (pc.AbstractSyntax == DicomUID.Verification)
-                {
-                    pc.AcceptTransferSyntaxes(_acceptedTransferSyntaxes);
-                }
-                else if (pc.AbstractSyntax.StorageCategory != DicomStorageCategory.None)
-                {
-                    pc.AcceptTransferSyntaxes(_acceptedImageTransferSyntaxes);
-                }
-            }
-
-            return SendAssociationAcceptAsync(association);
-        }
-
-
-        public Task OnReceiveAssociationReleaseRequestAsync()
-        {
-            return SendAssociationReleaseResponseAsync();
-        }
-
-
-        public void OnReceiveAbort(DicomAbortSource source, DicomAbortReason reason)
-        {
-            /* nothing to do here */
-        }
-
-
-        public void OnConnectionClosed(Exception exception)
-        {
-            /* nothing to do here */
-        }
-
-
-        public async Task<DicomCStoreResponse> OnCStoreRequestAsync(DicomCStoreRequest request)
-        {
-           var tt= _serviceProvider.GetService<IDicomArchiveService>();
-
-            var studyUid = request.Dataset.GetSingleValue<string>(DicomTag.StudyInstanceUID).Trim();
-            var instUid = request.SOPInstanceUID.UID;
-
-            var path = Path.GetFullPath(@".\DICOM-Store");
-
-            path = Path.Combine(path, studyUid);
-
-            if (!Directory.Exists(path))
-            {
-                Directory.CreateDirectory(path);
-            }
-
-            path = Path.Combine(path, instUid) + ".dcm";
-
-            await request.File.SaveAsync(path);
-
-            return new DicomCStoreResponse(request, DicomStatus.Success);
-        }
-
-
-        public Task OnCStoreRequestExceptionAsync(string tempFileName, Exception e)
-        {
-            // let library handle logging and error response
-            return Task.CompletedTask;
-        }
-
-
-        public Task<DicomCEchoResponse> OnCEchoRequestAsync(DicomCEchoRequest request)
-        {
-            return Task.FromResult(new DicomCEchoResponse(request, DicomStatus.Success));
-        }
-
-    }
-}

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

@@ -17,34 +17,19 @@ using ZiggyCreatures.Caching.Fusion;
 
 namespace IRaCIS.Core.Application.Services
 {
-    public class DicomArchiveService : BaseService, IDicomArchiveService
+    public class DicomArchiveService(
+         IRepository<DicomStudy> _studyRepository,
+         IRepository<DicomSeries> _seriesRepository,
+         IRepository<DicomInstance> _instanceRepository,
+         IRepository<Dictionary> _dictionaryRepository,
+         IDistributedLockProvider _distributedLockProvider) : BaseService, IDicomArchiveService
     {
-        private readonly IRepository<DicomStudy> _studyRepository;
-        private readonly IRepository<DicomSeries> _seriesRepository;
-        private readonly IRepository<DicomInstance> _instanceRepository;
-        private readonly IRepository<Dictionary> _dictionaryRepository;
 
 
-        private readonly IDistributedLockProvider _distributedLockProvider;
-
 
         private List<Guid> _instanceIdList = new List<Guid>();
 
-        public DicomArchiveService(IRepository<DicomStudy> studyRepository,
-            IRepository<DicomSeries> seriesRepository,
-            IRepository<DicomInstance> instanceRepository,
-            IRepository<Dictionary> dictionaryRepository,
-            IDistributedLockProvider distributedLockProvider)
-        {
-            _distributedLockProvider = distributedLockProvider;
-            _studyRepository = studyRepository;
 
-            _seriesRepository = seriesRepository;
-
-            _instanceRepository = instanceRepository;
-            _dictionaryRepository = dictionaryRepository;
-
-        }
 
         public async Task<bool> DicomDBDataSaveChange()
         {
@@ -75,9 +60,9 @@ namespace IRaCIS.Core.Application.Services
 
 
             var anonymizeList = await _fusionCache.GetOrSetAsync(CacheKeys.SystemAnonymization, _ => CacheHelper.GetSystemAnonymizationListAsync(_repository), TimeSpan.FromDays(7));
-            
-            var fixedFiledList= anonymizeList.Where(t=>t.IsFixed).ToList();
-            var ircFiledList = anonymizeList.Where(t => t.IsFixed==false).ToList();
+
+            var fixedFiledList = anonymizeList.Where(t => t.IsFixed).ToList();
+            var ircFiledList = anonymizeList.Where(t => t.IsFixed == false).ToList();
 
 
 
@@ -191,7 +176,7 @@ namespace IRaCIS.Core.Application.Services
         }
 
 
-        private  DicomStudy CreateDicomStudy(DicomDataset dataset, DicomTrialSiteSubjectInfo addtionalInfo, out bool isStudyNeedAdd)
+        private DicomStudy CreateDicomStudy(DicomDataset dataset, DicomTrialSiteSubjectInfo addtionalInfo, out bool isStudyNeedAdd)
         {
 
             string studyInstanceUid = dataset.GetString(DicomTag.StudyInstanceUID);
@@ -516,7 +501,7 @@ namespace IRaCIS.Core.Application.Services
                     }
 
                     findStudy.Modalities = modality;
-                    findStudy.ModalityForEdit= modalityForEdit;
+                    findStudy.ModalityForEdit = modalityForEdit;
 
                     if (findStudy.PatientBirthDate.Length == 8)
                     {
@@ -609,13 +594,13 @@ namespace IRaCIS.Core.Application.Services
 
                 if (isStudyNeedAdd)
                 {
-                   await _studyRepository.AddAsync(findStudy);
+                    await _studyRepository.AddAsync(findStudy);
                 }
-                if(isSeriesNeedAdd)
+                if (isSeriesNeedAdd)
                 {
                     await _seriesRepository.AddAsync(findSerice);
                 }
-                if(isInstanceNeedAdd)
+                if (isInstanceNeedAdd)
                 {
                     await _instanceRepository.AddAsync(findInstance);
                 }

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

@@ -31,26 +31,15 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
         Task PackageAndAnonymizImage(Guid trialId, Guid subjectVisitId, bool isDicom, bool isAnonymize = true);
     }
     [ApiExplorerSettings(GroupName = "Trial")]
-    public class DownloadAndUploadService : BaseService, IDownloadAndUploadService
+    public class DownloadAndUploadService(
+        IRepository<SystemAnonymization> _systemAnonymizationRepository,
+        IRepository<VisitTask> _visitTaskRepository,
+        IRepository<SubjectVisit> _subjectVisitRepository,
+        IOSSService _oSSService,
+        IRepository<StudyMonitor> _studyMonitorRepository,
+        IDistributedLockProvider _distributedLockProvider) : BaseService, IDownloadAndUploadService
     {
-        private readonly IRepository<SystemAnonymization> _systemAnonymizationRepository;
-        private readonly IRepository<VisitTask> _visitTaskRepository;
-        private readonly IRepository<SubjectVisit> _subjectVisitRepository;
-        private readonly IOSSService _oSSService;
-        private readonly IRepository<StudyMonitor> _studyMonitorRepository;
-        private readonly IDistributedLockProvider _distributedLockProvider;
-        public DownloadAndUploadService(IRepository<SystemAnonymization> systemAnonymizationRepository, IRepository<SubjectVisit> subjectVisitRepository, IOSSService oSSService,
-            IRepository<StudyMonitor> studyMonitorRepository, IDistributedLockProvider distributedLockProvider, IRepository<VisitTask> visitTaskRepository)
-        {
-            _systemAnonymizationRepository = systemAnonymizationRepository;
-
-            _subjectVisitRepository = subjectVisitRepository;
-
-            _oSSService = oSSService;
-            _studyMonitorRepository = studyMonitorRepository;
-            _distributedLockProvider = distributedLockProvider;
-            _visitTaskRepository = visitTaskRepository;
-        }
+     
 
         /// <summary>
         /// 受试者随机阅片，任务进行随机编号

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

@@ -9,22 +9,13 @@ using IRaCIS.Core.Application.Auth;
 namespace IRaCIS.Core.Application.Services
 {
     [AllowAnonymous, ApiExplorerSettings(GroupName = "Image")]
-    public class ImageShareService : BaseService, IImageShareService
+    public class ImageShareService(
+        IRepository<ImageShare> _imageShareRepository,
+        IRepository<DicomStudy> _studyRepository,
+        ITokenService _tokenService) : BaseService, IImageShareService
     {
 
-        private readonly IRepository<ImageShare> _imageShareRepository;
-        private readonly IRepository<DicomStudy> _studyRepository;
-        private readonly IConfiguration _configuration;
-        private readonly ITokenService _tokenService;
-
-        public ImageShareService(IRepository<ImageShare> imageShareRepository, IRepository<DicomStudy> studyRepository, IConfiguration configuration, ITokenService tokenService)
-        {
-
-            _imageShareRepository = imageShareRepository;
-            _studyRepository = studyRepository;
-            _configuration = configuration;
-            _tokenService = tokenService;
-        }
+      
 
         [HttpPost]
         public async Task<IResponseOutput> CreateImageShare(ImageShareCommand imageShareCommand)

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

@@ -8,19 +8,11 @@ namespace IRaCIS.Core.Application.Services
 {
     [ApiExplorerSettings(GroupName = "Image")]
     [AllowAnonymous]
-    public class InstanceService : BaseService, IInstanceService
+    public class InstanceService(
+        IRepository<DicomInstance> _instanceRepository
+       ) : BaseService, IInstanceService
     {
-        private readonly IRepository<DicomInstance> _instanceRepository;
-        private readonly IRepository<DicomStudy> _studyRepository;
-        //private readonly IRepository<KeyInstance> _keyInstanceRepository;
-        public InstanceService(IRepository<DicomInstance> instanceRepository, IRepository<DicomStudy> studyRepository
-            //,IRepository<KeyInstance> keyInstanceRepository 
-            )
-        {
-            _instanceRepository = instanceRepository;
-            _studyRepository = studyRepository;
-            //_keyInstanceRepository = keyInstanceRepository;
-        }
+
 
         /// <summary> 指定资源Id，获取Dicom序列所属的实例信息列表 </summary>
         /// <param name="seriesId"> Dicom序列的Id </param>
@@ -49,7 +41,7 @@ namespace IRaCIS.Core.Application.Services
             //    return _keyInstanceRepository.Where(s => s.TpCode == tpCode).Select(t => t.InstanceId).Distinct();
             //}
             //else
-                return _instanceRepository.Where(s => s.SeriesId == seriesId).OrderBy(s => s.InstanceNumber).Select(t => t.Id);
+            return _instanceRepository.Where(s => s.SeriesId == seriesId).OrderBy(s => s.InstanceNumber).Select(t => t.Id);
         }
 
         [AllowAnonymous]
@@ -58,7 +50,7 @@ namespace IRaCIS.Core.Application.Services
         {
             var path = string.Empty;
 
-             path = (await _instanceRepository.Where(s => s.Id == instanceId).Select(t => t.Path).FirstOrDefaultAsync()).IfNullThrowException();
+            path = (await _instanceRepository.Where(s => s.Id == instanceId).Select(t => t.Path).FirstOrDefaultAsync()).IfNullThrowException();
 
             var physicalPath = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, path);
 
@@ -78,7 +70,7 @@ namespace IRaCIS.Core.Application.Services
         public async Task<FileContentResult> Content(Guid instanceId)
         {
             var filePath = string.Empty;
-            var path = (await _instanceRepository.Where(s => s.Id == instanceId).Select(t=>t.Path).FirstOrDefaultAsync()).IfNullThrowException();
+            var path = (await _instanceRepository.Where(s => s.Id == instanceId).Select(t => t.Path).FirstOrDefaultAsync()).IfNullThrowException();
 
 
             var physicalPath = FileStoreHelper.GetPhysicalFilePath(_hostEnvironment, path);
@@ -93,6 +85,6 @@ namespace IRaCIS.Core.Application.Services
             }
         }
 
-     
+
     }
 }

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

@@ -8,23 +8,12 @@ namespace IRaCIS.Core.Application.Services
 {
     [ApiExplorerSettings(GroupName = "Image")]
     [AllowAnonymous]
-    public class SeriesService : BaseService
+    public class SeriesService(
+        IRepository<DicomSeries> _seriesRepository,
+        IRepository<DicomInstance> _instanceRepository
+        ) : BaseService
     {
-        //private readonly IRepository<KeyInstance> _keyInstanceRepository;
-       // private readonly IRepository<ImageLabel> _imageLabelRepository;
-
-        private readonly IRepository<DicomSeries> _seriesRepository;
-        private readonly IRepository<DicomInstance> _instanceRepository;
-        private readonly IRepository<DicomStudy> _studyRepository;
-        public SeriesService(IRepository<DicomInstance> instanceRepository, IRepository<DicomStudy> studyRepository, IRepository<DicomSeries> seriesRepository
-           /* IRepository<KeyInstance> keyInstanceRepository,  IRepository<ImageLabel> imageLabelRepository*/)
-        {
-            _seriesRepository = seriesRepository;
-            _instanceRepository = instanceRepository;
-            _studyRepository = studyRepository;
-            //_keyInstanceRepository = keyInstanceRepository;
-            //_imageLabelRepository = imageLabelRepository;
-        }
+        
 
 
 

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

@@ -22,34 +22,17 @@ using ZiggyCreatures.Caching.Fusion;
 namespace IRaCIS.Core.Application.Service.ImageAndDoc
 {
     [ApiExplorerSettings(GroupName = "Image")]
-    public class StudyService : BaseService, IStudyService
+    public class StudyService(
+        IRepository<SubjectVisit> _subjectVisitRepository,
+        IRepository<DicomInstance> _dicomInstanceRepository,
+        IRepository<DicomSeries> _dicomSeriesRepository,
+        IRepository<DicomStudy> _dicomstudyRepository,
+        IRepository<Dictionary> _dictionaryRepository,
+        IRepository<StudyMonitor> _studyMonitorRepository,
+        IDistributedLockProvider _distributedLockProvider) : BaseService, IStudyService
     {
 
 
-
-        private readonly IRepository<SubjectVisit> _subjectVisitRepository;
-        private readonly IRepository<DicomInstance> _dicomInstanceRepository;
-        private readonly IRepository<DicomSeries> _dicomSeriesRepository;
-        private readonly IRepository<DicomStudy> _dicomstudyRepository;
-        private readonly IRepository<Dictionary> _dictionaryRepository;
-
-        private readonly IRepository<StudyMonitor> _studyMonitorRepository;
-        private readonly IDistributedLockProvider _distributedLockProvider;
-
-        public StudyService(IRepository<SubjectVisit> subjectVisitRepository,
-            IRepository<DicomInstance> dicomInstanceRepository,
-            IRepository<DicomSeries> dicomSeriesRepository, IRepository<DicomStudy> dicomstudyRepository, IRepository<Dictionary> dictionaryRepository, IRepository<StudyMonitor> studyMonitorRepository, IDistributedLockProvider distributedLockProvider)
-        {
-            _subjectVisitRepository = subjectVisitRepository;
-            _dicomInstanceRepository = dicomInstanceRepository;
-            _dicomSeriesRepository = dicomSeriesRepository;
-            _dicomstudyRepository = dicomstudyRepository;
-            _dictionaryRepository = dictionaryRepository;
-            _studyMonitorRepository = studyMonitorRepository;
-            _distributedLockProvider = distributedLockProvider;
-        }
-
-
         private void SpecialArchiveStudyDeal(DicomStudy study)
         {
             #region 特殊逻辑

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

@@ -14,14 +14,9 @@ namespace IRaCIS.Core.Application.Service
     /// SystemAnonymizationService
     /// </summary>	
     [ApiExplorerSettings(GroupName = "Image")]
-    public class SystemAnonymizationService : BaseService, ISystemAnonymizationService
+    public class SystemAnonymizationService(IRepository<SystemAnonymization> systemAnonymizationRepository) : BaseService, ISystemAnonymizationService
     {
-        private readonly IRepository<SystemAnonymization> systemAnonymizationRepository;
 
-        public SystemAnonymizationService( IRepository<SystemAnonymization> systemAnonymizationRepository)
-        {
-            this.systemAnonymizationRepository = systemAnonymizationRepository;
-        }
 
         [HttpPost]
         public async Task<PageOutput<SystemAnonymizationView>> GetSystemAnonymizationList(SystemAnonymizationQuery inQuery)