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

修改下载展示列表
continuous-integration/drone/push Build is running Details

IRC_NewDev
hang 2024-05-17 15:21:06 +08:00
parent ed62de9135
commit 6e5a3a0078
2 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs
View File

@ -17,6 +17,9 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc.DTO
public string TaskName { get; set; } public string TaskName { get; set; }
public Guid? SourceSubjectVisitId { get; set; }
public PackState PackState { get; set; }
public List<StudyBasicInfo> OrginalStudyList { get; set; } public List<StudyBasicInfo> OrginalStudyList { get; set; }
public List<StudyBasicInfo> UploadStudyList { get; set; } public List<StudyBasicInfo> UploadStudyList { get; set; }

36
IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs
View File

@ -37,25 +37,29 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
/// </summary> /// </summary>
/// <param name="subjectId"></param> /// <param name="subjectId"></param>
/// <returns></returns> /// <returns></returns>
public async Task<IResponseOutput<List<SubjectImageUploadDTO> >> GetSubjectImageUploadList(Guid subjectId) public async Task<IResponseOutput<List<SubjectImageUploadDTO>>> GetSubjectImageUploadList(Guid subjectId)
{ {
var query=_repository.Where<VisitTask>(t=>t.Id==subjectId) var query = _repository.Where<VisitTask>(t => t.Id == subjectId && t.SourceSubjectVisitId != null)
.Select(u=>new SubjectImageUploadDTO() .Select(u => new SubjectImageUploadDTO()
{ {
SubejctId=u.SubjectId, SubejctId = u.SubjectId,
SubjectCode=u.IsSelfAnalysis==true? u.Subject.Code:u.BlindSubjectCode, SubjectCode = u.IsSelfAnalysis == true ? u.Subject.Code : u.BlindSubjectCode,
TaskBlindName=u.TaskBlindName, TaskBlindName = u.TaskBlindName,
TaskName=u.TaskName, TaskName = u.TaskName,
OrginalStudyList=u.SourceSubjectVisit.StudyList.Select(t=>new StudyBasicInfo()
SourceSubjectVisitId = u.SourceSubjectVisitId,
PackState = u.SourceSubjectVisit.PackState,
OrginalStudyList = u.SourceSubjectVisit.StudyList.Select(t => new StudyBasicInfo()
{ {
Id=t.Id, Id = t.Id,
Description=t.Description, Description = t.Description,
InstanceCount=t.InstanceCount, InstanceCount = t.InstanceCount,
Modalities=t.Modalities, Modalities = t.Modalities,
SeriesCount=t.SeriesCount, SeriesCount = t.SeriesCount,
}).ToList(), }).ToList(),
UploadStudyList=u.TaskStudyList.Select(t => new StudyBasicInfo() UploadStudyList = u.TaskStudyList.Select(t => new StudyBasicInfo()
{ {
Id = t.Id, Id = t.Id,
Description = t.Description, Description = t.Description,
@ -66,7 +70,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
}) })
; ;
var list =await query.ToListAsync(); var list = await query.ToListAsync();
return ResponseOutput.Ok(list); return ResponseOutput.Ok(list);
} }
@ -79,7 +83,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
/// <param name="isAnonymize"></param> /// <param name="isAnonymize"></param>
/// <returns></returns> /// <returns></returns>
public async Task<IResponseOutput> RequestPackageAndAnonymizImage(Guid trialId, Guid subjectVisitId, bool isAnonymize = true) public async Task<IResponseOutput> RequestPackageAndAnonymizImage(Guid trialId, Guid subjectVisitId, bool isAnonymize = true)
{ {
var subjectVisit = await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == subjectVisitId); var subjectVisit = await _subjectVisitRepository.FirstOrDefaultAsync(t => t.Id == subjectVisitId);