diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 1082f8c01..481fe4e45 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -3384,6 +3384,11 @@ VisitTaskId + + + 标记工具 + + TrialId @@ -3824,6 +3829,11 @@ 任务Id + + + 标记工具 + + 截图地址 diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs index 811dbced7..0705f5770 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/IRECIST1Point1CalculateService.cs @@ -535,10 +535,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate //整体肿瘤评估 new ReadingCalculateData (){QuestionType=QuestionType.Tumor,GetStringFun=GetTumor,IsConvertedTask=false}, - // 转化时整体肿瘤评估 - new ReadingCalculateData (){QuestionType=QuestionType.Tumor,GetStringFun=GetConvertingTumor,IsConvertedTask=true,IsBeTransforming=true}, - + new ReadingCalculateData (){QuestionType=QuestionType.Tumor,GetStringFun=GetConvertingTumor,IsConvertedTask=true,IsBeTransforming=true}, //IRECIST整体肿瘤评估 new ReadingCalculateData (){QuestionType=QuestionType.Tumor,GetStringFun=GetIRECSITTargetLesionEvaluate,IsConvertedTask=true}, @@ -1812,7 +1810,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate /// { /// 非靶病灶疗效为 iCPD /// } - /// else if (满足RECIST1.1的PD标准 && 任一非靶病灶状态评估为“显著增大(iUPD)”) + /// else if (任一非靶病灶状态评估为“显著增大(iUPD)”) /// { /// 非靶病灶疗效为 iUPD /// } @@ -1898,8 +1896,8 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate // 非靶病灶疗效为 iCPD result = NoTargetAssessment.iCPD; } - // else if (满足RECIST1.1的PD标准 && 任一非靶病灶状态评估为“显著增大(iUPD)”) - else if (data.RECISTPD && data.ExistiUPD) + // else if ( 任一非靶病灶状态评估为“显著增大(iUPD)”) + else if ( data.ExistiUPD) { // 非靶病灶疗效为 iUPD result = NoTargetAssessment.iUPD;