代码修改

2023-10-19 17:10:31 +08:00
parent 65ae0e06f5
commit e6cd24065c
5 changed files with 31 additions and 3 deletions
@@ -196,7 +196,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
                {
                    await service.CalculateTask(new CalculateTaskInDto()
                    {
-
+                        ComputationTrigger= ComputationTrigger.Report,
                        VisitTaskId = inDto.VisitTaskId
                    });
                }
@@ -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,