XCKJ
/
EI-Image-Viewer-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Test.EIImageViewer
he 2023-01-18 10:02:13 +08:00
parent 39f3bc738d
commit d30b12b425
3 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs
View File

@ -1063,6 +1063,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
public string Answer { get; set; } public string Answer { get; set; }
public bool IsGlobalAnswer { get; set; } = false;
/// <summary> /// <summary>
/// 问题类型 /// 问题类型
/// </summary> /// </summary>

55
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
View File

@ -213,18 +213,39 @@ namespace IRaCIS.Application.Services
var globalReadingQuestion = await _readingGlobalTaskInfoRepository.Where(x => x.GlobalTaskId == inDto.VisitTaskId).ToListAsync(); var globalReadingQuestion = await _readingGlobalTaskInfoRepository.Where(x => x.GlobalTaskId == inDto.VisitTaskId).ToListAsync();
var criterionType = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskInfo.TrialReadingCriterionId).Select(x => x.CriterionType).FirstOrDefaultAsync(); var criterionType = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskInfo.TrialReadingCriterionId).Select(x => x.CriterionType).FirstOrDefaultAsync();
//if (criterionType == CriterionType.PCWG3)
//{
// result.TaskList.ForEach(x =>
// {
// x.BeforeQuestionList.ForEach(y => // 如果不是PCWG3 Before的Answer取自于 上一次全局阅片的结果, 如果没有上一次全局阅片的结果 取访视的答案
// {
// var globalAnswer = globalReadingQuestion.Where(z => z.QuestionId == y.QuestionId).Select(z => z.Answer).FirstOrDefault(); var lastGlobalTask = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Global &&
// y.Answer = globalAnswer.IsNullOrEmpty() ? y.Answer : globalAnswer; x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId &&
// }); x.SubjectId == taskInfo.SubjectId && x.IsAnalysisCreate == taskInfo.IsAnalysisCreate && x.TaskState == TaskState.Effect && x.VisitTaskNum < taskInfo.VisitTaskNum)
// }); .Where(x => x.DoctorUserId == taskInfo.DoctorUserId)
//} .FirstOrDefaultAsync();
List<ReadingGlobalTaskInfo>? globalAnswers = new List<ReadingGlobalTaskInfo>();
if (lastGlobalTask != null)
{
globalAnswers = await _readingGlobalTaskInfoRepository.Where(x => x.GlobalTaskId == lastGlobalTask.Id).ToListAsync();
}
if (criterionType != CriterionType.PCWG3)
{
result.TaskList.ForEach(x =>
{
x.BeforeQuestionList.ForEach(y =>
{
var globalAnswer = globalAnswers.Where(z => z.QuestionId == y.QuestionId).Select(z => z.Answer).FirstOrDefault();
if (!globalAnswer.IsNullOrEmpty())
{
y.Answer = globalAnswer;
y.IsGlobalAnswer = true;
}
});
});
}
result.TaskList.ForEach(x => result.TaskList.ForEach(x =>
{ {
@ -317,16 +338,8 @@ namespace IRaCIS.Application.Services
// 找到上一个全局阅片 // 找到上一个全局阅片
var lastGlobalTask = await _visitTaskRepository.Where(x => x.ReadingCategory == ReadingCategory.Global &&
x.TrialReadingCriterionId == taskInfo.TrialReadingCriterionId &&
x.SubjectId == taskInfo.SubjectId && x.IsAnalysisCreate == taskInfo.IsAnalysisCreate && x.TaskState == TaskState.Effect && x.VisitTaskNum < taskInfo.VisitTaskNum)
.Where(x => x.DoctorUserId == taskInfo.DoctorUserId)
.FirstOrDefaultAsync();
List<ReadingGlobalTaskInfo>? globalAnswers = new List<ReadingGlobalTaskInfo> ();
if (lastGlobalTask != null)
{
globalAnswers= await _readingGlobalTaskInfoRepository.Where(x => x.GlobalTaskId == lastGlobalTask.Id).ToListAsync();
}
result.TaskList.ForEach(x => result.TaskList.ForEach(x =>
{ {
foreach (var item in x.AfterQuestionList.Where(x => x.QuestionType == QuestionType.SiteVisitForTumorEvaluation)) foreach (var item in x.AfterQuestionList.Where(x => x.QuestionType == QuestionType.SiteVisitForTumorEvaluation))

6
IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
View File

@ -960,6 +960,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
return nameof(YesOrNoOrNa.NA); return nameof(YesOrNoOrNa.NA);
} }
var targetCount = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.TargetLesion).SelectMany(x => x.TableRowInfoList).Count();
if (targetCount == 0)
{
return nameof(YesOrNoOrNa.NA);
}
var decimalAnswerList = await GetLowSODVisit(inDto); var decimalAnswerList = await GetLowSODVisit(inDto);
return decimalAnswerList.OrderBy(x => x.SOD).Select(x => x.BlindName).FirstOrDefault() ?? string.Empty; return decimalAnswerList.OrderBy(x => x.SOD).Select(x => x.BlindName).FirstOrDefault() ?? string.Empty;
} }