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

修改

Uat_Study
he 2022-12-26 17:10:24 +08:00
parent 8924117833
commit bf29219da0
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -534,7 +534,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
} }
break; break;
case QuestionType.NewBoneLesionsCount: case QuestionType.NewBoneLesionsCount:
item.Answer = (await calculate.GetIntFun(inDto)).ToString(); item.Answer = (await calculate.GetIntFun(inDto)).ToString();
if (item.Answer=="-1")
{
item.Answer = nameof(YesOrNoOrNa.NA);
}
break; break;
case QuestionType.DaysBetween: case QuestionType.DaysBetween:
item.Answer = (await calculate.GetIntFun(inDto)).ToString(); item.Answer = (await calculate.GetIntFun(inDto)).ToString();
@ -668,26 +675,31 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
{ {
var taskList = await GetSiteVisitForTumorList(inDto); var taskList = await GetSiteVisitForTumorList(inDto);
var result = 0;
var findindex = taskList.OrderBy(x => x.VisitTaskNum).ToList().FindIndex(x => x.VisitTaskId == inDto.VisitTaskId); var findindex = taskList.OrderBy(x => x.VisitTaskNum).ToList().FindIndex(x => x.VisitTaskId == inDto.VisitTaskId);
var lastCount = 0;
if (findindex < 2) if (findindex < 2)
{ {
return -1; return -1;
} }
else if (findindex > 2) else
{ {
var lastTask = taskList.Where(x => x.VisitTaskNum < inDto.VisitTaskNum && x.VisitTaskId != inDto.VisitTaskId).OrderByDescending(x => x.VisitTaskNum).FirstOrDefault(); var twoindex = taskList.OrderBy(x => x.VisitTaskNum).ToList()[2];
var cewBoneLesionsCountQuestionId = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.NewBoneLesionsCount).Select(x => x.QuestionId).FirstOrDefault();
lastCount =(int) (await _readingTaskQuestionAnswerRepository.Where(x => x.VisitTaskId == lastTask.VisitTaskId && x.ReadingQuestionTrialId == cewBoneLesionsCountQuestionId).Select(x => x.Answer).FirstOrDefaultAsync()).IsNullOrEmptyReturn0();
}
var result= inDto.QuestionInfo.Where(x => x.LesionType == LesionType.NewLesions).SelectMany(x => x.TableRowInfoList)
result = inDto.QuestionInfo.Where(x => x.LesionType == LesionType.AlwaysNewLesions).SelectMany(x => x.TableRowInfoList)
.Where(x => x.FristAddTaskNum >= twoindex.VisitTaskNum && x.TableQuestionList.Any(y => y.QuestionMark == QuestionMark.State && y.Answer == EvaluationOfState.Exists.GetEnumInt())).Count()
+ inDto.QuestionInfo.Where(x => x.LesionType == LesionType.NewLesions).SelectMany(x => x.TableRowInfoList)
.Where(x => x.TableQuestionList.Any(y => y.QuestionMark == QuestionMark.State && y.Answer == EvaluationOfState.Exists.GetEnumInt())) .Where(x => x.TableQuestionList.Any(y => y.QuestionMark == QuestionMark.State && y.Answer == EvaluationOfState.Exists.GetEnumInt()))
.Count(); .Count();
}
return lastCount+ result;
return result;
} }
#endregion #endregion