From 2ba9e6e2d4c968abaf40a5db8c63bc8c6238341b Mon Sep 17 00:00:00 2001 From: he <109787524@qq.com> Date: Fri, 26 Sep 2025 14:59:43 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TumorEvaluation_IRECIST1.1_CN_V1.docx | Bin 25680 -> 25701 bytes .../Reading/Dto/ExportTumorEvaluationDto.cs | 12 ++++++++---- .../IRECIST1Point1CalculateService.cs | 16 ++++++++++++++-- .../MRECISTHCCCalculateService.cs | 17 +++++++++++++++-- .../ReadingCalculate/PCWG3CalculateService.cs | 15 ++++++++++++++- .../RECIST1Point1CalculateService.cs | 17 +++++++++++++++-- .../RECIST1Point1_BMCalculateService.cs | 17 +++++++++++++++-- 7 files changed, 81 insertions(+), 13 deletions(-) diff --git a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/TumorEvaluation_IRECIST1.1_CN_V1.docx b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/TumorEvaluation_IRECIST1.1_CN_V1.docx index b9c5fecb272fe164e028dd2ce822411de03b923f..6f270b4f6477a66075a42f69f0d094a5ccc1f813 100644 GIT binary patch delta 12931 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 AApigX diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ExportTumorEvaluationDto.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ExportTumorEvaluationDto.cs index 76ecec6e6..2071ab22a 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ExportTumorEvaluationDto.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ExportTumorEvaluationDto.cs @@ -165,7 +165,11 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto catch (Exception) { - + + } + if (result == string.Empty || result == null) + { + result = "-"; } return result; @@ -563,7 +567,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public string Part { get; set; } = string.Empty; - public int Number { get; set; } + public int? Number { get; set; } public string Title { get @@ -572,9 +576,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto { return $"{Number}:{RowMark},{Organ}:{Part}"; } - else + else { - return $"{Number}"; + return "-"; } } diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs index ac1414894..947bd6a25 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs @@ -192,7 +192,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { VisitLesionInfo target = new VisitLesionInfo { - Number = i, + Number = null, }; targetInfo.Add(target); @@ -422,7 +422,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate var tableAnswerList = await _readingTableQuestionAnswerRepository.Where(x => taskIds.Contains(x.VisitTaskId)).Include(x => x.ReadingQuestionTrial).Include(x => x.ReadingTableQuestionTrial).ToListAsync(); #region 获取各个病灶 - List> getLesionInfo(LesionType lesionType) + List> getLesionInfo(LesionType lesionType,int? minNum=1) { List targetFocusNum = rowinfoList.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.ReadingQuestionTrial.LesionType == lesionType).Select(x => x.RowIndex).OrderBy(x => x).ToList(); @@ -451,6 +451,18 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate }; targetInfo.Add(target); } + if (targetInfo.Count < minNum) + { + Dictionary target = new Dictionary() + { + { "RowMark","-"}, + { "Organ","-"}, + { "FirstVisit","-" }, + { "SecondVisit", "-" }, + { "ThirdlyVisit", "-" }, + }; + targetInfo.Add(target); + } return targetInfo; } diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs index d759f4ae6..09576976c 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/MRECISTHCCCalculateService.cs @@ -150,7 +150,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { VisitLesionInfo target = new VisitLesionInfo { - Number = i, + Number = null, }; targetInfo.Add(target); @@ -342,7 +342,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate var tableAnswerList = await _readingTableQuestionAnswerRepository.Where(x => taskIds.Contains(x.VisitTaskId)).Include(x => x.ReadingQuestionTrial).Include(x => x.ReadingTableQuestionTrial).ToListAsync(); #region 获取各个病灶 - List> getLesionInfo(LesionType lesionType) + List> getLesionInfo(LesionType lesionType, int? minNum = 1) { List targetFocusNum = rowinfoList.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.ReadingQuestionTrial.LesionType == lesionType).Select(x => x.RowIndex).OrderBy(x => x).ToList(); @@ -371,6 +371,19 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate }; targetInfo.Add(target); } + + if (targetInfo.Count < minNum) + { + Dictionary target = new Dictionary() + { + { "RowMark","-"}, + { "Organ","-"}, + { "FirstVisit","-" }, + { "SecondVisit", "-" }, + { "ThirdlyVisit", "-" }, + }; + targetInfo.Add(target); + } return targetInfo; } diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs index 8659826a8..b11ca7854 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs @@ -146,7 +146,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate var tableAnswerList = await _readingTableQuestionAnswerRepository.Where(x => taskIds.Contains(x.VisitTaskId)).Include(x => x.ReadingQuestionTrial).Include(x => x.ReadingTableQuestionTrial).ToListAsync(); #region 获取各个病灶 - List> getLesionInfo(LesionType lesionType) + List> getLesionInfo(LesionType lesionType, int? minNum = 1) { List targetFocusNum = rowinfoList.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.ReadingQuestionTrial.LesionType == lesionType).Select(x => x.RowIndex).OrderBy(x => x).ToList(); @@ -165,6 +165,19 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate }; targetInfo.Add(target); } + + if (targetInfo.Count < minNum) + { + Dictionary target = new Dictionary() + { + { "RowMark","-"}, + { "Organ","-"}, + { "FirstVisit","-" }, + { "SecondVisit", "-" }, + { "ThirdlyVisit", "-" }, + }; + targetInfo.Add(target); + } return targetInfo; } diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs index d122fc78b..aca03d84c 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs @@ -155,7 +155,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { VisitLesionInfo target = new VisitLesionInfo { - Number = i, + Number = null, }; targetInfo.Add(target); @@ -349,7 +349,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate var tableAnswerList = await _readingTableQuestionAnswerRepository.Where(x => taskIds.Contains(x.VisitTaskId)).Include(x => x.ReadingQuestionTrial).Include(x => x.ReadingTableQuestionTrial).ToListAsync(); #region 获取各个病灶 - List> getLesionInfo(LesionType lesionType) + List> getLesionInfo(LesionType lesionType, int? minNum = 1) { List targetFocusNum = rowinfoList.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.ReadingQuestionTrial.LesionType == lesionType).Select(x => x.RowIndex).OrderBy(x => x).ToList(); @@ -368,6 +368,19 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate }; targetInfo.Add(target); } + + if (targetInfo.Count < minNum) + { + Dictionary target = new Dictionary() + { + { "RowMark","-"}, + { "Organ","-"}, + { "FirstVisit","-" }, + { "SecondVisit", "-" }, + { "ThirdlyVisit", "-" }, + }; + targetInfo.Add(target); + } return targetInfo; } diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs index f12359865..bf9f3504d 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1_BMCalculateService.cs @@ -151,7 +151,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate { VisitLesionInfo target = new VisitLesionInfo { - Number = i, + Number = null, }; targetInfo.Add(target); @@ -342,7 +342,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate var tableAnswerList = await _readingTableQuestionAnswerRepository.Where(x => taskIds.Contains(x.VisitTaskId)).Include(x => x.ReadingQuestionTrial).Include(x => x.ReadingTableQuestionTrial).ToListAsync(); #region 获取各个病灶 - List> getLesionInfo(LesionType lesionType) + List> getLesionInfo(LesionType lesionType, int? minNum = 1) { List targetFocusNum = rowinfoList.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.ReadingQuestionTrial.LesionType == lesionType).Select(x => x.RowIndex).OrderBy(x => x).ToList(); @@ -361,6 +361,19 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate }; targetInfo.Add(target); } + + if (targetInfo.Count < minNum) + { + Dictionary target = new Dictionary() + { + { "RowMark","-"}, + { "Organ","-"}, + { "FirstVisit","-" }, + { "SecondVisit", "-" }, + { "ThirdlyVisit", "-" }, + }; + targetInfo.Add(target); + } return targetInfo; }