From 4f37f2fa0abfc539e86c4c374a2357bf09a72051 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Wed, 3 Jan 2024 14:01:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E9=AA=8C=E8=AF=81=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LuganoCalculateService.cs | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs index c57f47806..2f7d09b59 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs @@ -11,6 +11,7 @@ using Microsoft.Extensions.Caching.Memory; using IRaCIS.Core.Infrastructure; using MassTransit; using System.Reflection.Metadata.Ecma335; +using System.Linq; namespace IRaCIS.Core.Application.Service.ReadingCalculate { @@ -817,6 +818,25 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate errorMassage += _localizer["ReadingCalculate_NoMarkerEmpty", string.Join(',', stateIsNullList)] + ","; } + // 判断是否有pet + if (await _readingTaskQuestionAnswerRepository.AnyAsync(x => x.ReadingQuestionTrial.QuestionType == QuestionType.ExistPET && x.VisitTaskId == inDto.VisitTaskId && x.Answer == ReadingYesOrNo.Yes.GetEnumInt())) + { + List required=new List() { + QuestionType.LiverSUVmax, + QuestionType.MediastinumSUVmax, + QuestionType.SUVmax, + QuestionType.SUVmaxLesion, + QuestionType.PET5PS, + QuestionType.UptakeChange, + QuestionType.EvidenceFocalFDG + }; + + if ((await _readingTaskQuestionAnswerRepository.CountAsync(x => required.Contains(x.ReadingQuestionTrial.QuestionType) && x.VisitTaskId == inDto.VisitTaskId && x.Answer != string.Empty)) != required.Count()) + { + errorMassage += _localizer["ReadingCalculate_LuganoPetVerification"] + ","; + } + } + if (errorMassage != string.Empty) { From 52251d420f6e4df2d6a2b1be0a4abf09aeb4b569 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Wed, 3 Jan 2024 14:24:24 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=98=85=E7=89=87=E7=8A=B6=E6=80=81?= =?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/General/ReadingCalculateService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs index 681920557..529e92feb 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs @@ -142,7 +142,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate ComputationTrigger=ComputationTrigger.Report, }); - await _visitTaskRepository.BatchUpdateNoTrackingAsync(x => x.Id == inDto.VisitTaskId, x => new VisitTask() + await _visitTaskRepository.UpdatePartialFromQueryAsync(inDto.VisitTaskId, x => new VisitTask() { ReadingTaskState = ReadingTaskState.Reading, From 57290d6a4b9e07af450d0588954a2c9d674e8877 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Wed, 3 Jan 2024 14:26:01 +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 --- .../Service/ReadingCalculate/General/ReadingCalculateService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs index 529e92feb..ccc163c32 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs @@ -139,7 +139,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { IsChangeOtherTask = false, VisitTaskId = inDto.VisitTaskId, - ComputationTrigger=ComputationTrigger.Report, + // ComputationTrigger=ComputationTrigger.Report, }); await _visitTaskRepository.UpdatePartialFromQueryAsync(inDto.VisitTaskId, x => new VisitTask() From 596ecba13f79f2c9c5364a50323613cd76dd784b Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Wed, 3 Jan 2024 14:26:30 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ReadingCalculate/General/ReadingCalculateService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs index ccc163c32..529e92feb 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs @@ -139,7 +139,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { IsChangeOtherTask = false, VisitTaskId = inDto.VisitTaskId, - // ComputationTrigger=ComputationTrigger.Report, + ComputationTrigger=ComputationTrigger.Report, }); await _visitTaskRepository.UpdatePartialFromQueryAsync(inDto.VisitTaskId, x => new VisitTask()