XCKJ
/
EI-Image-Viewer-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改检查上传

Test.EIImageViewer
hang 2023-03-02 11:58:47 +08:00
parent a862ec5561
commit 271fa2bccc
2 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
IRaCIS.Core.API/Controllers/UploadDownLoadController.cs
View File

@ -246,7 +246,7 @@ namespace IRaCIS.Core.API.Controllers
IsSuccess = false, IsSuccess = false,
UploadStartTime = DateTime.Now, UploadStartTime = DateTime.Now,
IsDicom = true, IsDicom = preArchiveStudyCommand.IsDicom,
IP = _userInfo.IP IP = _userInfo.IP
}; };
@ -269,7 +269,6 @@ namespace IRaCIS.Core.API.Controllers
[FromServices] IStudyService _studyService, [FromServices] IStudyService _studyService,
[FromServices] IHubContext<UploadHub, IUploadClient> _uploadHub, [FromServices] IHubContext<UploadHub, IUploadClient> _uploadHub,
[FromServices] IDicomArchiveService _dicomArchiveService, [FromServices] IDicomArchiveService _dicomArchiveService,
[FromServices] IRepository _repository,
[FromServices] IRepository<StudyMonitor> _studyMonitorRepository [FromServices] IRepository<StudyMonitor> _studyMonitorRepository
) )
{ {
@ -634,20 +633,25 @@ namespace IRaCIS.Core.API.Controllers
/// <param name="formCollection"></param> /// <param name="formCollection"></param>
/// <param name="subjectVisitId"></param> /// <param name="subjectVisitId"></param>
/// <param name="noneDicomStudyId"></param> /// <param name="noneDicomStudyId"></param>
/// <param name="studyMonitorId"></param>
/// <param name="_noneDicomStudyRepository"></param>
/// <returns></returns> /// <returns></returns>
//[DisableRequestSizeLimit] //[DisableRequestSizeLimit]
[RequestSizeLimit(1_073_741_824)] [RequestSizeLimit(1_073_741_824)]
[HttpPost("NoneDicomStudy/UploadNoneDicomFile/{trialId:guid}/{subjectVisitId:guid}/{noneDicomStudyId:guid}")] [HttpPost("NoneDicomStudy/UploadNoneDicomFile/{trialId:guid}/{subjectVisitId:guid}/{noneDicomStudyId:guid}/{studyMonitorId:guid}")]
[TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })] [TypeFilter(typeof(TrialResourceFilter), Arguments = new object[] { "AfterStopCannNotOpt" })]
[Authorize(Policy = IRaCISPolicy.CRC)] [Authorize(Policy = IRaCISPolicy.CRC)]
public async Task<IResponseOutput> UploadNoneDicomFile(IFormCollection formCollection, Guid subjectVisitId, Guid noneDicomStudyId, [FromServices] IRepository<NoneDicomStudy> _noneDicomStudyRepository) public async Task<IResponseOutput> UploadNoneDicomFile(IFormCollection formCollection, Guid subjectVisitId, Guid noneDicomStudyId, Guid studyMonitorId,
[FromServices] IRepository<NoneDicomStudy> _noneDicomStudyRepository, [FromServices] IRepository<StudyMonitor> _studyMonitorRepository)
{ {
var startTime = DateTime.Now;
await QCCommon.VerifyIsCRCSubmmitAsync(_repository, _userInfo, subjectVisitId); await QCCommon.VerifyIsCRCSubmmitAsync(_repository, _userInfo, subjectVisitId);
var sv = (await _repository.Where<SubjectVisit>(t => t.Id == subjectVisitId).Select(t => new { t.TrialId, t.SiteId, t.SubjectId }).FirstOrDefaultAsync()).IfNullThrowConvertException(); var sv = (await _repository.Where<SubjectVisit>(t => t.Id == subjectVisitId).Select(t => new { t.TrialId, t.SiteId, t.SubjectId }).FirstOrDefaultAsync()).IfNullThrowConvertException();
var studyMonitor = await _studyMonitorRepository.FirstOrDefaultAsync(t => t.Id == studyMonitorId);
studyMonitor.UploadFinishedTime = DateTime.Now;
await FileUploadAsync(async (fileName) => await FileUploadAsync(async (fileName) =>
{ {
@ -669,23 +673,14 @@ namespace IRaCIS.Core.API.Controllers
noneDicomStudy.FileCount = noneDicomStudy.FileCount + formCollection.Files.Count; noneDicomStudy.FileCount = noneDicomStudy.FileCount + formCollection.Files.Count;
await _repository.AddAsync(new StudyMonitor() studyMonitor.FileCount = formCollection.Files.Count;
{ studyMonitor.FileSize = formCollection.Files.Sum(t => t.Length);
FileCount = formCollection.Files.Count, studyMonitor.IsDicom = false;
FileSize = formCollection.Files.Sum(t => t.Length), studyMonitor.IsDicomReUpload = false;
IsDicom = false, studyMonitor.StudyId = noneDicomStudyId;
IsDicomReUpload = false, studyMonitor.StudyCode = noneDicomStudy.StudyCode;
StudyId = noneDicomStudyId, studyMonitor.ArchiveFinishedTime = DateTime.Now;
StudyCode = noneDicomStudy.StudyCode, studyMonitor.IP = _userInfo.IP;
UploadStartTime = startTime,
UploadFinishedTime = uploadFinishedTime,
ArchiveFinishedTime=DateTime.Now,
IP = _userInfo.IP,
TrialId = sv.TrialId,
SiteId = sv.SiteId,
SubjectId = sv.SubjectId,
SubjectVisitId = subjectVisitId,
});
await _repository.SaveChangesAsync(); await _repository.SaveChangesAsync();

2
IRaCIS.Core.Application/Service/Visit/DTO/VisitPointViewModel.cs
View File

@ -223,6 +223,8 @@ namespace IRaCIS.Core.Application.Contracts
{ {
public Guid SubjectVisitId { get; set; } public Guid SubjectVisitId { get; set; }
public bool IsDicom { get; set; }
} }