Compare commits

..

No commits in common. "a965ab93366ff08f5d935e26705a430cf8fe93dc" and "f8b7e7d764e53699e2c9c52ec00ae2eb1fa2a357" have entirely different histories.

2 changed files with 1 additions and 14 deletions

View File

@ -20,8 +20,6 @@ namespace IRaCIS.Core.Application.Contracts
public bool IsDeleted { get; set; }
public bool IsBeMark { get; set; }
public DateTime? MarkTime { get; set; }
}

View File

@ -485,16 +485,13 @@ namespace IRaCIS.Core.Application.Service
List<NoneDicomStudyView> result = await noneDicomStudyQueryable.OrderBy(x => x.ImageDate).ThenBy(x => x.CreateTime).ToListAsync();
// 获取非DIOCM标记
var nonoDicomStudyFileIds = await _readingNoneDicomMarkRepository.Where(x => x.VisitTaskId == inDto.VisistTaskId).ToListAsync();
var markFileId = nonoDicomStudyFileIds.Select(x => x.NoneDicomFileId).ToList();
var nonoDicomStudyFileIds = await _readingNoneDicomMarkRepository.Where(x => x.VisitTaskId == inDto.VisistTaskId).ToListAsync();
if (nonoDicomStudyFileIds.Count > 0 && taskinfo.ReadingTaskState == ReadingTaskState.HaveSigned)
{
var studyId = nonoDicomStudyFileIds.Select(x => x.StudyId).FirstOrDefault();
var noneDicomids = nonoDicomStudyFileIds.Select(x => x.NoneDicomFileId).ToList();
var noneDicomStudyViewMark = new NoneDicomStudyView() { Id = Guid.NewGuid() };
noneDicomStudyViewMark.IsCriticalSequence = true;
noneDicomStudyViewMark.NoneDicomStudyFileList = await _noneDicomStudyFileRepository.Where(x => noneDicomids.Contains(x.Id)).ProjectTo<NoneDicomStudyFileView>(_mapper.ConfigurationProvider).ToListAsync();
@ -509,14 +506,6 @@ namespace IRaCIS.Core.Application.Service
}
foreach (var item in result)
{
foreach (var item1 in item.NoneDicomStudyFileList)
{
item1.IsBeMark= markFileId.Contains(item1.Id);
}
}
var trialInfo = await _trialRepository.Where(x => x.Id == inDto.TrialId).Select(x => new
{