修改

IRaCIS.Core.Application/Service/Reading/ReadingCriterion/OrganInfoService.cs

@@ -466,6 +466,19 @@ namespace IRaCIS.Core.Application.Service
                     TrialCriterionId= readingQuestionCriterionTrial.Id,
                     OrganInfoId = x.Id,
                     TrialId = readingQuestionCriterionTrial.TrialId,
+                    TULAT=x.TULAT,
+                    Classification=x.Classification,
+                    ClassificationEN=x.ClassificationEN,
+                    IsCanEditPosition=x.IsCanEditPosition,
+                    Part=x.Part,
+                    IsLymphNodes=x.IsLymphNodes,
+                    PartEN=x.PartEN,
+                    ShowOrder=x.ShowOrder,
+                    TULATEN=x.TULATEN,
+                    TULOC=x.TULOC,
+                    TULOCEN=x.TULOCEN,
+                    OrganType=x.OrganType,
+                    
                 }).ToListAsync();
 
                 organTrialInfoList.ForEach(x => x.Id = NewId.NextGuid());

IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs

@@ -1319,7 +1319,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
             var value = await GetSODData(inDto);
 
-            if (value == null || inDto.IsBaseLine)
+            if (value == null || inDto.IsBaseLine || !inDto.IsConvertedTask||inDto.BeforeConvertedTaskId!=null)
             {
                 return null;
             }
@@ -1336,6 +1336,11 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         /// <returns></returns>
         public async Task<decimal?> GetiSODData(ReadingCalculateDto inDto)
         {
+            if (!inDto.IsConvertedTask || inDto.BeforeConvertedTaskId != null)
+            {
+                return null;
+            }
+
             if (iSODData != null)
             {
                 return iSODData.Value;
@@ -1389,7 +1394,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
 
             var value = await GetiSODData(inDto);
 
-            if (value == null || inDto.IsBaseLine)
+            if (value == null || inDto.IsBaseLine || !inDto.IsConvertedTask || inDto.BeforeConvertedTaskId != null)
             {
                 return null;
             }