修改

IRaCIS.Core.Application/Service/Reading/Dto/ExportTumorEvaluationDto.cs

@@ -166,6 +166,10 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
             {
 
                
+            }
+            if (result == string.Empty || result == null)
+            {
+                result = "-";
             }
 
             return result;
@@ -563,7 +567,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
         /// </summary>
         public string Part { get; set; } = string.Empty;
 
-        public int Number { get; set; }
+        public int? Number { get; set; }
 
         public string Title {
             get
@@ -574,7 +578,7 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
                 }
                 else 
                 {
-                    return $"{Number}";
+                    return "-";
                 }
 
             } 

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<Dictionary<string, object>> getLesionInfo(LesionType lesionType)
+            List<Dictionary<string, object>> getLesionInfo(LesionType lesionType,int? minNum=1)
             {
                 List<decimal> 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<string, object> target = new Dictionary<string, object>()
+                {
+                  { "RowMark","-"},
+                  { "Organ","-"},
+                  { "FirstVisit","-" },
+                  { "SecondVisit", "-" },
+                  { "ThirdlyVisit", "-" },
+                };
+                    targetInfo.Add(target);
+                }
                 return targetInfo;
             }
 

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<Dictionary<string, object>> getLesionInfo(LesionType lesionType)
+            List<Dictionary<string, object>> getLesionInfo(LesionType lesionType, int? minNum = 1)
             {
                 List<decimal> 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<string, object> target = new Dictionary<string, object>()
+                     {
+                       { "RowMark","-"},
+                       { "Organ","-"},
+                       { "FirstVisit","-" },
+                       { "SecondVisit", "-" },
+                       { "ThirdlyVisit", "-" },
+                     };
+                    targetInfo.Add(target);
+                }
                 return targetInfo;
             }
 

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<Dictionary<string, object>> getLesionInfo(LesionType lesionType)
+            List<Dictionary<string, object>> getLesionInfo(LesionType lesionType, int? minNum = 1)
             {
                 List<decimal> 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<string, object> target = new Dictionary<string, object>()
+                    {
+                      { "RowMark","-"},
+                      { "Organ","-"},
+                      { "FirstVisit","-" },
+                      { "SecondVisit", "-" },
+                      { "ThirdlyVisit", "-" },
+                    };
+                    targetInfo.Add(target);
+                }
                 return targetInfo;
             }
 

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<Dictionary<string, object>> getLesionInfo(LesionType lesionType)
+            List<Dictionary<string, object>> getLesionInfo(LesionType lesionType, int? minNum = 1)
             {
                 List<decimal> 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<string, object> target = new Dictionary<string, object>()
+                    {
+                      { "RowMark","-"},
+                      { "Organ","-"},
+                      { "FirstVisit","-" },
+                      { "SecondVisit", "-" },
+                      { "ThirdlyVisit", "-" },
+                    };
+                    targetInfo.Add(target);
+                }
                 return targetInfo;
             }
 

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<Dictionary<string, object>> getLesionInfo(LesionType lesionType)
+            List<Dictionary<string, object>> getLesionInfo(LesionType lesionType, int? minNum = 1)
             {
                 List<decimal> 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<string, object> target = new Dictionary<string, object>()
+                    {
+                      { "RowMark","-"},
+                      { "Organ","-"},
+                      { "FirstVisit","-" },
+                      { "SecondVisit", "-" },
+                      { "ThirdlyVisit", "-" },
+                    };
+                    targetInfo.Add(target);
+                }
                 return targetInfo;
             }