From cab57720681676b288b31c23a1db33d970cd4ee7 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Thu, 7 Mar 2024 09:36:49 +0800 Subject: [PATCH] x --- .../LuganoCalculateService.cs | 23 ++++++++++--------- .../RECIST1Point1CalculateService.cs | 9 +++++++- 2 files changed, 20 insertions(+), 12 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs index a3889090e..961e02b90 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs @@ -520,8 +520,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate // 修改PET 5PS评分备注 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 评估结果 new ReadingCalculateData (){QuestionType=QuestionType.FDGPET,GetStringFun=GetFDGPETOverallAssessment}, @@ -1333,18 +1333,18 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate }); - var addList = _mapper.Map>(tableRowAnswers); + var addList = _mapper.Map>(tableRowAnswers).OrderBy(x => x.RowIndex).ToList(); //await _readingTaskQuestionMarkRepository.AddRangeAsync(questionMarkList); await _readingTableAnswerRowInfoRepository.AddRangeAsync(addList); - - foreach (var item in addList) + await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers); + addList.ForEach(x => { - item.MergeRow = null; - item.SplitRow = null; - } - //await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers); - await _readingTableQuestionAnswerRepository.SaveChangesAsync(); + x.MergeRow = null; + x.SplitRow = null; + + }); + await _readingTableQuestionAnswerRepository.SaveChangesAsync(); } } @@ -2452,7 +2452,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate //访视PET评分 等于 基线PET评分 else if (PET5PS == baseLinePET5PS) { - result = SUVChangeVSBaseline.DidNotChange; + return string.Empty; + //result = SUVChangeVSBaseline.DidNotChange; } return result.GetEnumInt(); diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs index 275fc75b0..af8691ffa 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs @@ -786,7 +786,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate await _readingTableAnswerRowInfoRepository.AddRangeAsync(addList); await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers); - await _readingTableQuestionAnswerRepository.SaveChangesAsync(); + + addList.ForEach(x => + { + x.MergeRow = null; + x.SplitRow = null; + + }); + await _readingTableQuestionAnswerRepository.SaveChangesAsync(); } }