diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs index caa5e5e3a..eaea51e5d 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DTO/DownloadAndUploadDTO.cs @@ -9,6 +9,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc.DTO { public class SubjectImageUploadDTO { + public Guid VisitTaskId { get; set; } public Guid SubejctId { get; set; } public string SubjectCode { get; set; } diff --git a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs index df8f8086e..ea4a93fae 100644 --- a/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs +++ b/IRaCIS.Core.Application/Service/ImageAndDoc/DownloadAndUploadService.cs @@ -56,6 +56,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc var query = _repository.Where(t => t.SubjectId == subjectId && t.SourceSubjectVisitId != null && t.DoctorUserId == _userInfo.Id) .Select(u => new SubjectImageUploadDTO() { + VisitTaskId = u.Id, SubejctId = u.SubjectId, SubjectCode = u.IsSelfAnalysis == true ? u.Subject.Code : u.BlindSubjectCode, TaskBlindName = u.TaskBlindName, @@ -95,7 +96,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc Modalities = t.Modalities, SeriesCount = t.SeriesCount, - SopInstanceUidList=t.InstanceList.Select(t=>t.SopInstanceUid).ToList(), + SopInstanceUidList = t.InstanceList.Select(t => t.SopInstanceUid).ToList(), }).ToList() }) @@ -162,7 +163,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc var findOriginStudy = studyList.FirstOrDefault(c => c.OrginalStudyList.Any(t => t.StudyInstanceUid == incommand.Study.StudyInstanceUid)); - if (findOriginStudy==null) + if (findOriginStudy == null) { return ResponseOutput.NotOk("该检查不属于该受试者,请核查"); } @@ -210,7 +211,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc } - study.Id = IdentifierHelper.CreateGuid(incommand.Study.StudyInstanceUid, incommand.TrialId.ToString(),findOriginStudy.VisitTaskId.ToString()); + study.Id = IdentifierHelper.CreateGuid(incommand.Study.StudyInstanceUid, incommand.TrialId.ToString(), findOriginStudy.VisitTaskId.ToString()); study.TrialId = incommand.TrialId; //study.SiteId = incommand.SiteId; study.SubjectId = incommand.SubjectId; @@ -374,6 +375,16 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc } + [HttpDelete] + public async Task DeleteTaskStudy(Guid visitTaskId) + { + + await _repository.BatchDeleteAsync(t => t.VisitTaskId == visitTaskId); + await _repository.BatchDeleteAsync(t => t.VisitTaskId == visitTaskId); + await _repository.BatchDeleteAsync(t => t.VisitTaskId == visitTaskId); + + return ResponseOutput.Ok(); + } /// /// 打包和匿名化影像 默认是匿名化打包,也可以不匿名化打包 ///