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

修改

Uat_Study
hang 2022-04-27 17:55:52 +08:00
parent 29fe343519
commit 8c82f04545
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
IRaCIS.Core.Application/Service/QC/DTO/QCListViewModel.cs
View File

@ -31,6 +31,8 @@ namespace IRaCIS.Core.Application.Contracts
public AuditStateEnum[]? AuditStateArray { get; set; }
public ChallengeStateEnum? ChallengeState { get; set; }
public bool? IsUrgent { get; set; }
public Guid TrialId { get; set; }
public Guid? SiteId { get; set; }
@ -161,6 +163,8 @@ namespace IRaCIS.Core.Application.Contracts
//public string VisitPlanInfo { get; set; } = String.Empty;
public string SubjectCode { get; set; } = String.Empty;
public QCChanllengeReuploadEnum? ReuploadEnum { get; set; }
public ChallengeStateEnum? ChallengeState { get; set; }
public bool? IsUrgent { get; set; }
public Guid? SubjectId { get; set; }
public Guid? SiteId { get; set; }

3
IRaCIS.Core.Application/Service/QC/QCListService.cs
View File

@ -165,6 +165,7 @@ namespace IRaCIS.Core.Application.Image.QA
var svExpression = GetQCChallengeFilter(challengeQuery.VisitPlanArray);
var query2 = _repository.Where<QCChallenge>(x => x.TrialId == challengeQuery.TrialId)
.WhereIf(challengeQuery.ChallengeState != null, t => t.SubjectVisit.ChallengeState == challengeQuery.ChallengeState)
.WhereIf(challengeQuery.ReuploadEnum != null, t => t.ReuploadEnum == challengeQuery.ReuploadEnum)
.WhereIf(challengeQuery.IsClosed != null, t => t.IsClosed == challengeQuery.IsClosed)
.WhereIf(challengeQuery.SiteId != null, t => t.SubjectVisit.SiteId == challengeQuery.SiteId)
@ -254,6 +255,7 @@ namespace IRaCIS.Core.Application.Image.QA
var svExpression = GetQCChallengeFilter(challengeQuery.VisitPlanArray);
var query = _repository.Where<QCChallenge>(x => x.TrialId == challengeQuery.TrialId)
.WhereIf(challengeQuery.ChallengeState != null, t => t.SubjectVisit.ChallengeState == challengeQuery.ChallengeState)
.WhereIf(challengeQuery.ReuploadEnum != null, t => t.ReuploadEnum == challengeQuery.ReuploadEnum)
.WhereIf(challengeQuery.IsClosed != null, t => t.IsClosed == challengeQuery.IsClosed)
.WhereIf(challengeQuery.SiteId != null, t => t.SubjectVisit.SiteId == challengeQuery.SiteId)
@ -441,6 +443,7 @@ namespace IRaCIS.Core.Application.Image.QA
var svExpression = GetSubjectVisitFilter(visitSearchDTO.VisitPlanArray);
var query = _subjectVisitRepository.Where(x => x.TrialId == visitSearchDTO.TrialId)
.WhereIf(visitSearchDTO.ChallengeState != null, t => t.ChallengeState == visitSearchDTO.ChallengeState)
.WhereIf(visitSearchDTO.SiteId != null, t => t.SiteId == visitSearchDTO.SiteId)
.WhereIf(visitSearchDTO.SubjectId != null, t => t.Subject.Id == visitSearchDTO.SubjectId)
.WhereIf(!string.IsNullOrEmpty(visitSearchDTO.SubjectInfo), t => /*t.Subject.FirstName.Contains(subjectInfo) || t.Subject.LastName.Contains(subjectInfo) ||*/ t.Subject.Code.Contains(visitSearchDTO.SubjectInfo))