Merge branch 'Test.IRC' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test.IRC

IRaCIS.Core.Application/Service/Financial/CalculateService.cs

@@ -25,7 +25,6 @@ namespace IRaCIS.Application.Services
         private readonly IRepository<ExchangeRate> _exchangeRateRepository;
         private readonly IRepository<PaymentAdjustment> _payAdjustmentRepository;
         private readonly IRepository<Enroll> _enrollRepository;
-        private readonly IMapper _mapper;
 
         public CalculateService(IRepository<Payment> paymentRepository, IRepository<TrialPaymentPrice> trialPaymentPriceRepository,
             IRepository<ReviewerPayInformation> reviewerPayInfoRepository,
@@ -37,7 +36,7 @@ namespace IRaCIS.Application.Services
             IVolumeRewardService volumeRewardService,
             IRepository<ExchangeRate> exchangeRateRepository,
             IRepository<Enroll> EnrollRepository,
-            IRepository<PaymentAdjustment> paymentAdjustmentRepository, IMapper mapper)
+            IRepository<PaymentAdjustment> paymentAdjustmentRepository)
         {
             _paymentRepository = paymentRepository;
             _trialPaymentRepository = trialPaymentPriceRepository;
@@ -51,7 +50,6 @@ namespace IRaCIS.Application.Services
             _exchangeRateRepository = exchangeRateRepository;
             _payAdjustmentRepository = paymentAdjustmentRepository;
             this._enrollRepository = EnrollRepository;
-            _mapper = mapper;
         }
 
         /// <summary>

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

@@ -20,7 +20,6 @@ namespace IRaCIS.Core.Application.Services
         private readonly IRepository<Dictionary> _dictionaryRepository;
         private readonly IEasyCachingProvider _provider;
 
-        private readonly IWebHostEnvironment _hostEnvironment;
 
         private readonly IDistributedLockProvider _distributedLockProvider;
 
@@ -30,12 +29,10 @@ namespace IRaCIS.Core.Application.Services
         public DicomArchiveService(IRepository<DicomStudy> studyRepository,
             IRepository<DicomSeries> seriesRepository,
             IRepository<DicomInstance> instanceRepository,
-            IWebHostEnvironment hostEnvironment,
             IRepository<Dictionary> dictionaryRepository,
             IEasyCachingProvider provider, IDistributedLockProvider distributedLockProvider)
         {
             _distributedLockProvider = distributedLockProvider;
-            _hostEnvironment = hostEnvironment;
             _studyRepository = studyRepository;
 
             _seriesRepository = seriesRepository;

IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs

@@ -214,11 +214,11 @@ namespace IRaCIS.Core.Application.Service
 
 
 
-
         /// <summary>
         /// 翻译稽查数据
         /// </summary>
-        /// <param name="dto">传入Dto</param>
+        /// <param name="dto"></param>
+        /// <param name="currentInspectionId"></param>
         /// <returns></returns>
         private async Task<List<string>> SetInspectionEnumValueDataList(SetInspectionEnumValueDto dto, Guid currentInspectionId)
         {

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

@@ -169,6 +169,8 @@ namespace IRaCIS.Core.Application.Service
         /// <param name="item"></param>
         /// <param name="questions"></param>
         /// <param name="tableQuestions"></param>
+        /// <param name="answers"></param>
+        /// <param name="tableAnswers"></param>
         public void FindChildQuestion(ClinicalQuestionPreviewDto item, List<ClinicalQuestionPreviewDto> questions, List<ClinicalTablePreviewDto> tableQuestions,List<ClinicalFormQuestionAnswer> answers, List<ClinicalFormTableQuestionAnswer> tableAnswers)
         {
             item.Childrens = questions.Where(x => (x.ParentId == item.Id)||(x.GroupId== item.Id&&x.ParentId==null)).OrderBy(x => x.ShowOrder).ToList();

IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs

@@ -485,11 +485,12 @@ namespace IRaCIS.Application.Services
         }
 
         /// <summary>
-        /// 验证计算关系
+        ///  验证计算关系
         /// </summary>
         /// <param name="relationList"></param>
         /// <param name="QuestionId"></param>
         /// <param name="originalId"></param>
+        /// <param name="count"></param>
         /// <exception cref="BusinessValidationFailedException"></exception>
         private void VerifyCalculateRelation(List<CalculateRelationDto> relationList,Guid QuestionId,Guid originalId,int count=1)
         {

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -737,6 +737,8 @@ namespace IRaCIS.Application.Services
         /// </summary>
         /// <param name="trialReadingCriterionId"></param>
         /// <param name="visitTaskId"></param>
+        /// <param name="questionClassify"></param>
+        /// <param name="groupClassifyList"></param>
         /// <returns></returns>
         [NonDynamicMethod]
         public async Task<List<DicomReadingQuestionAnswer>> GetReadingQuestion(Guid trialReadingCriterionId, Guid? visitTaskId, QuestionClassify? questionClassify, List<GroupClassify>? groupClassifyList)
@@ -1188,11 +1190,18 @@ namespace IRaCIS.Application.Services
         }
 
         /// <summary>
-        /// 获取子元素
+        ///  获取子元素
         /// </summary>
         /// <param name="item"></param>
         /// <param name="questionlists"></param>
         /// <param name="tableQuestionLists"></param>
+        /// <param name="tableAnswers"></param>
+        /// <param name="tableAnsweRowInfos"></param>
+        /// <param name="organInfos"></param>
+        /// <param name="baseLineTableAnswer"></param>
+        /// <param name="isFirstChangeTask"></param>
+        /// <param name="lastTaskTableAnswer"></param>
+        /// <param name="TaskId"></param>
         private async void FindChildQuestion(TrialReadQuestionData item, List<TrialReadQuestionData> questionlists, List<TableQuestionTrial> tableQuestionLists, List<ReadingTableQuestionAnswerInfo> tableAnswers, List<TableAnsweRowInfo> tableAnsweRowInfos, List<OrganInfo> organInfos, List<ReadingTableQuestionAnswer> baseLineTableAnswer,bool isFirstChangeTask, List<ReadingTableQuestionAnswer> lastTaskTableAnswer,Guid? TaskId)
         {
             item.Childrens = questionlists.Where(x => x.ParentId == item.Id || (x.GroupId == item.Id && x.ParentId == null)).ToList();

IRaCIS.Core.Application/Triggers/SubjectStateTrigger.cs

@@ -12,14 +12,10 @@ namespace IRaCIS.Core.Application.Triggers
     public class SubjectStateTrigger :BaseService, IAfterSaveTrigger<Subject>
     {
         private readonly IRepository<SubjectVisit> _subjectVisitRepository;
-        private readonly IRepository _repository;
-        private readonly IMapper _mapper;
 
-        public SubjectStateTrigger(IRepository<SubjectVisit> subjectVisitRepository, IRepository repository, IMapper mapper)
+        public SubjectStateTrigger(IRepository<SubjectVisit> subjectVisitRepository)
         {
             _subjectVisitRepository = subjectVisitRepository;
-            _repository = repository;
-            _mapper = mapper;
         }
 
         public async Task AfterSave(ITriggerContext<Subject> context, CancellationToken cancellationToken)

IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs

@@ -19,7 +19,6 @@ namespace IRaCIS.Core.Application.Triggers
         private readonly IRepository<Subject> _subjectRepository;
         private readonly IRepository<VisitTask> _visitTaskRepository;
         private readonly IVisitTaskHelpeService _ivisitTaskHelpeService;
-        private readonly IRepository _repository;
 
         public SubjectVisitFinalVisitTrigger(IRepository<SubjectVisit> subjectVisitRepository,
 
@@ -28,7 +27,7 @@ namespace IRaCIS.Core.Application.Triggers
                 IRepository<VisitTask> visitTaskRepository,
                 IVisitTaskHelpeService visitTaskHelpeService,
                  IRepository<ReadModule> readModuleRepository,
-            IRepository<Subject> subjectRepository, IRepository repository)
+            IRepository<Subject> subjectRepository)
         {
             _subjectVisitRepository = subjectVisitRepository;
             this._readingPeriodSetRepository = readingPeriodSetRepository;
@@ -37,7 +36,6 @@ namespace IRaCIS.Core.Application.Triggers
             this._readingPeriodPlanRepository = readingPeriodPlanRepository;
             this._readModuleRepository = readModuleRepository;
             _subjectRepository = subjectRepository;
-            _repository = repository;
         }
 
         public async Task AfterSave(ITriggerContext<SubjectVisit> context, CancellationToken cancellationToken)