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

修改

Uat_Study
he 2022-11-10 13:43:30 +08:00
parent 55b98cae7b
commit f68a46da54
3 changed files with 36 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,7 +135,7 @@ namespace IRaCIS.Application.Services
var globalReadingQuestion = await _readingGlobalTaskInfoRepository.Where(x => x.GlobalTaskId == inDto.VisitTaskId).ToListAsync(); var globalReadingQuestion = await _readingGlobalTaskInfoRepository.Where(x => x.GlobalTaskId == inDto.VisitTaskId).ToListAsync();
result.TaskList.ForEach(x => result.TaskList.ForEach(async x =>
{ {
x.AfterQuestionList = x.BeforeQuestionList.Where(x=>x.IsJudgeQuestion).GroupJoin( x.AfterQuestionList = x.BeforeQuestionList.Where(x=>x.IsJudgeQuestion).GroupJoin(
globalReadingQuestion globalReadingQuestion
@ -180,15 +180,17 @@ namespace IRaCIS.Application.Services
}; };
var criterionType = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == taskInfo.TrialReadingCriterionId).Select(x => x.CriterionType).FirstOrDefaultAsync();
List<GetGlobalQuestionType> questionTypes = new List<GetGlobalQuestionType>() List<GetGlobalQuestionType> questionTypes = new List<GetGlobalQuestionType>()
{ {
new GetGlobalQuestionType (){GlobalAnswerType=GlobalAnswerType.UpdateType,QuestionName="评估更新类型" },
new GetGlobalQuestionType (){GlobalAnswerType=GlobalAnswerType.Reason,QuestionName="全局阅片备注" },
//new GetGlobalQuestionType (){GlobalAnswerType=GlobalAnswerType.AgreeOrNot,QuestionName="是否同意访视结果" },
}; };
if(criterionType== CriterionType.PCWG3)
{
questionTypes.Add(new GetGlobalQuestionType() { GlobalAnswerType = GlobalAnswerType.UpdateType, QuestionName = "评估更新类型" });
}
questionTypes.Add(new GetGlobalQuestionType() { GlobalAnswerType = GlobalAnswerType.Reason, QuestionName = "全局阅片备注" });
foreach (var item in questionTypes) foreach (var item in questionTypes)
{ {
x.AfterQuestionList.Add(new GlobalQuestionInfo() x.AfterQuestionList.Add(new GlobalQuestionInfo()

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

@ -936,7 +936,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
.Select(x => x.RowId).Distinct().ToListAsync(); .Select(x => x.RowId).Distinct().ToListAsync();
IEnumerable<string> measureDataList = rowAnswerList.Where(x => !unableEvaluateRowIds.Contains(x.Id)).Select(x => x.OrderMark + x.RowIndex.GetLesionMark()).ToList(); List<string> measureDataList = rowAnswerList.Where(x => !unableEvaluateRowIds.Contains(x.Id)).Select(x => x.OrderMark + x.RowIndex.GetLesionMark()).ToList();
List<string> stateIsNullList = tableAnswerList.Select(x => x.OrderMark + x.RowIndex.GetLesionMark()).ToList();
List<string> allExists = measureDataList.Intersect(stateIsNullList).ToList();
measureDataList = measureDataList.Except(allExists).ToList();
stateIsNullList = stateIsNullList.Except(allExists).ToList();
if (measureDataList.Count() > 0) if (measureDataList.Count() > 0)
@ -947,7 +954,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
if (tableAnswerList.Count > 0) if (tableAnswerList.Count > 0)
{ {
errorMassage += $" 病灶{ string.Join(',', tableAnswerList.Select(x => x.OrderMark + x.RowIndex.GetLesionMark()))}状态为空,"; errorMassage += $" 病灶{ string.Join(',', stateIsNullList)}状态为空,";
}
if (allExists.Count > 0)
{
errorMassage += $" 病灶{ string.Join(',', stateIsNullList)}未做标记，且状态为空,";
} }

16
IRaCIS.Core.Application/Service/ReadingCalculate/RECIST1Point1CalculateService.cs
View File

@ -527,7 +527,14 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
.Select(x => x.RowId).Distinct().ToListAsync(); .Select(x => x.RowId).Distinct().ToListAsync();
IEnumerable<string> measureDataList = rowAnswerList.Where(x => !unableEvaluateRowIds.Contains(x.Id)).Select(x => x.OrderMark + x.RowIndex.GetLesionMark()).ToList(); List<string> measureDataList = rowAnswerList.Where(x => !unableEvaluateRowIds.Contains(x.Id)).Select(x => x.OrderMark + x.RowIndex.GetLesionMark()).ToList();
List<string> stateIsNullList = tableAnswerList.Select(x => x.OrderMark + x.RowIndex.GetLesionMark()).ToList();
List<string> allExists = measureDataList.Intersect(stateIsNullList).ToList();
measureDataList = measureDataList.Except(allExists).ToList();
stateIsNullList = stateIsNullList.Except(allExists).ToList();
if (measureDataList.Count() > 0) if (measureDataList.Count() > 0)
@ -538,7 +545,12 @@ namespace IRaCIS.Core.Application.Service.ReadingCalculate
if (tableAnswerList.Count > 0) if (tableAnswerList.Count > 0)
{ {
errorMassage += $" 病灶{ string.Join(',', tableAnswerList.Select(x => x.OrderMark + x.RowIndex.GetLesionMark()))}状态为空,"; errorMassage += $" 病灶{ string.Join(',', stateIsNullList)}状态为空,";
}
if (allExists.Count > 0)
{
errorMassage += $" 病灶{ string.Join(',', stateIsNullList)}未做标记，且状态为空,";
} }