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

修改警告 3
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
hang
2023-11-30 17:27:09 +08:00
parent 5346a12641
commit 2e549869af
14 changed files with 70 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
+11 -11
View File
@@ -559,7 +559,7 @@ namespace IRaCIS.Application.Services
VisitTaskId = item.VisitTaskId,
});
item.IsExistsClinicalData = clinicalDataList.Count() > 0;
item.IsExistsClinicalData = clinicalDataList.Count > 0;
}
@@ -1159,7 +1159,7 @@ namespace IRaCIS.Application.Services
this.FindChildQuestion(x, newPageQusetionList, tableQuestionList, inDto.TableAnswers, inDto.TableAnsweRowInfos, inDto.OrganInfos, baseLineTableAnswer, isFirstChangeTask, lastTaskTableAnswer, inDto.TaskId);
});
page.Childrens = pageGroupList.Where(x => !(x.Type == ReadingQestionType.Group && x.Childrens.Count() == 0)).ToList();
page.Childrens = pageGroupList.Where(x => !(x.Type == ReadingQestionType.Group && x.Childrens.Count == 0)).ToList();
groupList.Add(page);
}
@@ -1176,7 +1176,7 @@ namespace IRaCIS.Application.Services
this.FindChildQuestion(x, qusetionList, tableQuestionList, inDto.TableAnswers, inDto.TableAnsweRowInfos, inDto.OrganInfos, baseLineTableAnswer, isFirstChangeTask, lastTaskTableAnswer, inDto.TaskId);
});
groupList = groupList.Where(x => !(x.Type == ReadingQestionType.Group && x.Childrens.Count() == 0)).ToList();
groupList = groupList.Where(x => !(x.Type == ReadingQestionType.Group && x.Childrens.Count == 0)).ToList();
result.SinglePage = groupList;
@@ -1436,7 +1436,7 @@ namespace IRaCIS.Application.Services
var rowsInfo = await _readingTableAnswerRowInfoRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId && (x.Id == inDto.MainRowId || x.Id == inDto.MergeRowId)).ToListAsync();
if (rowsInfo.Count() != 2)
if (rowsInfo.Count != 2)
{
throw new BusinessValidationFailedException(_localizer["ReadingImage_NotaTask"]);
}
@@ -2071,7 +2071,7 @@ namespace IRaCIS.Application.Services
}
var isCurrentTaskAddList = await _readingTableAnswerRowInfoRepository.Where(x => x.Id == (inDto.RowId ?? default(Guid))).Select(x => x.IsCurrentTaskAdd).ToListAsync();
bool isCurrentTaskAdd = true;
if (isCurrentTaskAddList.Count() > 0)
if (isCurrentTaskAddList.Count > 0)
{
isCurrentTaskAdd = isCurrentTaskAddList[0];
}
@@ -2274,7 +2274,7 @@ namespace IRaCIS.Application.Services
readingQuestionList = readingQuestionList.Where(x => !answerQuestionIds.Contains(x.Id)).ToList();
if (readingQuestionList.Count() > 0)
if (readingQuestionList.Count > 0)
{
throw new BusinessValidationFailedException(_localizer["ReadingImage_RequiredQuestion", string.Join(',', readingQuestionList.Select(x => x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us)))]);
}
@@ -2320,7 +2320,7 @@ namespace IRaCIS.Application.Services
readingQuestionList = readingQuestionList.Where(x => !answerQuestionIds.Contains(x.Id)).ToList();
if (readingQuestionList.Count() > 0)
if (readingQuestionList.Count > 0)
{
throw new BusinessValidationFailedException(_localizer["ReadingImage_RequiredQuestion", string.Join(',', readingQuestionList.Select(x => x.QuestionName.LanguageName(x.QuestionEnName, _userInfo.IsEn_Us)))]);
}
@@ -2346,7 +2346,7 @@ namespace IRaCIS.Application.Services
if (isBaseLine)
{
isNeedReadClinicalData = clinicalDataList.Count() > 0;
isNeedReadClinicalData = clinicalDataList.Count > 0;
}
else
{
@@ -2532,12 +2532,12 @@ namespace IRaCIS.Application.Services
VisitTaskId = task.VisitTaskId,
});
task.IsExistsClinicalData = clinicalDataList.Count() > 0;
task.IsExistsClinicalData = clinicalDataList.Count > 0;
task.IsReadClinicalData = visitTaskInfo.IsReadClinicalData;
if (isBaseLine)
{
task.IsNeedReadClinicalData = clinicalDataList.Count() > 0;
task.IsNeedReadClinicalData = clinicalDataList.Count > 0;
}
else
{
@@ -2553,7 +2553,7 @@ namespace IRaCIS.Application.Services
task.IsConvertedTask = visitTaskInfo.IsConvertedTask;
var blindSubjectCode = await _visitTaskRepository.Where(x => x.Id == task.VisitTaskId).Select(x => x.BlindSubjectCode).FirstNotNullAsync();
task.SubjectCode = blindSubjectCode.IsNullOrEmpty() ? task.SubjectCode : blindSubjectCode;
task.ExistsManual = (await GetManualList(new GetManualListInDto() { TrialId = visitTaskInfo.TrialId })).Count() > 0;
task.ExistsManual = (await GetManualList(new GetManualListInDto() { TrialId = visitTaskInfo.TrialId })).Count > 0;
task.ReadingTaskState = visitTaskInfo.ReadingTaskState;
return task;
}