IRC_NewDev
hang 2024-03-07 09:36:49 +08:00
parent d42c8477aa
commit cab5772068
2 changed files with 20 additions and 12 deletions

View File

@ -520,8 +520,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
// 修改PET 5PS评分备注 // 修改PET 5PS评分备注
new ReadingCalculateData (){QuestionType=QuestionType.PSScoreRemarks,GetStringFun=GetPET5PSRemark,ComputationTrigger=ComputationTrigger.Lesion}, new ReadingCalculateData (){QuestionType=QuestionType.PSScoreRemarks,GetStringFun=GetPET5PSRemark,ComputationTrigger=ComputationTrigger.Lesion},
////与基线相比摄取值变化 //与基线相比摄取值变化
//new ReadingCalculateData (){QuestionType=QuestionType.UptakeChange,GetStringFun=GetUptakeChange,ComputationTrigger=ComputationTrigger.Lesion}, new ReadingCalculateData (){QuestionType=QuestionType.UptakeChange,GetStringFun=GetUptakeChange,ComputationTrigger=ComputationTrigger.Lesion},
// FDG-PET 评估结果 // FDG-PET 评估结果
new ReadingCalculateData (){QuestionType=QuestionType.FDGPET,GetStringFun=GetFDGPETOverallAssessment}, new ReadingCalculateData (){QuestionType=QuestionType.FDGPET,GetStringFun=GetFDGPETOverallAssessment},
@ -1333,17 +1333,17 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
}); });
var addList = _mapper.Map<List<ReadingTableAnswerRowInfo>>(tableRowAnswers); var addList = _mapper.Map<List<ReadingTableAnswerRowInfo>>(tableRowAnswers).OrderBy(x => x.RowIndex).ToList();
//await _readingTaskQuestionMarkRepository.AddRangeAsync(questionMarkList); //await _readingTaskQuestionMarkRepository.AddRangeAsync(questionMarkList);
await _readingTableAnswerRowInfoRepository.AddRangeAsync(addList); await _readingTableAnswerRowInfoRepository.AddRangeAsync(addList);
await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers);
foreach (var item in addList) addList.ForEach(x =>
{ {
item.MergeRow = null; x.MergeRow = null;
item.SplitRow = null; x.SplitRow = null;
}
//await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers); });
await _readingTableQuestionAnswerRepository.SaveChangesAsync(); await _readingTableQuestionAnswerRepository.SaveChangesAsync();
} }
@ -2452,7 +2452,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
//访视PET评分 等于 基线PET评分 //访视PET评分 等于 基线PET评分
else if (PET5PS == baseLinePET5PS) else if (PET5PS == baseLinePET5PS)
{ {
result = SUVChangeVSBaseline.DidNotChange; return string.Empty;
//result = SUVChangeVSBaseline.DidNotChange;
} }
return result.GetEnumInt(); return result.GetEnumInt();

View File

@ -786,6 +786,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
await _readingTableAnswerRowInfoRepository.AddRangeAsync(addList); await _readingTableAnswerRowInfoRepository.AddRangeAsync(addList);
await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers); await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers);
addList.ForEach(x =>
{
x.MergeRow = null;
x.SplitRow = null;
});
await _readingTableQuestionAnswerRepository.SaveChangesAsync(); await _readingTableQuestionAnswerRepository.SaveChangesAsync();
} }