非dicom 检查列表返回任务Id
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
735083999e
commit
72e54fe0d9
|
@ -453,7 +453,7 @@ namespace IRaCIS.Core.Application.Contracts
|
||||||
|
|
||||||
public class TaskNoneDicomStudyDTO : NoneDicomStudyBasicInfo
|
public class TaskNoneDicomStudyDTO : NoneDicomStudyBasicInfo
|
||||||
{
|
{
|
||||||
|
public Guid VisitTaskId { get; set; }
|
||||||
|
|
||||||
public int UploadedFileCount { get; set; }
|
public int UploadedFileCount { get; set; }
|
||||||
|
|
||||||
|
|
|
@ -1016,6 +1016,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
|
||||||
TaskBlindName = u.TaskBlindName,
|
TaskBlindName = u.TaskBlindName,
|
||||||
TaskName = u.TaskName,
|
TaskName = u.TaskName,
|
||||||
SourceSubjectVisitId = u.SourceSubjectVisitId,
|
SourceSubjectVisitId = u.SourceSubjectVisitId,
|
||||||
|
VisitTaskId=u.Id,
|
||||||
|
|
||||||
Id = ns.Id,
|
Id = ns.Id,
|
||||||
Description = ns.Description,
|
Description = ns.Description,
|
||||||
|
@ -1037,16 +1038,16 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
|
||||||
|
|
||||||
var list = await query.Where(t => t.SubjectCode == inQuery.SubjectCode).SortToListAsync(inQuery);
|
var list = await query.Where(t => t.SubjectCode == inQuery.SubjectCode).SortToListAsync(inQuery);
|
||||||
|
|
||||||
var noneDicomStudyIdList = list.Select(t => t.Id).ToList();
|
var noneDicomStudyTaskIdList = list.Select(t => t.VisitTaskId).ToList();
|
||||||
|
|
||||||
|
|
||||||
var taskNoneDicomStudyList = _visitTaskRepository.Where(t => noneDicomStudyIdList.Contains(t.Id))
|
var taskNoneDicomStudyList = _visitTaskRepository.Where(t => noneDicomStudyTaskIdList.Contains(t.Id))
|
||||||
.SelectMany(t => t.TaskNoneDicomStudyFileList).Where(t => noneDicomStudyIdList.Contains((Guid)t.VisitTaskId))
|
.SelectMany(t => t.TaskNoneDicomStudyFileList).Where(t => noneDicomStudyTaskIdList.Contains((Guid)t.VisitTaskId))
|
||||||
.Select(u => new NoneDicomFileInfo
|
.Select(u => new NoneDicomFileInfo
|
||||||
{
|
{
|
||||||
OriginNoneDicomStudyId = u.OriginNoneDicomStudyId,
|
OriginNoneDicomStudyId = u.OriginNoneDicomStudyId,
|
||||||
|
|
||||||
FileType=u.FileType
|
FileType=u.FileType,
|
||||||
FileName = u.FileName,
|
FileName = u.FileName,
|
||||||
FileSize = u.FileSize,
|
FileSize = u.FileSize,
|
||||||
Path = u.Path
|
Path = u.Path
|
||||||
|
|
Loading…
Reference in New Issue