From 84a8d18519ca86f73599a9f1ab046140cdad3166 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Wed, 6 Mar 2024 17:20:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8F=92=E5=85=A5=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReadingCalculate/LuganoCalculateService.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs index 6490fd157..739541f6f 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs @@ -1333,10 +1333,17 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate }); - var addList = _mapper.Map>(tableRowAnswers); + var addList = _mapper.Map>(tableRowAnswers).OrderBy(x => x.RowIndex).ToList(); + + foreach (var row in addList) + { + await _readingTableAnswerRowInfoRepository.AddAsync(row); + await _readingTableQuestionAnswerRepository.SaveChangesAsync(); + + } await _readingTaskQuestionMarkRepository.AddRangeAsync(questionMarkList); - await _readingTableAnswerRowInfoRepository.AddRangeAsync(addList); + await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers); await _readingTableQuestionAnswerRepository.SaveChangesAsync(); From 30e1d700994f16c8417e50750100d0089f64fc93 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Wed, 6 Mar 2024 17:50:26 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=9F=BA=E7=BA=BF=E6=91=84=E5=8F=96?= =?UTF-8?q?=E5=80=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/ReadingCalculate/LuganoCalculateService.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs index 739541f6f..6319ce221 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}, @@ -2453,7 +2453,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(); From b559a7882b7438ba20253e94ce4472db9ced743d Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Thu, 7 Mar 2024 09:25:22 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=98=85=E7=89=87=E6=A0=87=E5=87=86?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReadingCalculate/LuganoCalculateService.cs | 15 +++++++-------- .../RECIST1Point1CalculateService.cs | 9 ++++++++- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs index 6319ce221..763b8232c 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs @@ -1335,16 +1335,15 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate var addList = _mapper.Map>(tableRowAnswers).OrderBy(x => x.RowIndex).ToList(); - foreach (var row in addList) - { - await _readingTableAnswerRowInfoRepository.AddAsync(row); - await _readingTableQuestionAnswerRepository.SaveChangesAsync(); - - } - await _readingTaskQuestionMarkRepository.AddRangeAsync(questionMarkList); - + await _readingTableAnswerRowInfoRepository.AddRangeAsync(addList); await _readingTableQuestionAnswerRepository.AddRangeAsync(tableAnswers); + addList.ForEach(x => + { + x.MergeRow = null; + x.SplitRow = null; + + }); await _readingTableQuestionAnswerRepository.SaveChangesAsync(); } 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(); } } From 6319f1e82d9314c4c25deb488ae67f6a3ac51667 Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Thu, 7 Mar 2024 09:32:12 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=AA=E6=AD=A2?= =?UTF-8?q?=E8=AE=BF=E8=A7=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Reading/Dto/ReadingImageTaskViewModel.cs | 4 +++- .../Reading/ReadingImageTask/ReadingImageTaskService.cs | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs index 4ed62b0d4..eea0729f1 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingImageTaskViewModel.cs @@ -1886,7 +1886,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto public string TaskBlindName { get; set; } - public decimal VisitTaskNum { get; set; } + public string VisitName { get; set; } + + public decimal VisitTaskNum { get; set; } public Arm? JudgeResultArm { get; set; } diff --git a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs index c80d3e13e..4a3d9b81d 100644 --- a/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs +++ b/IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs @@ -607,7 +607,9 @@ namespace IRaCIS.Application.Services VisitTaskId = x.Id, TaskBlindName = x.TaskBlindName, TaskName = x.TaskName, - VisitTaskNum = x.VisitTaskNum, + VisitName = x.SourceSubjectVisit!=null? x.SourceSubjectVisit.VisitName: x.ReadModule==null?string.Empty: x.ReadModule.SubjectVisit.VisitName, + + VisitTaskNum = x.VisitTaskNum, JudgeResultArm = x.JudgeResultTask == null ? null : x.JudgeResultTask.ArmEnum, }).ToListAsync();