diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 3f0593e11..eccd5759d 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -927,6 +927,13 @@ + + + 获取 + + + + 访视点肿瘤评估 @@ -941,6 +948,13 @@ + + + 获取访视日期信息 + + + + 标准和服务对应 @@ -1161,13 +1175,6 @@ - - - 修改整个访视期间SOD最低点相比增加的百分比 - - - - 修改最低方式点名称 @@ -1775,6 +1782,11 @@ 是否只改其他任务 + + + 修约小数点 + + 答案 @@ -2345,6 +2357,11 @@ 是否是裁判问题 + + + 修约小数点 + + 返回对象 @@ -6310,6 +6327,11 @@ 阅片平台 + + + 修约小数点 + + 系统标准ID @@ -6610,16 +6632,16 @@ 表单类型 - - - 修约小数点 - - 项目标准ID + + + 修约小数点 + + 阅片工具 diff --git a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs index 47242c654..3863cff3b 100644 --- a/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs +++ b/IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs @@ -175,6 +175,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto /// public string QuesionName { get; set; } + public ValueOfType? ValueType { get; set; } + /// /// 病灶类型 /// diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/GeneralCalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/GeneralCalculateService.cs index b7ea032eb..e656ea69b 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/GeneralCalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/GeneralCalculateService.cs @@ -71,6 +71,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate QuestionId = x.Id, QuesionName = x.QuestionName, QuestionType = x.QuestionType, + ValueType = x.ValueType, }).ToListAsync(); var questionAnswers = await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == visitTaskId).Select(x => new diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs index 49cbb64f8..a456f594c 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs @@ -512,8 +512,28 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate item.Answer =string.Empty; break; } - + #endregion + + // 修改修约小数位数 + try + { + List valueOfTypes = new List() { + + ValueOfType.Decimals, + ValueOfType.Percentage + }; + + if (valueOfTypes.Contains(item.ValueType)) + { + item.Answer = decimal.Round(decimal.Parse(item.Answer ?? "0"), inDto.DigitPlaces).ToString(); + } + } + catch (Exception) + { + + + } needAddList.Add(new ReadingTaskQuestionAnswer() { Answer = item.Answer, @@ -809,7 +829,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate }).ToListAsync(); - var unableEvaluateRowIds = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.Answer == EvaluationOfState.Benign.GetEnumInt() + var unableEvaluateRowIds = await _readingTableQuestionAnswerRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && x.Answer == EvaluationOfState.UnableEvaluate.GetEnumInt() && x.ReadingTableQuestionTrial.QuestionMark == QuestionMark.State ) .Select(x => x.RowId).Distinct().ToListAsync(); diff --git a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs index 03d74bc4f..6c3454321 100644 --- a/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs +++ b/IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs @@ -395,6 +395,27 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate item.Answer = await calculate.GetStringFun(inDto); } #endregion + // 修改修约小数位数 + try + { + List valueOfTypes = new List() { + + ValueOfType.Decimals, + ValueOfType.Percentage + }; + + if (valueOfTypes.Contains(item.ValueType)) + { + item.Answer = decimal.Round(decimal.Parse(item.Answer??"0"), inDto.DigitPlaces).ToString(); + } + } + catch (Exception) + { + + + } + + needAddList.Add(new ReadingTaskQuestionAnswer() { Answer = item.Answer, @@ -752,7 +773,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate } else { - return decimal.Round((thisSOD.NullChange0() - baseLineSOD) * 100 / baseLineSOD, inDto.DigitPlaces); + return (thisSOD.NullChange0() - baseLineSOD) * 100 / baseLineSOD; } } #endregion @@ -804,7 +825,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate } else { - return decimal.Round((thisSOD.NullChange0() - minSOD) * 100 / minSOD, inDto.DigitPlaces); + return (thisSOD.NullChange0() - minSOD) * 100 / minSOD; } diff --git a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs index 9736bcd42..b27843434 100644 --- a/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs +++ b/IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs @@ -361,9 +361,14 @@ namespace IRaCIS.Core.Domain.Share Exists = 2, /// - /// 良性或不可评估 + /// 良性 /// - Benign = 3 + Benign = 3, + + /// + /// 不可评估 + /// + UnableEvaluate = 4, }