From 1b26ed1b651a0f6a80301ebf3d9f811a3478f133 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Thu, 26 Sep 2024 13:27:47 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ImageAndDoc/DownloadAndUploadService.cs | 8 +++++--- .../Reading/ReadingCriterion/ReadingCriterionService.cs | 1 + .../Service/ReadingCalculate/OCTCalculateService.cs | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs index 7ec7a0ce6..596faf077 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs @@ -618,22 +618,24 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc { if (dicomStudyId == null) { - await _taskStudyRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId); + await _taskStudyRepository.DeleteFromQueryAsync(t => t.VisitTaskId == visitTaskId); await _taskSeriesRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId); await _taskInstanceRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId); } else { - await _taskStudyRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId); + await _taskStudyRepository.DeleteFromQueryAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId); await _taskSeriesRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId); await _taskInstanceRepository.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.Id == dicomStudyId); } } else { - await _noneDicomStudyFileReposiotry.BatchDeleteNoTrackingAsync(t => t.VisitTaskId == visitTaskId && t.OriginNoneDicomStudyId == noneDicomStudyId); + await _noneDicomStudyFileReposiotry.DeleteFromQueryAsync(t => t.VisitTaskId == visitTaskId && t.OriginNoneDicomStudyId == noneDicomStudyId); } + await _noneDicomStudyFileReposiotry.SaveChangesAsync(); + return ResponseOutput.Ok(); } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs index 6fa5ab142..7c95a89e3 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingCriterion/ReadingCriterionService.cs @@ -671,6 +671,7 @@ namespace IRaCIS.Core.Application.Service.RC switch (criterion.CriterionType) { case CriterionType.IVUS: + criterion.IsReadingPeriod = false; criterion.IsImageFilter = false; criterion.IsReadingTaskViewInOrder = ReadingOrder.SubjectRandom; criterion.ImageDownloadEnum = ReadingImageDownload.Subejct; diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs index 5079a850a..c1b195d4a 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs @@ -985,7 +985,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate // 匹配动脉段最小FCT tableAnswers.Add(new ReadingTableQuestionAnswer() { - Answer = oCTFCTInfos.Count()==0? "0.00" : GetDigitPlacesData(oCTFCTInfos.Where(x => x.PlaqueNum == item).MinOrDefault(x => x.Data).ToString()), + Answer = oCTFCTInfos.Where(x => x.PlaqueNum == item).Count()==0? "0.00" : GetDigitPlacesData(oCTFCTInfos.Where(x => x.PlaqueNum == item).MinOrDefault(x => x.Data).ToString()), Id = NewId.NextGuid(), QuestionId = patchDataStatisticsInfo.Id, TrialId = inDto.TrialId, @@ -1011,7 +1011,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate // 脂质角度平均值 tableAnswers.Add(new ReadingTableQuestionAnswer() { - Answer = lipidAngleInfos.Count() == 0 ? "0.00" : GetDigitPlacesData(lipidAngleInfos.Where(x => x.PlaqueNum == item).Average(x => x.Data).ToString()), + Answer = lipidAngleInfos.Where(x => x.PlaqueNum == item).Count() == 0 ? "0.00" : GetDigitPlacesData(lipidAngleInfos.Where(x => x.PlaqueNum == item).Average(x => x.Data).ToString()), Id = NewId.NextGuid(), QuestionId = patchDataStatisticsInfo.Id, TrialId = inDto.TrialId, @@ -1024,7 +1024,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate // 脂质角度最大值 tableAnswers.Add(new ReadingTableQuestionAnswer() { - Answer = lipidAngleInfos.Count() == 0 ? "0.00" : GetDigitPlacesData(lipidAngleInfos.Where(x => x.PlaqueNum == item).MaxOrDefault(x => x.Data).ToString()), + Answer = lipidAngleInfos.Where(x => x.PlaqueNum == item).Count() == 0 ? "0.00" : GetDigitPlacesData(lipidAngleInfos.Where(x => x.PlaqueNum == item).MaxOrDefault(x => x.Data).ToString()), Id = NewId.NextGuid(), QuestionId = patchDataStatisticsInfo.Id, TrialId = inDto.TrialId, From 53f3bb5d6d4c20a88726cf6adaa0c41614dbeead Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Thu, 26 Sep 2024 13:31:47 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ReadingCalculate/OCTCalculateService.cs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs index c1b195d4a..fa58baeec 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/OCTCalculateService.cs @@ -787,10 +787,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate // 斑块3-匹配动脉段最小FCT new ReadingCalculateData (){QuestionType=QuestionType.Plaque3MinFCT,GetDecimalNullFun=GetPlaque3MinFCT}, - - - - }; From 8ec35d90fb80023bfb6aa28f7f69c685361eafb7 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Thu, 26 Sep 2024 13:49:39 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reading/Dto/ReadingImageTaskViewModel.cs | 6 ++++++ .../ReadingImageTask/ReadingGlobalTaskService.cs | 2 ++ .../ReadingImageTask/ReadingJudgeTaskService.cs | 14 ++++++++++++++ 3 files changed, 22 insertions(+) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 681b950f4..8a275b60c 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -1621,6 +1621,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public string FileType { get; set; } = string.Empty; + public ValueUnit? Unit { get; set; } + /// /// 字典code /// @@ -2084,6 +2086,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public dynamic Answer { get; set; } + public string Type { get; set; } = string.Empty; + + public ValueUnit? Unit { get; set; } + public JudgeReadingQuestionType QuestionType { get; set; } = JudgeReadingQuestionType.Question; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs index 13c40cd9d..1076abeb8 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs @@ -301,6 +301,7 @@ namespace IRaCIS.Core.Application.Service LimitEdit = y.LimitEdit, MaxAnswerLength = y.MaxAnswerLength, FileType = y.FileType, + Unit=y.Unit, QuestionGenre = y.QuestionGenre, ShowOrder = y.ShowOrder, DictionaryCode = y.DictionaryCode, @@ -390,6 +391,7 @@ namespace IRaCIS.Core.Application.Service DictionaryCode = lr.question.DictionaryCode, GlobalReadingShowType = lr.question.GlobalReadingShowType, Type = lr.question.Type, + Unit = y.Unit, GlobalAnswerType = GlobalAnswerType.Question, AnswerGroup = lr.question.AnswerGroup, AnswerCombination = lr.question.AnswerCombination, diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs index f7a8105d2..e5b3639b3 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingJudgeTaskService.cs @@ -161,6 +161,8 @@ namespace IRaCIS.Core.Application.Service .Select(x => new GlobalVisitJudgeQuestion() { Answer = x.Answer, + Type= x.ReadingQuestionTrial.Type, + Unit= x.ReadingQuestionTrial.Unit, ShowOrder = x.ReadingQuestionTrial.ShowOrder, VisitTaskId = x.VisitTaskId, QuestionId = x.ReadingQuestionTrial.Id, @@ -174,6 +176,8 @@ namespace IRaCIS.Core.Application.Service .Select(x => new GlobalVisitJudgeQuestion() { Answer = x.Answer, + Type = x.ReadingQuestionTrial.Type, + Unit = x.ReadingQuestionTrial.Unit, ShowOrder = x.ReadingQuestionTrial.ShowOrder, VisitTaskId = x.VisitTaskId, QuestionId = x.ReadingQuestionTrial.Id, @@ -204,6 +208,8 @@ namespace IRaCIS.Core.Application.Service .Select(x => new JudgeQuestion() { Answer = x.Answer, + Type = x.Type, + Unit = x.Unit, QuestionId = x.QuestionId, QuestionName = x.QuestionName, QuestionGenre = x.QuestionGenre, @@ -223,6 +229,8 @@ namespace IRaCIS.Core.Application.Service .Select(x => new JudgeQuestion() { Answer = x.Answer, + Type = x.Type, + Unit = x.Unit, QuestionId = x.QuestionId, QuestionName = x.QuestionName, QuestionGenre = x.QuestionGenre, @@ -254,6 +262,8 @@ namespace IRaCIS.Core.Application.Service .Select(x => new JudgeQuestion() { Answer = x.Answer, + Type = x.ReadingQuestionTrial.Type, + Unit = x.ReadingQuestionTrial.Unit, QuestionId = x.ReadingQuestionTrial.Id, QuestionName = x.ReadingQuestionTrial.QuestionName.LanguageName(x.ReadingQuestionTrial.QuestionEnName, _userInfo.IsEn_Us), QuestionGenre = x.ReadingQuestionTrial.QuestionGenre, @@ -302,6 +312,8 @@ namespace IRaCIS.Core.Application.Service { Answer = x.Answer, + Type = x.Type, + Unit = x.Unit, QuestionId = x.QuestionId!.Value, QuestionName = x.QuestionName, QuestionGenre = x.QuestionGenre, @@ -342,6 +354,8 @@ namespace IRaCIS.Core.Application.Service { Answer = x.Answer, + Type = x.Type, + Unit = x.Unit, QuestionId = x.QuestionId == null ? default(Guid) : x.QuestionId.Value, QuestionName = x.QuestionName, QuestionGenre = x.QuestionGenre, From ea4896749269fe65dc39fb296c1a26f18855889f Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Thu, 26 Sep 2024 13:57:34 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Reading/ReadingImageTask/ReadingGlobalTaskService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs index 1076abeb8..2082c60a0 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs @@ -391,7 +391,7 @@ namespace IRaCIS.Core.Application.Service DictionaryCode = lr.question.DictionaryCode, GlobalReadingShowType = lr.question.GlobalReadingShowType, Type = lr.question.Type, - Unit = y.Unit, + Unit = lr.question.Unit, GlobalAnswerType = GlobalAnswerType.Question, AnswerGroup = lr.question.AnswerGroup, AnswerCombination = lr.question.AnswerCombination,