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

首次添加病灶
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
he 2025-01-09 15:06:54 +08:00
parent 55ea791387
commit 0dae3c000c
1 changed files with 72 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
IRaCIS.Core.Application/Service/ReadingCalculate/MRIPDFFCalculateService.cs
View File

@ -364,6 +364,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
var isReadingTaskViewInOrder = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskinfo.TrialReadingCriterionId).Select(x => x.IsReadingTaskViewInOrder).FirstOrDefaultAsync(); var isReadingTaskViewInOrder = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskinfo.TrialReadingCriterionId).Select(x => x.IsReadingTaskViewInOrder).FirstOrDefaultAsync();
var baseLineVisitId = await _subjectVisitRepository.Where(x => x.SubjectId == taskinfo.SubjectId && x.IsBaseLine).Select(x => x.Id).FirstOrDefaultAsync(); var baseLineVisitId = await _subjectVisitRepository.Where(x => x.SubjectId == taskinfo.SubjectId && x.IsBaseLine).Select(x => x.Id).FirstOrDefaultAsync();
if (!(await _readingTableQuestionAnswerRepository.AnyAsync(x => x.VisitTaskId == visitTaskId)))
{
var dictionList = await _dictionaryRepository.Where(x => x.Parent.Code == "LiverSegmentation").OrderBy(x => x.ShowOrder).ToListAsync(); var dictionList = await _dictionaryRepository.Where(x => x.Parent.Code == "LiverSegmentation").OrderBy(x => x.ShowOrder).ToListAsync();
@ -400,30 +404,30 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}); });
rowlist.Add(new ReadingTableAnswerRowInfo() rowlist.Add(new ReadingTableAnswerRowInfo()
{ {
FristAddTaskId= visitTaskId, FristAddTaskId = visitTaskId,
FristAddTaskNum= taskinfo.VisitTaskNum, FristAddTaskNum = taskinfo.VisitTaskNum,
IsCurrentTaskAdd=true, IsCurrentTaskAdd = true,
BlindName= taskinfo.TaskBlindName, BlindName = taskinfo.TaskBlindName,
OrderMark= tableQuestion.OrderMark+ num.GetLesionMark(), OrderMark = tableQuestion.OrderMark + num.GetLesionMark(),
VisitTaskId= visitTaskId, VisitTaskId = visitTaskId,
TrialId= taskinfo.TrialId, TrialId = taskinfo.TrialId,
QuestionId= tableQuestion.Id, QuestionId = tableQuestion.Id,
RowIndex= num, RowIndex = num,
Id= guid, Id = guid,
}); });
tableAnswerList.Add(new ReadingTableQuestionAnswer() tableAnswerList.Add(new ReadingTableQuestionAnswer()
{ {
QuestionId= tableQuestion.Id, QuestionId = tableQuestion.Id,
Answer= item.Code, Answer = item.Code,
TableQuestionId= tableQuestionList.Where(x=>x.QuestionMark==QuestionMark.liverSegmentation).Select(x=>x.Id).FirstOrDefault(), TableQuestionId = tableQuestionList.Where(x => x.QuestionMark == QuestionMark.liverSegmentation).Select(x => x.Id).FirstOrDefault(),
VisitTaskId= visitTaskId, VisitTaskId = visitTaskId,
TrialId= taskinfo.TrialId, TrialId = taskinfo.TrialId,
RowIndex= num, RowIndex = num,
RowId= guid, RowId = guid,
}); });
foreach (var otherQuestion in tableQuestionList.Where(x => !tableAnswerList.Any(y=>y.RowId== guid&&y.TableQuestionId==x.Id))) foreach (var otherQuestion in tableQuestionList.Where(x => !tableAnswerList.Any(y => y.RowId == guid && y.TableQuestionId == x.Id)))
{ {
tableAnswerList.Add(new ReadingTableQuestionAnswer() tableAnswerList.Add(new ReadingTableQuestionAnswer()
{ {
@ -445,6 +449,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
await _readingTaskQuestionMarkRepository.AddRangeAsync(_mapper.Map<List<ReadingTaskQuestionMark>>(marks)); await _readingTaskQuestionMarkRepository.AddRangeAsync(_mapper.Map<List<ReadingTaskQuestionMark>>(marks));
await _readingTableQuestionAnswerRepository.SaveChangesAsync(); await _readingTableQuestionAnswerRepository.SaveChangesAsync();
}
return new AddTaskLesionAnswerFromLastTaskOutDto() return new AddTaskLesionAnswerFromLastTaskOutDto()
{ {