构造函数优化

IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs

@@ -23,77 +23,27 @@ namespace IRaCIS.Core.Application.Service
     /// 临床答案
     /// </summary>	
     [ApiExplorerSettings(GroupName = "Reading")]
-    public class ClinicalAnswerService :  BaseService, IClinicalAnswerService
-	{
-
-        private readonly IRepository<TrialClinicalQuestion> _trialClinicalQuestionRepository;
-
-        private readonly IRepository<SystemClinicalQuestion> _systemClinicalQuestionRepository;
-
-
-        private readonly IRepository<SystemClinicalTableQuestion> _systemClinicalTableQuestionRepository;
-
-        private readonly IRepository<TrialClinicalTableQuestion> _trialClinicalTableQuestionRepository;
-
-        private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository;
-
-		private readonly IRepository<ClinicalForm> _clinicalFormRepository;
-		private readonly IRepository<Subject> _subjectRepository;
-		private readonly IRepository<ReadModuleCriterionFrom> _readModuleCriterionFromRepository;
-		private readonly IRepository<ReadModule> _readModuleRepository;
-		private readonly IRepository<DicomStudy> _dicomStudyRepository;
-		private readonly IRepository<ClinicalQuestionAnswer> _clinicalQuestionAnswerRepository;
-
-        private readonly IRepository<ClinicalTableAnswer> _clinicalTableAnswerRepository;
-
-        private readonly IRepository<ClinicalAnswerRowInfo> _clinicalAnswerRowInfoRepository;
-
-		private readonly IRepository<ReadingClinicalData> _readingClinicalDataRepository;
-		private readonly IRepository<SubjectVisit> _subjectVisitRepository;
-
-		private readonly IClinicalQuestionService _iClinicalQuestionService;
-
-        private readonly IReadingClinicalDataService _iReadingClinicalDataService;
-
-
-        public ClinicalAnswerService(IRepository<TrialClinicalQuestion> trialClinicalQuestionRepository,
-            IRepository<SystemClinicalTableQuestion> systemClinicalTableQuestionRepository,
-            IRepository<TrialClinicalTableQuestion> trialClinicalTableQuestionRepository,
-			IRepository<ReadingClinicalData> readingClinicalDataRepository,
-		IRepository<ClinicalForm> clinicalFormRepository,
-		IRepository<Subject> subjectRepository,
-        IReadingClinicalDataService iReadingClinicalDataService,
-            IRepository<ReadModuleCriterionFrom> readModuleCriterionFromRepository,
-			IRepository<ReadModule> readModuleRepository,
-				IRepository<DicomStudy> dicomStudyRepository,
-		IRepository<SubjectVisit> subjectVisitRepository,
-			IRepository<ClinicalTableAnswer> clinicalTableAnswerRepository,
-             IRepository<ClinicalQuestionAnswer> clinicalQuestionAnswerRepository,
-                IClinicalQuestionService iClinicalQuestionService,
-                IRepository<ClinicalAnswerRowInfo> clinicalAnswerRowInfoRepository,
-        IRepository<ClinicalDataTrialSet> clinicalDataTrialSetRepository,
-			IRepository<SystemClinicalQuestion> systemClinicalQuestionRepository
-            )
-        {
-            _subjectVisitRepository = subjectVisitRepository;
-			_readingClinicalDataRepository = readingClinicalDataRepository;
-			_clinicalAnswerRowInfoRepository = clinicalAnswerRowInfoRepository;
-            _clinicalQuestionAnswerRepository = clinicalQuestionAnswerRepository;
-            _systemClinicalTableQuestionRepository = systemClinicalTableQuestionRepository;
-            _trialClinicalQuestionRepository = trialClinicalQuestionRepository;
-            _trialClinicalTableQuestionRepository = trialClinicalTableQuestionRepository;
-            _systemClinicalQuestionRepository = systemClinicalQuestionRepository;
-            _clinicalDataTrialSetRepository = clinicalDataTrialSetRepository;
-            _iReadingClinicalDataService = iReadingClinicalDataService;
-                _clinicalFormRepository = clinicalFormRepository;
-			this._subjectRepository = subjectRepository;
-			this._readModuleCriterionFromRepository = readModuleCriterionFromRepository;
-			this._readModuleRepository = readModuleRepository;
-			this._dicomStudyRepository = dicomStudyRepository;
-			_clinicalTableAnswerRepository = clinicalTableAnswerRepository;
-            _iClinicalQuestionService = iClinicalQuestionService;
-        }
+    public class ClinicalAnswerService(
+        IRepository<TrialClinicalQuestion> _trialClinicalQuestionRepository,
+        IRepository<SystemClinicalQuestion> _systemClinicalQuestionRepository,
+        IRepository<SystemClinicalTableQuestion> _systemClinicalTableQuestionRepository,
+        IRepository<TrialClinicalTableQuestion> _trialClinicalTableQuestionRepository,
+        IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository,
+        IRepository<ClinicalForm> _clinicalFormRepository,
+        IRepository<Subject> _subjectRepository,
+        IRepository<ReadModuleCriterionFrom> _readModuleCriterionFromRepository,
+        IRepository<ReadModule> _readModuleRepository,
+        IRepository<DicomStudy> _dicomStudyRepository,
+        IRepository<ClinicalQuestionAnswer> _clinicalQuestionAnswerRepository,
+        IRepository<ClinicalTableAnswer> _clinicalTableAnswerRepository,
+        IRepository<ClinicalAnswerRowInfo> _clinicalAnswerRowInfoRepository,
+        IRepository<ReadingClinicalData> _readingClinicalDataRepository,
+        IRepository<SubjectVisit> _subjectVisitRepository,
+        IClinicalQuestionService _iClinicalQuestionService,
+        IReadingClinicalDataService _iReadingClinicalDataService) : BaseService, IClinicalAnswerService
+    {
 
+       
         /// <summary>
         /// CRC签名临床数据
         /// </summary>

IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalDataSetService.cs

@@ -16,50 +16,20 @@ namespace IRaCIS.Application.Services
     /// 临床数据配置
     /// </summary>
     [ApiExplorerSettings(GroupName = "Reading")]
-    public class ClinicalDataSetService : BaseService
+    public class ClinicalDataSetService(
+        IClinicalQuestionService _iClinicalQuestionService,
+        IRepository<SubjectVisit> _subjectVisitRepository,
+        IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository,
+        IRepository<TrialClinicalDataSetCriterion> _trialClinicalDataSetCriterionRepository,
+        IRepository<ReadingQuestionCriterionTrial> _iReadingQuestionCriterionTrialRepository,
+        IRepository<ClinicalDataSystemSet> _clinicalDataSystemSetRepository,
+        IRepository<PreviousPDF> _previousPDFRepository,
+        IRepository<Dictionary> _dictionaryRepository,
+        IRepository<Trial> _trialRepository,
+        IRepository<TrialClinicalQuestion> _trialClinicalQuestionRepository,
+        IRepository<SystemClinicalQuestion> _systemClinicalQuestionRepository) : BaseService
     {
-        public IClinicalQuestionService _iClinicalQuestionService;
-        public IRepository<SubjectVisit> _subjectVisitRepository;
-
-        private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository;
-		private readonly IRepository<TrialClinicalDataSetCriterion> _trialClinicalDataSetCriterionRepository;
-		private readonly IRepository<ReadingQuestionCriterionTrial> _iReadingQuestionCriterionTrialRepository;
-		private readonly IRepository<ClinicalDataSystemSet> _clinicalDataSystemSetRepository;
-        private readonly IRepository<PreviousPDF> _previousPDFRepository;
-		private readonly IRepository<Dictionary> _dictionaryRepository;
-		private readonly IRepository<Trial> _trialRepository;
-        private readonly IRepository<TrialClinicalQuestion> _trialClinicalQuestionRepository;
-
-        private readonly IRepository<SystemClinicalQuestion> _systemClinicalQuestionRepository;
-
-        public ClinicalDataSetService(IRepository<SubjectVisit> subjectVisitRepository,
-              IClinicalQuestionService iClinicalQuestionService,
-            IRepository<ClinicalDataTrialSet> ClinicalDataTrialSetRepository,
-			  IRepository<TrialClinicalDataSetCriterion> trialClinicalDataSetCriterionRepository,
-				IRepository<ReadingQuestionCriterionTrial> iReadingQuestionCriterionTrialRepository,
-			IRepository<ClinicalDataSystemSet> ClinicalDataSystemSetRepository,
-            IRepository<PreviousPDF> previousPDFRepository,
-			  IRepository<Dictionary> dictionaryRepository,
-              IRepository<TrialClinicalQuestion> trialClinicalQuestionRepository,
-  IRepository<SystemClinicalQuestion> systemClinicalQuestionRepository,
-
-            IRepository<Trial> trialRepository
-
-          
-          )
-        {
-            _iClinicalQuestionService = iClinicalQuestionService;
-            _subjectVisitRepository = subjectVisitRepository;
-            _trialClinicalQuestionRepository = trialClinicalQuestionRepository;
-            _systemClinicalQuestionRepository = systemClinicalQuestionRepository;
-            _clinicalDataTrialSetRepository = ClinicalDataTrialSetRepository;
-			this._trialClinicalDataSetCriterionRepository = trialClinicalDataSetCriterionRepository;
-			this._iReadingQuestionCriterionTrialRepository = iReadingQuestionCriterionTrialRepository;
-			_clinicalDataSystemSetRepository = ClinicalDataSystemSetRepository;
-            this._previousPDFRepository = previousPDFRepository;
-			this._dictionaryRepository = dictionaryRepository;
-			this._trialRepository = trialRepository;
-        }
+       
 
 
         /// <summary>

IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs

@@ -19,30 +19,14 @@ namespace IRaCIS.Core.Application.Service
     /// 临床数据问题
     /// </summary>	
     [ApiExplorerSettings(GroupName = "Reading")]
-    public class ClinicalQuestionService : BaseService, IClinicalQuestionService
+    public class ClinicalQuestionService(
+        IRepository<TrialClinicalQuestion> _trialClinicalQuestionRepository,
+        IRepository<SystemClinicalQuestion> _systemClinicalQuestionRepository,
+        IRepository<SystemClinicalTableQuestion> _systemClinicalTableQuestionRepository,
+        IRepository<TrialClinicalTableQuestion> _trialClinicalTableQuestionRepository) : BaseService, IClinicalQuestionService
     {
 
-        private readonly IRepository<TrialClinicalQuestion> _trialClinicalQuestionRepository;
-
-        private readonly IRepository<SystemClinicalQuestion> _systemClinicalQuestionRepository;
-
-
-        private readonly IRepository<SystemClinicalTableQuestion> _systemClinicalTableQuestionRepository;
-
-        private readonly IRepository<TrialClinicalTableQuestion> _trialClinicalTableQuestionRepository;
-
-        public ClinicalQuestionService(IRepository<TrialClinicalQuestion> trialClinicalQuestionRepository,
-            IRepository<SystemClinicalTableQuestion> systemClinicalTableQuestionRepository,
-            IRepository<TrialClinicalTableQuestion> trialClinicalTableQuestionRepository,
-            IRepository<SystemClinicalQuestion> systemClinicalQuestionRepository
-            )
-        {
-            _systemClinicalTableQuestionRepository = systemClinicalTableQuestionRepository;
-            _trialClinicalQuestionRepository = trialClinicalQuestionRepository;
-            _trialClinicalTableQuestionRepository = trialClinicalTableQuestionRepository;
-            _systemClinicalQuestionRepository = systemClinicalQuestionRepository;
-        }
-
+       
         /// <summary>
         /// 获取问题计算关系 
         /// </summary>
@@ -145,7 +129,7 @@ namespace IRaCIS.Core.Application.Service
 
             result.ForEach(x =>
             {
-                this.FindChildQuestion(x, questions, tableQuestions, new List<ClinicalFormQuestionAnswer>(), new List<ClinicalFormTableQuestionAnswer>());
+                FindChildQuestion(x, questions, tableQuestions, new List<ClinicalFormQuestionAnswer>(), new List<ClinicalFormTableQuestionAnswer>());
             });
 
             return (result, true);
@@ -189,7 +173,7 @@ namespace IRaCIS.Core.Application.Service
 
             result.ForEach(x =>
             {
-                this.FindChildQuestion(x, questions, tableQuestions, new List<ClinicalFormQuestionAnswer>(), new List<ClinicalFormTableQuestionAnswer>());
+                FindChildQuestion(x, questions, tableQuestions, new List<ClinicalFormQuestionAnswer>(), new List<ClinicalFormTableQuestionAnswer>());
             });
 
             return (result, true);
@@ -229,12 +213,12 @@ namespace IRaCIS.Core.Application.Service
 
             item.RelationQuestions.ForEach(x =>
             {
-                this.FindChildQuestion(x, questions, tableQuestions, answers, tableAnswers);
+                FindChildQuestion(x, questions, tableQuestions, answers, tableAnswers);
             });
 
             item.Childrens.ForEach(x =>
             {
-                this.FindChildQuestion(x, questions, tableQuestions, answers, tableAnswers);
+                FindChildQuestion(x, questions, tableQuestions, answers, tableAnswers);
             });
         }
 
@@ -311,7 +295,7 @@ namespace IRaCIS.Core.Application.Service
         [HttpPost]
         public async Task<List<TrialClinicalQuestionDto>> GetTrialClinicalGroupQuestionList(GetTrialGroupDto inDto)
         {
-            return await this._trialClinicalQuestionRepository.Where(x => x.TrialClinicalId == inDto.TrialClinicalId && x.ClinicalQuestionType == "group")
+            return await _trialClinicalQuestionRepository.Where(x => x.TrialClinicalId == inDto.TrialClinicalId && x.ClinicalQuestionType == "group")
                 .ProjectTo<TrialClinicalQuestionDto>(_mapper.ConfigurationProvider).ToListAsync();
         }
 
@@ -327,7 +311,7 @@ namespace IRaCIS.Core.Application.Service
             {
                 "select","radio"
             };
-            return await this._trialClinicalQuestionRepository.Where(x => x.TrialClinicalId == inDto.TrialClinicalId && types.Contains(x.ClinicalQuestionType))
+            return await _trialClinicalQuestionRepository.Where(x => x.TrialClinicalId == inDto.TrialClinicalId && types.Contains(x.ClinicalQuestionType))
               .ProjectTo<TrialClinicalQuestionDto>(_mapper.ConfigurationProvider).ToListAsync();
         }
 
@@ -408,7 +392,7 @@ namespace IRaCIS.Core.Application.Service
         [HttpPost]
         public async Task<List<SystemClinicalQuestionDto>> GetSystemClinicalGroupQuestionList(GetSystemGroupDto inDto)
         {
-            return await this._systemClinicalQuestionRepository.Where(x => x.SystemClinicalId == inDto.SystemClinicalId && x.ClinicalQuestionType == "group")
+            return await _systemClinicalQuestionRepository.Where(x => x.SystemClinicalId == inDto.SystemClinicalId && x.ClinicalQuestionType == "group")
                 .ProjectTo<SystemClinicalQuestionDto>(_mapper.ConfigurationProvider).ToListAsync();
         }
 
@@ -425,7 +409,7 @@ namespace IRaCIS.Core.Application.Service
             {
                 "select","radio"
             };
-            return await this._systemClinicalQuestionRepository.Where(x => x.SystemClinicalId == inDto.SystemClinicalId && types.Contains(x.ClinicalQuestionType))
+            return await _systemClinicalQuestionRepository.Where(x => x.SystemClinicalId == inDto.SystemClinicalId && types.Contains(x.ClinicalQuestionType))
                 .ProjectTo<SystemClinicalQuestionDto>(_mapper.ConfigurationProvider).ToListAsync();
         }
 
@@ -443,7 +427,7 @@ namespace IRaCIS.Core.Application.Service
         public async Task<PageOutput<SystemClinicalTableQuestionDto>> GetSystemClinicalTableQuestionList(SystemClinicalTableQuestionQuery inQuery)
         {
 
-            var systemClinicalTableQuestionQueryable = this._systemClinicalTableQuestionRepository
+            var systemClinicalTableQuestionQueryable = _systemClinicalTableQuestionRepository
              .Where(x => x.QuestionId == inQuery.QuestionId)
              .ProjectTo<SystemClinicalTableQuestionDto>(_mapper.ConfigurationProvider);
 
@@ -504,7 +488,7 @@ namespace IRaCIS.Core.Application.Service
             {
                 "select","radio"
             };
-            return await this._systemClinicalTableQuestionRepository.Where(x => x.QuestionId == inDto.QuestionId && types.Contains(x.ClinicalTableQuestionType))
+            return await _systemClinicalTableQuestionRepository.Where(x => x.QuestionId == inDto.QuestionId && types.Contains(x.ClinicalTableQuestionType))
                 .Where(x => x.Id != inDto.TableQuestionId)
                 .ProjectTo<SystemClinicalTableQuestionDto>(_mapper.ConfigurationProvider).ToListAsync();
         }
@@ -526,7 +510,7 @@ namespace IRaCIS.Core.Application.Service
             {
                 "select","radio"
             };
-            return await this._trialClinicalTableQuestionRepository.Where(x => x.QuestionId == inDto.QuestionId && types.Contains(x.ClinicalTableQuestionType))
+            return await _trialClinicalTableQuestionRepository.Where(x => x.QuestionId == inDto.QuestionId && types.Contains(x.ClinicalTableQuestionType))
                 .Where(x => x.Id != inDto.TableQuestionId)
                 .ProjectTo<TrialClinicalTableQuestionDto>(_mapper.ConfigurationProvider).ToListAsync();
         }
@@ -540,7 +524,7 @@ namespace IRaCIS.Core.Application.Service
         public async Task<PageOutput<TrialClinicalTableQuestionDto>> GetTrialClinicalTableQuestionList(TrialClinicalTableQuestionQuery inQuery)
         {
 
-            var trialClinicalTableQuestionQueryable = this._trialClinicalTableQuestionRepository
+            var trialClinicalTableQuestionQueryable = _trialClinicalTableQuestionRepository
              .Where(x => x.QuestionId == inQuery.QuestionId)
              .ProjectTo<TrialClinicalTableQuestionDto>(_mapper.ConfigurationProvider);
 

IRaCIS.Core.Application/Service/Reading/ClinicalData/ReadingClinicalDataService.cs

@@ -20,65 +20,26 @@ namespace IRaCIS.Application.Services
     /// 阅片临床数据
     /// </summary>
     [ApiExplorerSettings(GroupName = "Reading")]
-    public class ReadingClinicalDataService : BaseService, IReadingClinicalDataService
+    public class ReadingClinicalDataService(
+        IRepository<ReadingClinicalData> _readingClinicalDataRepository,
+        IRepository<ReadingConsistentClinicalData> _readingConsistentClinicalDataRepository,
+        IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository,
+        IRepository<VisitTask> _visitTaskRepository,
+        IRepository<PreviousPDF> _previousPDFRepository,
+        IRepository<SubjectVisit> _subjectVisitRepository,
+        IRepository<PreviousHistory> _previousHistoryRepository,
+        IRepository<ReadModuleCriterionFrom> _readModuleCriterionFromRepository,
+        IRepository<ClinicalForm> _clinicalFormRepository,
+        IRepository<PreviousOther> _previousOtherRepository,
+        IRepository<PreviousSurgery> _previousSurgeryRepository,
+        IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
+        IServiceProvider iServiceProvider,
+        IRepository<Subject> _subjectRepository,
+        IRepository<ReadModule> _readModuleRepository,
+        IRepository<ReadingClinicalDataPDF> _readingClinicalDataPDFRepository,
+        IRepository<ReadingConsistentClinicalDataPDF> _readingConsistentClinicalDataPDFRepository) : BaseService, IReadingClinicalDataService
     {
-        private readonly IRepository<ReadingClinicalData> _readingClinicalDataRepository;
-        private readonly IRepository<ReadingConsistentClinicalData> _readingConsistentClinicalDataRepository;
-        private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository;
-        private readonly IRepository<VisitTask> _visitTaskRepository;
-        private readonly IRepository<PreviousPDF> _previousPDFRepository;
-
-        private readonly IRepository<SubjectVisit> _subjectVisitRepository;
-        private readonly IRepository<PreviousHistory> _previousHistoryRepository;
-        private readonly IRepository<ReadModuleCriterionFrom> _readModuleCriterionFromRepository;
-        private readonly IRepository<ClinicalForm> _clinicalFormRepository;
-        private readonly IRepository<PreviousOther> _previousOtherRepository;
-        private readonly IRepository<PreviousSurgery> _previousSurgeryRepository;
-        private readonly IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository;
-        private readonly IServiceProvider iServiceProvider;
-        private readonly IRepository<Subject> _subjectRepository;
-        private readonly IRepository<ReadModule> _readModuleRepository;
-        private readonly IRepository<ReadingClinicalDataPDF> _readingClinicalDataPDFRepository;
-        private readonly IRepository<ReadingConsistentClinicalDataPDF> _readingConsistentClinicalDataPDFRepository;
-
-        public ReadingClinicalDataService(IRepository<ReadingClinicalData> readingClinicalDataRepository,
-            IRepository<ReadingConsistentClinicalData> readingConsistentClinicalDataRepository,
-            IRepository<ClinicalDataTrialSet> clinicalDataTrialSetRepository,
-             IRepository<PreviousPDF> previousPDFRepository,
-             IRepository<SubjectVisit> subjectVisitRepository,
-             IRepository<PreviousHistory> previousHistoryRepository,
-             IRepository<ReadModuleCriterionFrom> readModuleCriterionFromRepository,
-              IRepository<ClinicalForm> clinicalFormRepository,
-             IRepository<PreviousOther> previousOtherRepository,
-             IRepository<PreviousSurgery> previousSurgeryRepository,
-
-                IRepository<ReadingQuestionCriterionTrial> readingQuestionCriterionTrialRepository,
-             IServiceProvider IServiceProvider,
-               IRepository<Subject> subjectRepository,
-
-                 IRepository<ReadModule> readModuleRepository,
-              IRepository<ReadingClinicalDataPDF> readingClinicalDataPDFRepository,
-                  IRepository<ReadingConsistentClinicalDataPDF> readingConsistentClinicalDataPDFRepository,
-              IRepository<VisitTask> visitTaskRepository)
-        {
-            this._readingClinicalDataRepository = readingClinicalDataRepository;
-            this._readingConsistentClinicalDataRepository = readingConsistentClinicalDataRepository;
-            this._clinicalDataTrialSetRepository = clinicalDataTrialSetRepository;
-            this._previousPDFRepository = previousPDFRepository;
-            this._subjectVisitRepository = subjectVisitRepository;
-            this._previousHistoryRepository = previousHistoryRepository;
-            this._readModuleCriterionFromRepository = readModuleCriterionFromRepository;
-            this._clinicalFormRepository = clinicalFormRepository;
-            this._previousOtherRepository = previousOtherRepository;
-            this._previousSurgeryRepository = previousSurgeryRepository;
-            this._readingQuestionCriterionTrialRepository = readingQuestionCriterionTrialRepository;
-            this.iServiceProvider = IServiceProvider;
-            this._subjectRepository = subjectRepository;
-            this._readModuleRepository = readModuleRepository;
-            this._readingClinicalDataPDFRepository = readingClinicalDataPDFRepository;
-            this._readingConsistentClinicalDataPDFRepository = readingConsistentClinicalDataPDFRepository;
-            this._visitTaskRepository = visitTaskRepository;
-        }
+       
 
 
         #region 临床数据基本增删改