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 b9c5fecb2..6f270b4f6 100644 Binary files a/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/TumorEvaluation_IRECIST1.1_CN_V1.docx and b/IRaCIS.Core.API/wwwroot/ReadReoprtTemplate/TumorEvaluation_IRECIST1.1_CN_V1.docx differ 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; }