XCKJ
/
EI-Image-Viewer-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Test.EIImageViewer
he 2022-11-04 17:21:55 +08:00
parent c0bea29626
commit 2ee384470f
6 changed files with 89 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -927,6 +927,13 @@
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.PCWG3CalculateService.GetNumberOfDaysBetween(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
<summary>
获取
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.PCWG3CalculateService.GetSiteVisitForTumorEvaluation(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
<summary>
访视点肿瘤评估
@ -941,6 +948,13 @@
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.PCWG3CalculateService.GetSiteVisitForTumorList(IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto)">
<summary>
获取访视日期信息
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="F:IRaCIS.Core.Application.Service.ReadingCalculate.ReadingCalculateService.CalculateServiceDic">
<summary>
标准和服务对应
@ -1161,13 +1175,6 @@
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.RECIST1Point1CalculateService.ChangeAllLowPercent(IRaCIS.Core.Application.Service.Reading.Dto.ChangeAllTaskDto)">
<summary>
修改整个访视期间SOD最低点相比增加的百分比
</summary>
<param name="inDto"></param>
<returns></returns>
</member>
<member name="M:IRaCIS.Core.Application.Service.ReadingCalculate.RECIST1Point1CalculateService.ChangeAllLowVisitName(IRaCIS.Core.Application.Service.Reading.Dto.ChangeAllTaskDto)">
<summary>
修改最低方式点名称
@ -1775,6 +1782,11 @@
是否只改其他任务
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.ReadingCalculateDto.DigitPlaces">
<summary>
修约小数点
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.QuestionInfo.Answer">
<summary>
答案
@ -2345,6 +2357,11 @@
是否是裁判问题
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingTaskDto.DigitPlaces">
<summary>
修约小数点
</summary>
</member>
<member name="T:IRaCIS.Core.Application.Service.Reading.Dto.GetTrialConfirmCriterionListOutDto">
<summary>
返回对象
@ -6310,6 +6327,11 @@
阅片平台
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.DigitPlaces">
<summary>
修约小数点
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.GetTrialReadingInfoOutDto.ReadingQuestionCriterionSystemId">
<summary>
系统标准ID
@ -6610,16 +6632,16 @@
表单类型
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.SetTrialReadingCriterionInDto.DigitPlaces">
<summary>
修约小数点
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.SetCriterionReadingInfoInDto.TrialReadingCriterionId">
<summary>
项目标准ID
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.SetCriterionReadingInfoInDto.DigitPlaces">
<summary>
修约小数点
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Contracts.SetCriterionReadingInfoInDto.ReadingTool">
<summary>
阅片工具

2
IRaCIS.Core.Application/Service/Reading/Dto/ReadingCalculateViewModel.cs
View File

@ -175,6 +175,8 @@ namespace IRaCIS.Core.Application.Service.Reading.Dto
/// </summary>
public string QuesionName { get; set; }
public ValueOfType? ValueType { get; set; }
/// <summary>
/// 病灶类型
/// </summary>

1
IRaCIS.Core.Application/Service/ReadingCalculate/GeneralCalculateService.cs
View File

@ -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

24
IRaCIS.Core.Application/Service/ReadingCalculate/PCWG3CalculateService.cs
View File

@ -512,8 +512,28 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
item.Answer =string.Empty;
break;
}
#endregion
// 修改修约小数位数
try
{
List<ValueOfType?> valueOfTypes = new List<ValueOfType?>() {
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();

25
IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
View File

@ -395,6 +395,27 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
item.Answer = await calculate.GetStringFun(inDto);
}
#endregion
// 修改修约小数位数
try
{
List<ValueOfType?> valueOfTypes = new List<ValueOfType?>() {
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;
}

9
IRaCIS.Core.Domain.Share/Reading/ReadEnum.cs
View File

@ -361,9 +361,14 @@ namespace IRaCIS.Core.Domain.Share
Exists = 2,
/// <summary>
/// 良性或不可评估
/// 良性
/// </summary>
Benign = 3
Benign = 3,
/// <summary>
/// 不可评估
/// </summary>
UnableEvaluate = 4,
}