代码修改
continuous-integration/drone/push Build is passing Details

IRC_NewDev
he 2024-01-12 16:10:24 +08:00
parent abc364835c
commit 36fa5e1d73
2 changed files with 12 additions and 4 deletions

View File

@ -2582,8 +2582,8 @@ namespace IRaCIS.Application.Services
var startReadingTimeKey = _userInfo.Id.ToString()+ "StartReadingTime"; var startReadingTimeKey = _userInfo.Id.ToString()+ "StartReadingTime";
var startRestTimeKey = _userInfo.Id.ToString() + "StartRestTime"; var startRestTimeKey = _userInfo.Id.ToString() + "StartRestTime";
int readingMinute = 12; // 为60整数 int readingMinute = 120; // 为60整数
int restMinute = 5; // int restMinute = 10; //
var startReadingTime = _provider.Get<string>(startReadingTimeKey).Value; var startReadingTime = _provider.Get<string>(startReadingTimeKey).Value;
var startRestTime = _provider.Get<string>(startRestTimeKey).Value; var startRestTime = _provider.Get<string>(startRestTimeKey).Value;
if (startReadingTime == null && startRestTime == null) if (startReadingTime == null && startRestTime == null)
@ -2639,7 +2639,7 @@ namespace IRaCIS.Application.Services
var startReadingTimeKey = userID.ToString() + "StartReadingTime"; var startReadingTimeKey = userID.ToString() + "StartReadingTime";
var startRestTimeKey = userID.ToString() + "StartRestTime"; var startRestTimeKey = userID.ToString() + "StartRestTime";
//int readingMinute = 120; // 为60整数 //int readingMinute = 120; // 为60整数
int restMinute = 5; // int restMinute = 10; //
var startReadingTime = _provider.Get<string>(startReadingTimeKey).Value; var startReadingTime = _provider.Get<string>(startReadingTimeKey).Value;
var startRestTime = _provider.Get<string>(startRestTimeKey).Value; var startRestTime = _provider.Get<string>(startRestTimeKey).Value;

View File

@ -840,9 +840,17 @@ 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()) if ((await _readingTaskQuestionAnswerRepository.CountAsync(x => required.Contains(x.ReadingQuestionTrial.QuestionType) && x.VisitTaskId == inDto.VisitTaskId && x.Answer != string.Empty)) != required.Count())
{
if (taskinfo.VisitTaskNum != 0m)
{ {
errorMassage += _localizer["ReadingCalculate_LuganoPetVerification"] + ","; errorMassage += _localizer["ReadingCalculate_LuganoPetVerification"] + ",";
} }
else
{
errorMassage += _localizer["ReadingCalculate_LuganoBaseLinePetVerification"] + ",";
}
}
} }