From 36fa5e1d73d59db9e350831b45900f195917ed68 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Fri, 12 Jan 2024 16:10:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReadingImageTask/ReadingImageTaskService.cs | 6 +++--- .../Service/ReadingCalculate/LuganoCalculateService.cs | 10 +++++++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index 6c37b9d32..d190a9a5e 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -2582,8 +2582,8 @@ namespace IRaCIS.Application.Services var startReadingTimeKey = _userInfo.Id.ToString()+ "StartReadingTime"; var startRestTimeKey = _userInfo.Id.ToString() + "StartRestTime"; - int readingMinute = 12; // 为60整数 - int restMinute = 5; // + int readingMinute = 120; // 为60整数 + int restMinute = 10; // var startReadingTime = _provider.Get(startReadingTimeKey).Value; var startRestTime = _provider.Get(startRestTimeKey).Value; if (startReadingTime == null && startRestTime == null) @@ -2639,7 +2639,7 @@ namespace IRaCIS.Application.Services var startReadingTimeKey = userID.ToString() + "StartReadingTime"; var startRestTimeKey = userID.ToString() + "StartRestTime"; //int readingMinute = 120; // 为60整数 - int restMinute = 5; // + int restMinute = 10; // var startReadingTime = _provider.Get(startReadingTimeKey).Value; var startRestTime = _provider.Get(startRestTimeKey).Value; diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs index 1b9696b62..96478addb 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs @@ -841,7 +841,15 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate 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 (taskinfo.VisitTaskNum != 0m) + { + errorMassage += _localizer["ReadingCalculate_LuganoPetVerification"] + ","; + } + else + { + errorMassage += _localizer["ReadingCalculate_LuganoBaseLinePetVerification"] + ","; + } + } }