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

修改标记信息
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
he 2025-06-13 16:01:23 +08:00
parent f1b943b6b0
commit 05cc46a6d6
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
IRaCIS.Core.Application/Service/Reading/ReadingImageTask/ReadingImageTaskService.cs
View File

@ -1190,6 +1190,17 @@ namespace IRaCIS.Core.Application.Service
var organIds = tableAnsweRowInfos.Where(x => x.OrganInfoId != null).Select(x => x.OrganInfoId).Distinct().ToList(); var organIds = tableAnsweRowInfos.Where(x => x.OrganInfoId != null).Select(x => x.OrganInfoId).Distinct().ToList();
var organList = await _organInfoRepository.Where(x => organIds.Contains(x.Id)).ToListAsync(); var organList = await _organInfoRepository.Where(x => organIds.Contains(x.Id)).ToListAsync();
// 删除病灶不删除病灶标记 所以查询question的时候 已经删除的病灶对应的标记的信息要排除
var rowids = await _readingTableAnswerRowInfoRepository.Where(x => x.Id == inDto.VisitTaskId).Select(x => x.Id).ToListAsync();
List<Guid?> rowidnull = rowids.Select(x => (Guid?)x).ToList();
var tableQuestionMarkList = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId
&& x.RowId == null || rowidnull.Contains(x.RowId)
).ProjectTo<QuestionMarkInfo>(_mapper.ConfigurationProvider).ToListAsync();
return (await GetReadingTableQuestion( return (await GetReadingTableQuestion(
new GetReadingTableQuestionOrAnswerInDto() new GetReadingTableQuestionOrAnswerInDto()
{ {
@ -1206,7 +1217,7 @@ namespace IRaCIS.Core.Application.Service
{ {
IsBaseline = taskInfo.SourceSubjectVisit != null && taskInfo.SourceSubjectVisit.IsBaseLine, IsBaseline = taskInfo.SourceSubjectVisit != null && taskInfo.SourceSubjectVisit.IsBaseLine,
ReadingTaskState = taskInfo.ReadingTaskState, ReadingTaskState = taskInfo.ReadingTaskState,
QuestionMarkInfoList = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.VisitTaskId).ProjectTo<QuestionMarkInfo>(_mapper.ConfigurationProvider).ToListAsync(), QuestionMarkInfoList = tableQuestionMarkList,
}); });
} }
@ -1221,14 +1232,7 @@ namespace IRaCIS.Core.Application.Service
{ {
var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstNotNullAsync(); var criterionInfo = await _readingQuestionCriterionTrialRepository.Where(x => x.Id == inDto.TrialReadingCriterionId).FirstNotNullAsync();
// 删除病灶不删除病灶标记 所以查询question的时候 已经删除的病灶对应的标记的信息要排除 var tableQuestionMarkList = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.TaskId).ProjectTo<TableQuestionMark>(_mapper.ConfigurationProvider).ToListAsync();
var rowids = await _readingTableAnswerRowInfoRepository.Where(x => x.Id == inDto.TaskId).Select(x => x.Id).ToListAsync();
List<Guid?> rowidnull = rowids.Select(x => (Guid?)x).ToList();
var tableQuestionMarkList = await _readingTaskQuestionMarkRepository.Where(x => x.VisitTaskId == inDto.TaskId
&&x.RowId==null|| rowidnull.Contains(x.RowId)
).ProjectTo<TableQuestionMark>(_mapper.ConfigurationProvider).ToListAsync();
var qusetionList = await _readingQuestionTrialRepository var qusetionList = await _readingQuestionTrialRepository
.Where(x => x.IsShowInDicom) .Where(x => x.IsShowInDicom)
.WhereIf(inDto.QuestionClassify != null, x => x.QuestionClassify == inDto.QuestionClassify) .WhereIf(inDto.QuestionClassify != null, x => x.QuestionClassify == inDto.QuestionClassify)