构造函数优化

2024-08-22 21:37:56 +08:00
parent 47ec4a5e7e
commit 22b1a839ba
102 changed files with 1111 additions and 2866 deletions
@@ -46,27 +46,17 @@ using DocumentFormat.OpenXml.InkML;
 namespace IRaCIS.Application.Services
 {
    [ApiExplorerSettings(GroupName = "Trial")]
-    public class PatientService : BaseService
+    public class PatientService(
+        IRepository<Trial> _trialRepository,
+        IRepository<SCPPatient> _patientRepository,
+        IRepository<SCPStudy> _scpStudyRepository,
+        IRepository<Subject> _subjectRepository,
+        IRepository<SubjectVisit> _subjectVisitRepository,
+        IRepository<Dictionary> _dictionaryRepository,
+        IDistributedLockProvider _distributedLockProvider) : BaseService
    {

-        private readonly IRepository<Trial> _trialRepository;
-        private readonly IRepository<SCPPatient> _patientRepository;
-        private readonly IRepository<SCPStudy> _scpStudyRepository;
-        private readonly IRepository<Subject> _subjectRepository;
-        private readonly IRepository<SubjectVisit> _subjectVisitRepository;
-        private readonly IRepository<Dictionary> _dictionaryRepository;
-        private readonly IDistributedLockProvider _distributedLockProvider;
-
-        public PatientService(IRepository<SCPStudy> studyRepository, IRepository<Dictionary> dictionaryRepository, IRepository<Trial> trialRepository, IRepository<SCPPatient> patientRepository, IRepository<Subject> subjectRepository, IRepository<SubjectVisit> subjectVisitRepository, IDistributedLockProvider distributedLockProvider)
-        {
-            _dictionaryRepository = dictionaryRepository;
-            _scpStudyRepository = studyRepository;
-            _trialRepository = trialRepository;
-            _patientRepository = patientRepository;
-            _subjectRepository = subjectRepository;
-            _subjectVisitRepository = subjectVisitRepository;
-            _distributedLockProvider = distributedLockProvider;
-        }
+      


        [HttpGet]
@@ -11,16 +11,11 @@ using IRaCIS.Core.Infrastructure;
 namespace IRaCIS.Application.Services
 {
    [ApiExplorerSettings(GroupName = "Trial")]
-    public class SubjectService : BaseService, ISubjectService
+    public class SubjectService(
+        IRepository<Subject> _subjectRepository,
+        IRepository<SubjectVisit> _subjectVisitRepository) : BaseService, ISubjectService
    {
-        private readonly IRepository<Subject> _subjectRepository;
-        private readonly IRepository<SubjectVisit> _subjectVisitRepository;
-
-        public SubjectService(IRepository<Subject> subjectRepository, IRepository<SubjectVisit> subjectVisitRepository)
-        {
-            _subjectRepository = subjectRepository;
-            _subjectVisitRepository = subjectVisitRepository;
-        }
+       

        /// <summary>
        ///  添加或更新受试者信息[New]
@@ -20,67 +20,20 @@ using NPOI.SS.Formula.Functions;
 namespace IRaCIS.Core.Application.Services
 {
    [ApiExplorerSettings(GroupName = "Trial")]
-    public class SubjectVisitService : BaseService, ISubjectVisitService
+    public class SubjectVisitService(
+        IRepository<SubjectVisit> _subjectVisitRepository,
+        IRepository<Trial> _trialRepository,
+        IRepository<NoneDicomStudy> _noneDicomStudyRepository,
+        IRepository<VisitTask> _visitTaskRepository,
+        IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository,
+        IRepository<ReadingCustomTag> _readingCustomTagRepository,
+        IRepository<NoneDicomStudyFile> _noneDicomStudyFileRepository,
+        IRepository<Subject> _subjectRepository,
+        IServiceProvider _serviceProvider,
+        IRepository<ReadingQuestionCriterionTrial> _trialReadingCriterionRepository
+       ) : BaseService, ISubjectVisitService
    {
-        private readonly IRepository<SubjectVisit> _subjectVisitRepository;
-        private readonly IRepository<ClinicalDataTrialSet> _clinicalDataTrialSetRepository;
-        private readonly IRepository<ReadingClinicalData> _readingClinicalDataRepository;
-        private readonly IRepository<ReadModule> _readModuleRepository;
-        private readonly IRepository<Trial> _trialRepository;
-        private readonly IRepository<ReadingPeriodSet> _readingPeriodSetRepository;
-        private readonly IRepository<NoneDicomStudy> _noneDicomStudyRepository;
-        private readonly IRepository<DicomInstance> _dicomInstanceRepository;
-        private readonly IRepository<VisitTask> _visitTaskRepository;
-        private readonly IRepository<ReadingTableAnswerRowInfo> _readingTableAnswerRowInfoRepository;
-        private readonly IRepository<ReadingCustomTag> _readingCustomTagRepository;
-        private readonly IRepository<NoneDicomStudyFile> _noneDicomStudyFileRepository;
-        private readonly IRepository<ReadingPeriodPlan> _readingPeriodPlanRepository;
-        private readonly IRepository<Subject> _subjectRepository;
-        private readonly IServiceProvider iServiceProvider;
-        private readonly IRepository<ReadingQuestionCriterionTrial> _trialReadingCriterionRepository;
-        private readonly IRepository<SubjectCriteriaEvaluationVisitStudyFilter> _subjectCriteriaEvaluationVisitStudyFilterRepository;
-
-        public SubjectVisitService(IRepository<SubjectVisit> subjectVisitRepository,
-              IRepository<ClinicalDataTrialSet> clinicalDataTrialSetRepository,
-            IRepository<ReadingClinicalData> readingClinicalDataRepository,
-            IRepository<ReadModule> readModuleRepository,
-             IRepository<Trial> trialRepository,
-               IServiceProvider IServiceProvider,
-             IRepository<ReadingPeriodSet> readingPeriodSetRepository,
-              IRepository<NoneDicomStudy> noneDicomStudyRepository,
-                 IRepository<DicomInstance> dicomInstanceRepository,
-                IRepository<VisitTask> visitTaskRepository,
-                   IRepository<ReadingTableAnswerRowInfo> readingTableAnswerRowInfoRepository,
-                     IRepository<ReadingCustomTag> readingCustomTagRepository,
-              IRepository<NoneDicomStudyFile> noneDicomStudyFileRepository,
-              IRepository<ReadingPeriodPlan> readingPeriodPlanRepository,
-            IRepository<Subject> subjectRepository,
-
-        IRepository<ReadingQuestionCriterionTrial> trialReadingCriterionRepository,
-             IRepository<SubjectCriteriaEvaluationVisitStudyFilter> subjectCriteriaEvaluationVisitStudyFilterRepository
-
-            )
-        {
-            this.iServiceProvider = IServiceProvider;
-            _subjectVisitRepository = subjectVisitRepository;
-            this._clinicalDataTrialSetRepository = clinicalDataTrialSetRepository;
-            this._readingClinicalDataRepository = readingClinicalDataRepository;
-            this._readModuleRepository = readModuleRepository;
-            this._trialRepository = trialRepository;
-            this._readingPeriodSetRepository = readingPeriodSetRepository;
-            this._noneDicomStudyRepository = noneDicomStudyRepository;
-            this._dicomInstanceRepository = dicomInstanceRepository;
-            this._visitTaskRepository = visitTaskRepository;
-            this._readingTableAnswerRowInfoRepository = readingTableAnswerRowInfoRepository;
-            this._readingCustomTagRepository = readingCustomTagRepository;
-            this._noneDicomStudyFileRepository = noneDicomStudyFileRepository;
-            this._readingPeriodPlanRepository = readingPeriodPlanRepository;
-            _subjectRepository = subjectRepository;
-            _trialReadingCriterionRepository = trialReadingCriterionRepository;
-            _subjectCriteriaEvaluationVisitStudyFilterRepository = subjectCriteriaEvaluationVisitStudyFilterRepository;
-
-
-        }
+       

        [HttpPost]
        [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
@@ -360,7 +313,7 @@ namespace IRaCIS.Core.Application.Services



-            var pastResultList = await this.iServiceProvider.GetService<IReadingImageTaskService>().GetReadingPastResultList(new GetReadingPastResultListInDto()
+            var pastResultList = await _serviceProvider.GetService<IReadingImageTaskService>().GetReadingPastResultList(new GetReadingPastResultListInDto()
            {
                VisitTaskId = inDto.VisitTaskId
            });
@@ -11,27 +11,15 @@ using MiniExcelLibs;
 namespace IRaCIS.Application.Services
 {
    [ApiExplorerSettings(GroupName = "Trial")]
-    public class VisitPlanService : BaseService, IVisitPlanService
+    public class VisitPlanService(
+        IRepository<VisitStage> _visitStageRepository,
+        IRepository<Trial> _trialRepository,
+        IRepository<SubjectVisit> _subjectVisitRepository,
+        IRepository<VisitPlanInfluenceStudy> _influnceRepository,
+        IRepository<Subject> _subjectRepository,
+        IRepository<VisitPlanInfluenceStat> _visitPlanInfluenceStatRepository) : BaseService, IVisitPlanService
    {
-        private readonly IRepository<VisitStage> _visitStageRepository;
-        private readonly IRepository<Trial> _trialRepository;
-        private readonly IRepository<SubjectVisit> _subjectVisitRepository;
-        private readonly IRepository<VisitPlanInfluenceStudy> _influnceRepository;
-        private readonly IRepository<Subject> _subjectRepository;
-        private readonly IRepository<VisitPlanInfluenceStat> _visitPlanInfluenceStatRepository;
-
-
-
-        public VisitPlanService(IRepository<VisitStage> visitStageRepository, IRepository<Trial> trialRepository, IRepository<SubjectVisit> subjectVisitRepository,
-            IRepository<VisitPlanInfluenceStudy> visitPlanInfluenceStudy, IRepository<Subject> subjectRepository, IRepository<VisitPlanInfluenceStat> visitPlanInfluenceStatRepository)
-        {
-            _visitStageRepository = visitStageRepository;
-            _trialRepository = trialRepository;
-            _subjectVisitRepository = subjectVisitRepository;
-            _influnceRepository = visitPlanInfluenceStudy;
-            _visitPlanInfluenceStatRepository = visitPlanInfluenceStatRepository;
-            _subjectRepository = subjectRepository;
-        }
+       


        ///暂时不用