XCKJ/irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
he
2022-09-21 15:47:08 +08:00
parent f584a5927f
commit d2e6094f8b
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Reading/ReadingCalculateService.cs
+8 -7
View File
@@ -208,6 +208,7 @@ namespace IRaCIS.Core.Application.Service
} }
} }
decimal a = 1.1m;
var questionIds = needAddList.Select(x => x.ReadingQuestionTrialId).ToList(); var questionIds = needAddList.Select(x => x.ReadingQuestionTrialId).ToList();
@@ -274,7 +275,7 @@ namespace IRaCIS.Core.Application.Service
if (question.Answer != calculateAnswer) if (question.Answer != calculateAnswer)
{ {
result.IsVerified = false; result.IsVerified = false;
var msg = $"问题【{question.QuesionName}】的答案为【{question.Answer}】但是计算答案为【{calculateAnswer}】"; var msg = $"问题【{question.QuesionName}】的答案与计算的答案不一致";
result.ErrorMessage += result.ErrorMessage == string.Empty ? msg : "," + msg; result.ErrorMessage += result.ErrorMessage == string.Empty ? msg : "," + msg;
} }
} }
@@ -444,7 +445,7 @@ namespace IRaCIS.Core.Application.Service
var value = await GetSODData(inDto); var value = await GetSODData(inDto);
if (value == null) if (value == null||inDto.IsBaseLine)
{ {
return null; return null;
} }
@@ -462,7 +463,7 @@ namespace IRaCIS.Core.Application.Service
{ {
var thisSOD = await GetSODData(inDto); var thisSOD = await GetSODData(inDto);
if (thisSOD == null) if (thisSOD == null||inDto.IsBaseLine)
{ {
return null; return null;
} }
@@ -492,7 +493,7 @@ namespace IRaCIS.Core.Application.Service
public async Task<decimal?> GetLowestIncrease(ReadingCalculateDto inDto) public async Task<decimal?> GetLowestIncrease(ReadingCalculateDto inDto)
{ {
var value = await GetSODData(inDto); var value = await GetSODData(inDto);
if (value == null) if (value == null||inDto.IsBaseLine)
{ {
return null; return null;
} }
@@ -514,7 +515,7 @@ namespace IRaCIS.Core.Application.Service
public async Task<decimal?> GetLowPercent(ReadingCalculateDto inDto) public async Task<decimal?> GetLowPercent(ReadingCalculateDto inDto)
{ {
var thisSOD = await GetSODData(inDto); var thisSOD = await GetSODData(inDto);
if (thisSOD == null) if (thisSOD == null||inDto.IsBaseLine)
{ {
return null; return null;
} }
@@ -650,7 +651,7 @@ namespace IRaCIS.Core.Application.Service
if (inDto.IsBaseLine) if (inDto.IsBaseLine)
{ {
return nameof(YesOrNoOrNa.NA); return OverallAssessment.NA.GetEnumInt();
} }
var targetLesion = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.TargetLesion).Select(x => x.Answer).FirstOrDefault(); var targetLesion = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.TargetLesion).Select(x => x.Answer).FirstOrDefault();
@@ -845,7 +846,7 @@ namespace IRaCIS.Core.Application.Service
var tableQuestion = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).SelectMany(x => x.TableRowInfoList).ToList(); var tableQuestion = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.TargetLesion).SelectMany(x => x.TableRowInfoList).ToList();
if (inDto.IsBaseLine) if (inDto.IsBaseLine)
{ {
return nameof(TargetAssessment.NA); return TargetAssessment.NA.GetEnumInt();
} }
if (tableQuestion.Count() == 0) if (tableQuestion.Count() == 0)
{ {