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

修改

Uat_Study
he 2022-11-09 13:24:57 +08:00
parent 57323bc3f3
commit dfab80657b
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingGlobalTaskService.cs
View File

@ -137,7 +137,7 @@ namespace IRaCIS.Application.Services
result.TaskList.ForEach(x => result.TaskList.ForEach(x =>
{ {
x.AfterQuestionList = x.BeforeQuestionList.GroupJoin( x.AfterQuestionList = x.BeforeQuestionList.Where(x=>x.IsJudgeQuestion).GroupJoin(
globalReadingQuestion globalReadingQuestion
, l => new { a = l.QuestionId, b = x.VisitTaskId } , l => new { a = l.QuestionId, b = x.VisitTaskId }
, r => new { a = r.QuestionId, b = r.TaskId } , r => new { a = r.QuestionId, b = r.TaskId }

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

@ -718,6 +718,10 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
/// <returns></returns> /// <returns></returns>
public async Task<string> GetSiteVisitForTumorEvaluation(ReadingCalculateDto inDto) public async Task<string> GetSiteVisitForTumorEvaluation(ReadingCalculateDto inDto)
{ {
if(inDto.IsBaseLine)
{
return VisitTumorEvaluation.NA.GetEnumInt();
}
var isPD= await ChangeLastTaskSiteVisitForTumorEvaluation(inDto); var isPD= await ChangeLastTaskSiteVisitForTumorEvaluation(inDto);
var newLesionsCount = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.NewLesionsCount).Select(x => x.Answer).FirstOrDefault().IsNullOrEmptyReturn0(); var newLesionsCount = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.NewLesionsCount).Select(x => x.Answer).FirstOrDefault().IsNullOrEmptyReturn0();
var baseLineLesionsCount = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.BaseLineLesionsCount).Select(x => x.Answer).FirstOrDefault().IsNullOrEmptyReturn0(); var baseLineLesionsCount = inDto.QuestionInfo.Where(x => x.QuestionType == QuestionType.BaseLineLesionsCount).Select(x => x.Answer).FirstOrDefault().IsNullOrEmptyReturn0();

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

@ -1046,7 +1046,12 @@ namespace IRaCIS.Core.Domain.Share
/// <summary> /// <summary>
/// 非PD /// 非PD
/// </summary> /// </summary>
NoPD = 4 NoPD = 4,
/// <summary>
/// NA
/// </summary>
NA = 5
} }
/// <summary> /// <summary>