Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8

IRaCIS.Core.Application/Service/ReadingCalculate/General/ReadingCalculateService.cs

@@ -449,6 +449,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
             var  alldata = r1Data.VisitTaskList.Count() > r2Data.VisitTaskList.Count() ? r1Data : r2Data;
             var visitTaskName = alldata.VisitTaskList.Select(x => x.BlindName).ToList();
             var length = alldata.VisitTaskList.Count();
+
+            // -1转为空
+            List<QuestionType?> negativeToString = new List<QuestionType?>() 
+            {
+               QuestionType.DaysBetween,
+            };
        
             async Task<GetReadingReportEvaluationOutDto> GetData(List<Arm> arms)
             {
@@ -568,6 +574,13 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                             Name = item?.QuestionName??string.Empty,
                             Value = itemdata?.Answer?.Select(a => a.Answer).ToList() ?? new List<string>()
                         };
+                        if (negativeToString.Contains(item.QuestionType))
+                        {
+                            cd.Value.ForEach(item1 =>
+                            {
+                                item1 = item1 == "-1" ? string.Empty : item1;
+                            });
+                        }
                         chartList.Add(cd);
                     }
                     groups.Add(new ChartItem
@@ -627,6 +640,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 result.QuestionCharts.AddRange(r2Groups);
             }
 
+            if (criterion.CriterionType == CriterionType.PCWG3)
+            {
+                result.TargetCharts = new List<ChartItem>() { };
+            }
             return result;
 
         }