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

修改下载列表
continuous-integration/drone/push Build is passing Details

Test_HIR_Net8
hang 2025-11-21 16:00:01 +08:00
parent fccf6686eb
commit 2017d781bf
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IRaCIS.Core.Application/Service/Visit/DTO/PatientViewModel.cs
View File

@ -974,8 +974,7 @@ namespace IRaCIS.Application.Contracts
public class VisitImageDownloadQuery : PageInput
{
[NotDefault]
public Guid TrialId { get; set; }
public Guid? TrialId { get; set; }
public string? IP { get; set; }

12
IRaCIS.Core.Application/Service/Visit/PatientService.cs
View File

@ -54,7 +54,7 @@ namespace IRaCIS.Application.Services
[ApiExplorerSettings(GroupName = "HIR")]
public class PatientService(IRepository<SCPStudySubjectVisit> _studySubjectVisitRepository,
IRepository<TrialIdentityUser> _trialIdentityUserRepository,
IRepository<SCPStudy> _SCPStudyRepository, IOSSService _oSSService,
IRepository<SCPStudy> _SCPStudyRepository, IOSSService _oSSService,
IRepository<IdentityUser> _identityUserRepository,
IRepository<SubjectPatient> _subjectPatientRepository, IRepository<SCPStudyHospitalGroup> _SCPStudyHospitalGroupRepository,
IRepository<Trial> _trialRepository,
@ -3235,7 +3235,7 @@ namespace IRaCIS.Application.Services
catch (Exception ex)
{
Console.WriteLine($"[{DateTime.Now:yyyy-MM-dd HH:mm:ss}] SCP下载失败 SeriesId: {item.SeriesId} Path:{item.Path} Error: {ex.Message}\n" );
Console.WriteLine($"[{DateTime.Now:yyyy-MM-dd HH:mm:ss}] SCP下载失败 SeriesId: {item.SeriesId} Path:{item.Path} Error: {ex.Message}\n");
}
@ -3284,7 +3284,7 @@ namespace IRaCIS.Application.Services
Console.WriteLine($"[{DateTime.Now:yyyy-MM-dd HH:mm:ss}] 下载失败 SeriesId: {item.SeriesId} Path:{item.Path} Error: {ex.Message}\n");
}
}
@ -3605,12 +3605,14 @@ namespace IRaCIS.Application.Services
[HttpPost]
public async Task<IResponseOutput<PageOutput<VisitImageDownloadView>>> GetTrialSubjectVisitDownloadList(VisitImageDownloadQuery inQuery)
{
var query = _subejctVisitDownloadRepository.Where(t => t.SubjectVisit.TrialId == inQuery.TrialId)
var query = _subejctVisitDownloadRepository
.WhereIf(inQuery.TrialId != null, t => t.SubjectVisit.TrialId == inQuery.TrialId)
.WhereIf(inQuery.TrialId == null, t => t.SubjectVisitId == null)
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.IP), t => t.IP.Contains(inQuery.IP))
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.SubjectCode), t => t.SubjectVisit.Subject.Code.Contains(inQuery.SubjectCode))
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.VisitName), t => t.SubjectVisit.VisitName.Contains(inQuery.VisitName))
.WhereIf(!string.IsNullOrWhiteSpace(inQuery.Name), t => t.CreateUserRole.UserName.Contains(inQuery.Name) || t.CreateUserRole.FullName.Contains(inQuery.Name))
.WhereIf(inQuery.UserTypeEnum != null, t => t.CreateUserRole.UserTypeRole.UserTypeEnum == inQuery.UserTypeEnum)
.WhereIf(inQuery.UserTypeEnum != null, t => t.CreateUserRole.UserTypeRole.UserTypeEnum == inQuery.UserTypeEnum)
.WhereIf(inQuery.BeginDownloadTime != null, t => t.CreateTime >= inQuery.BeginDownloadTime)
.WhereIf(inQuery.EndDownloadTime != null, t => t.CreateTime <= inQuery.EndDownloadTime)