diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs index b818b8fe9..e4276e85c 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/LuganoCalculateService.cs @@ -614,7 +614,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate new ReadingCalculateData (){QuestionType=QuestionType.LiverAssessment,GetStringFun=GetLiverAssessment,ComputationTriggerList=new List(){ ComputationTrigger.InitialCalculation, ComputationTrigger.LiverStatus,}}, // 骨髓中是否存在局灶性 FDG亲和病灶的证据 - new ReadingCalculateData (){QuestionType=QuestionType.EvidenceFocalFDG,GetStringFun=GetEvidenceFocalFDG,ComputationTriggerList=new List(){ ComputationTrigger.ImageQuality, }}, + new ReadingCalculateData (){QuestionType=QuestionType.EvidenceFocalFDG,GetStringFun=GetEvidenceFocalFDG,ComputationTriggerList=new List(){ ComputationTrigger.InitialCalculation, ComputationTrigger.ImageQuality, }}, //CT/MRI new ReadingCalculateData (){QuestionType=QuestionType.CTandMRI,GetStringFun=CTMRIEvaluation,ComputationTriggerList=new List(){ ComputationTrigger.InitialCalculation, ComputationTrigger.LiverStatus,ComputationTrigger.SplenicApexPosition,ComputationTrigger.PositionSpleenFloor,ComputationTrigger.SplenicEvaluation,ComputationTrigger.CTSave,ComputationTrigger.MergeSave,ComputationTrigger.RemoveLesion,ComputationTrigger.MergeLesion,}}, @@ -2672,8 +2672,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate /// public async Task GetUptakeChange(ReadingCalculateDto inDto) { - - if (await ImageQualityIsUnableFuse(inDto)) + var existPET = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.ExistPET).Select(x => x.Answer).FirstOrDefault(); + if (await ImageQualityIsUnableFuse(inDto)|| existPET.EqEnum(ReadingYesOrNo.No)) { if (inDto.IsBaseLine) { @@ -2686,13 +2686,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate } - var existPET = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.ExistPET).Select(x => x.Answer).FirstOrDefault(); - //本访视无PET图像 - if (existPET.EqEnum(ReadingYesOrNo.No)) - { - return SUVChangeVSBaseline.NotEvaluable.GetEnumInt(); - } - //PET5ps评分改变时,才计算 List needSearchTypes = new List() @@ -2936,7 +2929,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate public async Task GetEvidenceFocalFDG(ReadingCalculateDto inDto) { - if (await ImageQualityIsUnableFuse(inDto)) + if (await ImageQualityIsUnableFuse(inDto)|| inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.ExistPET && x.Answer == ReadingYesOrNo.No.GetEnumInt())) { if (inDto.IsBaseLine) { @@ -2947,11 +2940,6 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate return FDGAffinityFociInBM.NE.GetEnumInt(); } } - - if (inDto.QuestionInfo.Any(x => x.QuestionType == QuestionType.ExistPET && x.Answer == ReadingYesOrNo.No.GetEnumInt())) - { - return FDGAffinityFociInBM.NE.GetEnumInt(); - } else { return inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.EvidenceFocalFDG).Select(x => x.Answer).FirstOrDefault()??string.Empty;