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

修改

Uat_Study
he 2022-11-07 11:43:44 +08:00
parent 0956df5290
commit 85028d2b3e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -752,7 +752,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
if (lastTask != null) if (lastTask != null)
{ {
var lastTasknewLesionsCount = int.Parse(await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == lastTask.VisitTaskId && x.ReadingQuestionTrialId == newLesionsCountQuestionId).Select(x => x.Answer).FirstOrDefaultAsync() ?? "0"); var lastTasknewLesionsCount = (await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == lastTask.VisitTaskId && x.ReadingQuestionTrialId == newLesionsCountQuestionId).Select(x => x.Answer).FirstOrDefaultAsync()).IsNullOrEmptyReturn0();
if (lastTask.VisitTaskNum == 1m) if (lastTask.VisitTaskNum == 1m)
{ {
//基线后第二个访视（应满足访视间隔6周以上，否则顺延） //基线后第二个访视（应满足访视间隔6周以上，否则顺延）
@ -761,12 +761,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{ {
// 第二访视数量 // 第二访视数量
var secondVisitLesionsCount = int.Parse(await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == lastTask.VisitTaskId && x.ReadingQuestionTrialId == newLesionsCountQuestionId).Select(x => x.Answer).FirstOrDefaultAsync() ?? "0"); var secondVisitLesionsCount = (await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == lastTask.VisitTaskId && x.ReadingQuestionTrialId == newLesionsCountQuestionId).Select(x => x.Answer).FirstOrDefaultAsync()).IsNullOrEmptyReturn0();
// 判断是否是当前访视 // 判断是否是当前访视
if (secondVisit.VisitTaskId == inDto.VisitTaskId) if (secondVisit.VisitTaskId == inDto.VisitTaskId)
{ {
secondVisitLesionsCount = int.Parse(inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.NewLesionsCount).Select(x => x.Answer).FirstOrDefault() ?? "0"); secondVisitLesionsCount = (inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.NewLesionsCount).Select(x => x.Answer).FirstOrDefault()).IsNullOrEmptyReturn0();
} }
if (lastTasknewLesionsCount >= 2 && secondVisitLesionsCount >= 2) if (lastTasknewLesionsCount >= 2 && secondVisitLesionsCount >= 2)
@ -778,7 +778,7 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
} }
else else
{ {
var thisVisitTaskNewLesionsCount= int.Parse(inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.NewLesionsCount).Select(x => x.Answer).FirstOrDefault() ?? "0"); var thisVisitTaskNewLesionsCount= (inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.NewLesionsCount).Select(x => x.Answer).FirstOrDefault()).IsNullOrEmptyReturn0();
var thisVisitTask = taskList.LastOrDefault(); var thisVisitTask = taskList.LastOrDefault();