From bae12fcd0a085f145a08cb1fd5cf248492ed1951 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Tue, 18 Oct 2022 15:46:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReadingImageTaskService.cs | 2 -- .../RECIST1Point1CalculateService.cs | 4 ++-- .../TrialSiteUser/TrialConfigService.cs | 22 +++++++++---------- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 3cb710f89..f9c0576a8 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -209,8 +209,6 @@ namespace IRaCIS.Application.Services } - - #endregion diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs index 8e6eb6a99..8666dbacf 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs @@ -299,8 +299,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate var unableEvaluateRowIds = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.Answer == TargetState.UnableEvaluate.GetEnumInt() - && x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State - ) + && x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State + ) .Select(x => x.RowId).Distinct().ToListAsync(); diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs index c2f867d0b..f7adcd7d6 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialConfigService.cs @@ -141,19 +141,19 @@ namespace IRaCIS.Core.Application var trialCriterion = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstNotNullAsync(); if (trialCriterion.SynchronizeOriginalTime == null && trialCriterion.ReadingQuestionCriterionSystemId != null) { - // 同步器官 - await _iOrganInfoService.SynchronizeSystemOrganToTrial(new SynchronizeSystemOrganToTrialInDto() - { - TrialReadingCriterionId = inDto.TrialReadingCriterionId, - SystemCriterionId = trialCriterion.ReadingQuestionCriterionSystemId - }); + await _readingCriterionDictionaryRepository.BatchDeleteNoTrackingAsync(x => x.CriterionId == trialCriterion.Id); + var criterionDictionaryList = await _readingCriterionDictionaryRepository.Where(x => x.CriterionId == trialCriterion.ReadingQuestionCriterionSystemId.Value). + Select(x => new ReadingCriterionDictionary() + { + CriterionId = trialCriterion.Id, + DictionaryId = x.DictionaryId, + IsSystemCriterion = false, + ParentCode = x.ParentCode, - // 同步问题 - await iReadingQuestionService.SynchronizeCriterion(new SynchronizeCriterionInDto() - { + }).ToListAsync(); - TrialReadingCriterionId = inDto.TrialReadingCriterionId, - }); + await _readingCriterionDictionaryRepository.AddRangeAsync(criterionDictionaryList); + await _readingCriterionDictionaryRepository.SaveChangesAsync(); }