diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index efb3f7d5d..2b49ca324 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -862,6 +862,12 @@ + + + 删除病灶获取起始病灶序号 + + + 获取阅片报告 @@ -1002,11 +1008,23 @@ + + + 删除病灶获取起始病灶序号 + + + 获取Sod的值 + + + 删除病灶获取起始病灶序号(RECIST1Point1 固定是1) + + + 获取阅片报告 @@ -1268,6 +1286,12 @@ + + + 删除病灶获取起始病灶序号 + + + 获取ReadingCalculateDto @@ -1317,6 +1341,12 @@ + + + 删除病灶获取起始病灶序号 + + + 名称 diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs index 14f5c4809..6e3173e4e 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs @@ -715,9 +715,9 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate public async Task GetSiteVisitForTumorEvaluation(ReadingCalculateDto inDto) { await ChangeLastTaskSiteVisitForTumorEvaluation(inDto); - var newLesionsCount = int.Parse(inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.NewLesionsCount).Select(x => x.Answer).FirstOrDefault() ?? "0"); - var baseLineLesionsCount = int.Parse(inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.BaseLineLesionsCount).Select(x => x.Answer).FirstOrDefault() ?? "0"); - var alwaysNewLesionsCount = int.Parse(inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.AlwaysNewLesionsCount).Select(x => x.Answer).FirstOrDefault() ?? "0"); + var newLesionsCount = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.NewLesionsCount).Select(x => x.Answer).FirstOrDefault().IsNullOrEmptyReturn0(); + var baseLineLesionsCount = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.BaseLineLesionsCount).Select(x => x.Answer).FirstOrDefault().IsNullOrEmptyReturn0(); + var alwaysNewLesionsCount = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.AlwaysNewLesionsCount).Select(x => x.Answer).FirstOrDefault().IsNullOrEmptyReturn0(); if (newLesionsCount == 0 && baseLineLesionsCount == 0 && alwaysNewLesionsCount == 0)