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

修改

Test.EIImageViewer
he 2023-03-10 13:12:24 +08:00
parent edabc6b376
commit 11a6ecb5bb
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -1384,9 +1384,12 @@ namespace IRaCIS.Application.Services
case CriterionType.RECIST1Pointt1: case CriterionType.RECIST1Pointt1:
var lastTaskinfo = await _visitTaskRepository var lastTaskinfo = await _visitTaskRepository
.Where(x => x.IsAnalysisCreate == taskinfo.IsAnalysisCreate && .Where(x => x.IsAnalysisCreate == taskinfo.IsAnalysisCreate &&
x.SubjectId==taskinfo.SubjectId&&
x.ReadingCategory == taskinfo.ReadingCategory && x.ReadingCategory == taskinfo.ReadingCategory &&
x.DoctorUserId == taskinfo.DoctorUserId && x.DoctorUserId == taskinfo.DoctorUserId &&
x.ArmEnum == taskinfo.ArmEnum && x.ArmEnum == taskinfo.ArmEnum &&
x.TrialReadingCriterionId==taskinfo.TrialReadingCriterionId&&
x.ReadingTaskState==ReadingTaskState.HaveSigned&&
x.TaskState == TaskState.Effect && x.TaskState == TaskState.Effect &&
x.IsSelfAnalysis == taskinfo.IsSelfAnalysis && x.IsSelfAnalysis == taskinfo.IsSelfAnalysis &&
x.VisitTaskNum < taskinfo.VisitTaskNum x.VisitTaskNum < taskinfo.VisitTaskNum
@ -1425,18 +1428,27 @@ namespace IRaCIS.Application.Services
var thisAnswer = inDto.AnswerList.Where(x => x.TableQuestionId == shortAxisQuestion.Id).Select(x => x.Answer).FirstOrDefault(); var thisAnswer = inDto.AnswerList.Where(x => x.TableQuestionId == shortAxisQuestion.Id).Select(x => x.Answer).FirstOrDefault();
if (!lastAnswer.IsNullOrEmpty() && !thisAnswer.IsNullOrEmpty()) if (!lastAnswer.IsNullOrEmpty() && !thisAnswer.IsNullOrEmpty())
{ {
var lastvalue = 0m;
var thisvalue = 0m;
try try
{ {
if (decimal.Parse(lastAnswer) >= decimal.Parse(thisAnswer)) lastvalue = decimal.Parse(lastAnswer);
{ thisvalue = decimal.Parse(thisAnswer);
throw new BusinessValidationFailedException(_localizer["ReadingImage_IsLymphNotbigger"]);
}
} }
catch (Exception) catch (Exception)
{ {
} }
if (lastvalue >= thisvalue)
{
throw new BusinessValidationFailedException(_localizer["ReadingImage_IsLymphNotbigger"]);
}
} }
} }
} }
@ -1453,18 +1465,25 @@ namespace IRaCIS.Application.Services
var thisAnswer = inDto.AnswerList.Where(x => x.TableQuestionId == majorAxisQuestion.Id).Select(x => x.Answer).FirstOrDefault(); var thisAnswer = inDto.AnswerList.Where(x => x.TableQuestionId == majorAxisQuestion.Id).Select(x => x.Answer).FirstOrDefault();
if (!lastAnswer.IsNullOrEmpty() && !thisAnswer.IsNullOrEmpty()) if (!lastAnswer.IsNullOrEmpty() && !thisAnswer.IsNullOrEmpty())
{ {
var lastvalue = 0m;
var thisvalue = 0m;
try try
{ {
if (decimal.Parse(lastAnswer) >= decimal.Parse(thisAnswer)) lastvalue = decimal.Parse(lastAnswer);
{ thisvalue = decimal.Parse(thisAnswer);
throw new BusinessValidationFailedException(_localizer["ReadingImage_NotLymphNotbigger"]);
}
} }
catch (Exception) catch (Exception)
{ {
} }
if (lastvalue >= thisvalue)
{
throw new BusinessValidationFailedException(_localizer["ReadingImage_NotLymphNotbigger"]);
}
} }
} }
} }