XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Test.IRC' of http://192.168.3.68:2000/XCKJ/irc-netcore-api into Test.IRC
continuous-integration/drone/push Build is passing Details

IRC_NewDev
hang 2024-01-03 15:27:24 +08:00
parent 1226af6376 596ecba13f
commit aa59d9ecca
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs
View File

@ -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,

20
IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs
View File

@ -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<QuestionType?> required=new List<QuestionType?>() {
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)
{