代码修改

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

@@ -50,6 +50,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
           
         public bool IsChangeOtherTask { get; set; }
+
+        public ComputationTrigger ComputationTrigger { get; set; }
     }
 
     public class TargetLesionCalculateDto
@@ -218,7 +220,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
 
         public Guid SubjectVisitId { get; set; }
 
-        public Arm ArmEnum { get; set; } 
+        public Arm ArmEnum { get; set; }
+
+        public ComputationTrigger ComputationTrigger { get; set; } = ComputationTrigger.Lesion;
 
         /// <summary>
         /// 是否修改其他任务
@@ -348,6 +352,9 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
     {
         public QuestionType QuestionType { get; set; }
 
+
+        public ComputationTrigger? ComputationTrigger { get; set; }
+
         public Func<ReadingCalculateDto, Task<decimal>> GetDecimalFun { get; set; }
 
         public Func<ReadingCalculateDto, Task<int>> GetIntFun { get; set; }

IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs

@@ -1741,6 +1741,7 @@ namespace IRaCIS.Application.Services
             {
                 IsChangeOtherTask = false,
                 VisitTaskId = inDto.VisitTaskId,
+                ComputationTrigger=ComputationTrigger.Lesion,
             });
             return ResponseOutput.Ok(true);
         }
@@ -2141,6 +2142,7 @@ namespace IRaCIS.Application.Services
             {
                 IsChangeOtherTask = false,
                 VisitTaskId = inDto.VisitTaskId,
+                ComputationTrigger = ComputationTrigger.Lesion,
             });
 
 

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

@@ -196,7 +196,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 {
                     await service.CalculateTask(new CalculateTaskInDto()
                     {
-
+                        ComputationTrigger= ComputationTrigger.Report,
                         VisitTaskId = inDto.VisitTaskId
                     });
                 }

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

@@ -429,6 +429,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
         {
             ReadingCalculateDto readingData = await _generalCalculateService.GetReadingCalculateDto(inDto.VisitTaskId);
             readingData.IsChangeOtherTask = inDto.IsChangeOtherTask;
+            readingData.ComputationTrigger = inDto.ComputationTrigger;
             await ReadingCalculate(readingData);
         }
 
@@ -505,7 +506,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 new ReadingCalculateData (){QuestionType=QuestionType.CTandMRI,GetStringFun=CTMRIEvaluation},
 
                 // PET 5PS评分
-                new ReadingCalculateData (){QuestionType=QuestionType.PET5PS,GetStringFun=GetPET5PS},
+                new ReadingCalculateData (){QuestionType=QuestionType.PET5PS,GetStringFun=GetPET5PS,ComputationTrigger=ComputationTrigger.Lesion},
 
                 //与基线相比摄取值变化
                 new ReadingCalculateData (){QuestionType=QuestionType.UptakeChange,GetStringFun=GetUptakeChange},
@@ -609,6 +610,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                 calculateList = calculateList.Where(x => calculateType.Contains(x.QuestionType)).ToList();
             }
 
+
+            calculateList = calculateList.Where(x => x.ComputationTrigger == null || x.ComputationTrigger == inDto.ComputationTrigger).ToList();
             var typeNAList = new List<QuestionType>
             {
                 QuestionType.SODChange,

IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs

@@ -2277,6 +2277,22 @@ public enum PET5PSScore
 
     }
 
+    /// <summary>
+    /// 计算触发
+    /// </summary>
+    public enum ComputationTrigger
+    {
+        /// <summary>
+        /// 病灶
+        /// </summary>
+        Lesion=0,
+
+        /// <summary>
+        /// 报告
+        /// </summary>
+        Report=1,
+    }
+
     /// <summary>
     /// 新靶病灶评估
     /// </summary>