From 333763b3e19c8a1305f17ecd5cc6d49fa8468814 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Fri, 1 Dec 2023 09:39:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AD=A6=E5=91=8A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Financial/CalculateService.cs | 4 +--- .../Service/ImageAndDoc/DicomArchiveService.cs | 3 --- .../Service/Inspection/FrontAuditConfigService.cs | 4 ++-- .../Reading/ClinicalData/ClinicalQuestionService.cs | 2 ++ .../ReadingCriterion/ReadingQuestionService.cs | 3 ++- .../ReadingImageTask/ReadingImageTaskService.cs | 11 ++++++++++- .../Triggers/SubjectStateTrigger.cs | 6 +----- .../Triggers/SubjectVisitFinalVisitTrigger.cs | 4 +--- 8 files changed, 19 insertions(+), 18 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Financial/CalculateService.cs b/IRaCIS.Core.Application/Service/Financial/CalculateService.cs index 4fdc05643..85c85ae80 100644 --- a/IRaCIS.Core.Application/Service/Financial/CalculateService.cs +++ b/IRaCIS.Core.Application/Service/Financial/CalculateService.cs @@ -25,7 +25,6 @@ namespace IRaCIS.Application.Services private readonly IRepository _exchangeRateRepository; private readonly IRepository _payAdjustmentRepository; private readonly IRepository _enrollRepository; - private readonly IMapper _mapper; public CalculateService(IRepository paymentRepository, IRepository trialPaymentPriceRepository, IRepository reviewerPayInfoRepository, @@ -37,7 +36,7 @@ namespace IRaCIS.Application.Services IVolumeRewardService volumeRewardService, IRepository exchangeRateRepository, IRepository EnrollRepository, - IRepository paymentAdjustmentRepository, IMapper mapper) + IRepository paymentAdjustmentRepository) { _paymentRepository = paymentRepository; _trialPaymentRepository = trialPaymentPriceRepository; @@ -51,7 +50,6 @@ namespace IRaCIS.Application.Services _exchangeRateRepository = exchangeRateRepository; _payAdjustmentRepository = paymentAdjustmentRepository; this._enrollRepository = EnrollRepository; - _mapper = mapper; } /// diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs index 9d9bd7cc6..69929b1da 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DicomArchiveService.cs @@ -20,7 +20,6 @@ namespace IRaCIS.Core.Application.Services private readonly IRepository _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 studyRepository, IRepository seriesRepository, IRepository instanceRepository, - IWebHostEnvironment hostEnvironment, IRepository dictionaryRepository, IEasyCachingProvider provider, IDistributedLockProvider distributedLockProvider) { _distributedLockProvider = distributedLockProvider; - _hostEnvironment = hostEnvironment; _studyRepository = studyRepository; _seriesRepository = seriesRepository; diff --git a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs index 936cb0421..474cd4590 100644 --- a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs @@ -214,11 +214,11 @@ namespace IRaCIS.Core.Application.Service - /// /// 翻译稽查数据 /// - /// 传入Dto + /// + /// /// private async Task> SetInspectionEnumValueDataList(SetInspectionEnumValueDto dto, Guid currentInspectionId) { diff --git a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs index a7db793c1..93e63756f 100644 --- a/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalQuestionService.cs @@ -169,6 +169,8 @@ namespace IRaCIS.Core.Application.Service /// /// /// + /// + /// public void FindChildQuestion(ClinicalQuestionPreviewDto item, List questions, List tableQuestions,List answers, List tableAnswers) { item.Childrens = questions.Where(x => (x.ParentId == item.Id)||(x.GroupId== item.Id&&x.ParentId==null)).OrderBy(x => x.ShowOrder).ToList(); diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs index 807e61cf4..90df4ca8b 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingQuestionService.cs @@ -485,11 +485,12 @@ namespace IRaCIS.Application.Services } /// - /// 验证计算关系 + /// 验证计算关系 /// /// /// /// + /// /// private void VerifyCalculateRelation(List relationList,Guid QuestionId,Guid originalId,int count=1) { diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 77714dd39..f39992137 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -737,6 +737,8 @@ namespace IRaCIS.Application.Services /// /// /// + /// + /// /// [NonDynamicMethod] public async Task> GetReadingQuestion(Guid trialReadingCriterionId, Guid? visitTaskId, QuestionClassify? questionClassify, List? groupClassifyList) @@ -1188,11 +1190,18 @@ namespace IRaCIS.Application.Services } /// - /// 获取子元素 + /// 获取子元素 /// /// /// /// + /// + /// + /// + /// + /// + /// + /// private async void FindChildQuestion(TrialReadQuestionData item, List questionlists, List tableQuestionLists, List tableAnswers, List tableAnsweRowInfos, List organInfos, List baseLineTableAnswer,bool isFirstChangeTask, List lastTaskTableAnswer,Guid? TaskId) { item.Childrens = questionlists.Where(x => x.ParentId == item.Id || (x.GroupId == item.Id && x.ParentId == null)).ToList(); diff --git a/IRaCIS.Core.Application/Triggers/SubjectStateTrigger.cs b/IRaCIS.Core.Application/Triggers/SubjectStateTrigger.cs index a6e41756f..765de8984 100644 --- a/IRaCIS.Core.Application/Triggers/SubjectStateTrigger.cs +++ b/IRaCIS.Core.Application/Triggers/SubjectStateTrigger.cs @@ -12,14 +12,10 @@ namespace IRaCIS.Core.Application.Triggers public class SubjectStateTrigger :BaseService, IAfterSaveTrigger { private readonly IRepository _subjectVisitRepository; - private readonly IRepository _repository; - private readonly IMapper _mapper; - public SubjectStateTrigger(IRepository subjectVisitRepository, IRepository repository, IMapper mapper) + public SubjectStateTrigger(IRepository subjectVisitRepository) { _subjectVisitRepository = subjectVisitRepository; - _repository = repository; - _mapper = mapper; } public async Task AfterSave(ITriggerContext context, CancellationToken cancellationToken) diff --git a/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs b/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs index 7483c9b7b..6c2073461 100644 --- a/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs +++ b/IRaCIS.Core.Application/Triggers/SubjectVisitFinalVisitTrigger.cs @@ -19,7 +19,6 @@ namespace IRaCIS.Core.Application.Triggers private readonly IRepository _subjectRepository; private readonly IRepository _visitTaskRepository; private readonly IVisitTaskHelpeService _ivisitTaskHelpeService; - private readonly IRepository _repository; public SubjectVisitFinalVisitTrigger(IRepository subjectVisitRepository, @@ -28,7 +27,7 @@ namespace IRaCIS.Core.Application.Triggers IRepository visitTaskRepository, IVisitTaskHelpeService visitTaskHelpeService, IRepository readModuleRepository, - IRepository subjectRepository, IRepository repository) + IRepository 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 context, CancellationToken cancellationToken)