增加删除接口
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
fb43e38c7d
commit
010c106879
|
@ -9,6 +9,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc.DTO
|
||||||
{
|
{
|
||||||
public class SubjectImageUploadDTO
|
public class SubjectImageUploadDTO
|
||||||
{
|
{
|
||||||
|
public Guid VisitTaskId { get; set; }
|
||||||
public Guid SubejctId { get; set; }
|
public Guid SubejctId { get; set; }
|
||||||
|
|
||||||
public string SubjectCode { get; set; }
|
public string SubjectCode { get; set; }
|
||||||
|
|
|
@ -56,6 +56,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
|
||||||
var query = _repository.Where<VisitTask>(t => t.SubjectId == subjectId && t.SourceSubjectVisitId != null && t.DoctorUserId == _userInfo.Id)
|
var query = _repository.Where<VisitTask>(t => t.SubjectId == subjectId && t.SourceSubjectVisitId != null && t.DoctorUserId == _userInfo.Id)
|
||||||
.Select(u => new SubjectImageUploadDTO()
|
.Select(u => new SubjectImageUploadDTO()
|
||||||
{
|
{
|
||||||
|
VisitTaskId = u.Id,
|
||||||
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,
|
||||||
|
@ -95,7 +96,7 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
|
||||||
Modalities = t.Modalities,
|
Modalities = t.Modalities,
|
||||||
SeriesCount = t.SeriesCount,
|
SeriesCount = t.SeriesCount,
|
||||||
|
|
||||||
SopInstanceUidList=t.InstanceList.Select(t=>t.SopInstanceUid).ToList(),
|
SopInstanceUidList = t.InstanceList.Select(t => t.SopInstanceUid).ToList(),
|
||||||
|
|
||||||
}).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));
|
var findOriginStudy = studyList.FirstOrDefault(c => c.OrginalStudyList.Any(t => t.StudyInstanceUid == incommand.Study.StudyInstanceUid));
|
||||||
|
|
||||||
if (findOriginStudy==null)
|
if (findOriginStudy == null)
|
||||||
{
|
{
|
||||||
return ResponseOutput.NotOk("该检查不属于该受试者,请核查");
|
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.TrialId = incommand.TrialId;
|
||||||
//study.SiteId = incommand.SiteId;
|
//study.SiteId = incommand.SiteId;
|
||||||
study.SubjectId = incommand.SubjectId;
|
study.SubjectId = incommand.SubjectId;
|
||||||
|
@ -374,6 +375,16 @@ namespace IRaCIS.Core.Application.Service.ImageAndDoc
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
[HttpDelete]
|
||||||
|
public async Task<IResponseOutput> DeleteTaskStudy(Guid visitTaskId)
|
||||||
|
{
|
||||||
|
|
||||||
|
await _repository.BatchDeleteAsync<TaskStudy>(t => t.VisitTaskId == visitTaskId);
|
||||||
|
await _repository.BatchDeleteAsync<TaskSeries>(t => t.VisitTaskId == visitTaskId);
|
||||||
|
await _repository.BatchDeleteAsync<TaskInstance>(t => t.VisitTaskId == visitTaskId);
|
||||||
|
|
||||||
|
return ResponseOutput.Ok();
|
||||||
|
}
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 打包和匿名化影像 默认是匿名化打包,也可以不匿名化打包
|
/// 打包和匿名化影像 默认是匿名化打包,也可以不匿名化打包
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
Loading…
Reference in New Issue