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

IRaCIS.Core.Application/Service/Common/Export/TumorExportService.cs

@@ -314,7 +314,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
             LesionList = t.LesionList.OrderBy(t => t.RowMark).Select(c => new TumorLessionInfo()
             {
                 Id = c.Id,
-                OrganInfoId=c.OrganInfoId,
+                OrganInfoId = c.OrganInfoId,
                 LessionType = c.ReadingQuestionTrial.LesionType,
                 LessionCode = c.RowMark,
                 SplitRowId = c.SplitRowId,
@@ -389,7 +389,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
          .Union(new List<string>() { "ArmEnum", "ValueUnit", "GlobalAssessType", "ImageQualityIssues" })
          .Distinct().ToArray();
 
-        var trialOrganDic = _trialOrganRepository.Where(t => t.TrialCriterionId == criterion.Id).Select(t=>new {t.OrganInfoId,t.Part,t.PartEN}).ToDictionary(
+        var trialOrganDic = _trialOrganRepository.Where(t => t.TrialCriterionId == criterion.Id).Select(t => new { t.OrganInfoId, t.Part, t.PartEN }).ToDictionary(
         t => t.OrganInfoId,
         t => new { t.Part, t.PartEN }
         );
@@ -660,7 +660,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
                     }
                     else
                     {
-                        if (questionAnswer.ValueType == ValueOfType.Percentage)
+                        if (questionAnswer.ValueType == ValueOfType.Percentage && double.TryParse(questionAnswer.QuestionValue, out _))
                         {
                             tr.OriginalMeasurements = questionAnswer.QuestionValue + "%";
 
@@ -721,7 +721,9 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
                             rs.RespondEfficacyAssessment = questionAnswer.QuestionValue;
                         }
 
-                        if (questionAnswer.QuestionType == QuestionType.Tumor)
+                        if ((questionAnswer.QuestionType == QuestionType.Tumor && criterion.CriterionType == CriterionType.RECIST1Point1)||
+                            (questionAnswer.QuestionType == QuestionType.ImgOncology && criterion.CriterionType == CriterionType.Lugano2014))
+                            
                         {
                             rs.AssessmentReason = task.VisitNote;
 
@@ -1277,7 +1279,7 @@ public class Tumor_CDISC_ExportService(IRepository<ReadingQuestionCriterionTrial
             case QuestionType.NoTargetLesion:
                 rsValueTypeIndex = 1;
                 break;
-            case QuestionType.NewLesions:
+            case QuestionType.NewLesionEvaluation:
                 rsValueTypeIndex = 2;
                 break;