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

修改

IRC_NewDev
he 2024-03-21 14:07:04 +08:00
parent 510104d0ff
commit 726a2be71e
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,9 @@ namespace IRaCIS.Core.Application.Contracts
public class GetNextQCInfoInDto public class GetNextQCInfoInDto
{ {
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
}
public Guid? VisitId { get; set; }
}
public class QCVisitSearchDTO : PageInput public class QCVisitSearchDTO : PageInput
{ {
@ -50,7 +52,9 @@ namespace IRaCIS.Core.Application.Contracts
public bool? IsUrgent { get; set; } public bool? IsUrgent { get; set; }
public Guid TrialId { get; set; } public Guid TrialId { get; set; }
public Guid? SiteId { get; set; } public Guid? SiteId { get; set; }
public Guid? SubjectId { get; set; }
public Guid? VisitId { get; set; }
public Guid? SubjectId { get; set; }
public string SubjectInfo { get; set; } = String.Empty; public string SubjectInfo { get; set; } = String.Empty;

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

@ -248,26 +248,26 @@ namespace IRaCIS.Core.Application.Image.QA
/// <param name="inDto"></param> /// <param name="inDto"></param>
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
public async Task<QCVisitViewModel?> GetNextQCInfo(GetNextQCInfoInDto inDto) public async Task<QCVisitViewModel?> GetNextQCInfo(GetNextQCInfoInDto inDto)
{ {
var result= await GetQCVisitList(new QCVisitSearchDTO() var result = await GetQCVisitList(new QCVisitSearchDTO()
{ {
TrialId = inDto.TrialId,
CurrentActionUserId = _userInfo.Id,
VisitId = inDto.VisitId,
PageIndex = 1,
PageSize = 1,
});
TrialId = inDto.TrialId, return result.Item1.CurrentPageData.Count > 0 ? result.Item1.CurrentPageData[0] : null;
CurrentActionUserId=_userInfo.Id, }
PageIndex=1,
PageSize=1,
});
return result.Item1.CurrentPageData.Count > 0 ? result.Item1.CurrentPageData[0] : null; /// <summary>
} /// QC 访视列表
/// </summary>
/// <summary> /// <param name="visitSearchDTO"></param>
/// QC 访视列表 /// <returns></returns>
/// </summary> [HttpPost]
/// <param name="visitSearchDTO"></param>
/// <returns></returns>
[HttpPost]
public async Task<(PageOutput<QCVisitViewModel>, TrialSubjectAndSVConfig)> GetQCVisitList(QCVisitSearchDTO visitSearchDTO) public async Task<(PageOutput<QCVisitViewModel>, TrialSubjectAndSVConfig)> GetQCVisitList(QCVisitSearchDTO visitSearchDTO)
{ {
@ -431,7 +431,8 @@ namespace IRaCIS.Core.Application.Image.QA
var svExpression = QCCommon.GetSubjectVisitFilter(visitSearchDTO.VisitPlanArray); var svExpression = QCCommon.GetSubjectVisitFilter(visitSearchDTO.VisitPlanArray);
var query = _subjectVisitRepository.Where(x => x.TrialId == visitSearchDTO.TrialId) var query = _subjectVisitRepository.Where(x => x.TrialId == visitSearchDTO.TrialId)
.WhereIf(visitSearchDTO.CurrentActionUserId != null, t => t.CurrentActionUserId == visitSearchDTO.CurrentActionUserId) .WhereIf(visitSearchDTO.VisitId != null, t => t.Id == visitSearchDTO.VisitId)
.WhereIf(visitSearchDTO.CurrentActionUserId != null, t => t.CurrentActionUserId == visitSearchDTO.CurrentActionUserId)
.WhereIf(visitSearchDTO.ChallengeState != null, t => t.ChallengeState == visitSearchDTO.ChallengeState) .WhereIf(visitSearchDTO.ChallengeState != null, t => t.ChallengeState == visitSearchDTO.ChallengeState)
.WhereIf(visitSearchDTO.SiteId != null, t => t.SiteId == visitSearchDTO.SiteId) .WhereIf(visitSearchDTO.SiteId != null, t => t.SiteId == visitSearchDTO.SiteId)
.WhereIf(visitSearchDTO.SubjectId != null, t => t.Subject.Id == visitSearchDTO.SubjectId) .WhereIf(visitSearchDTO.SubjectId != null, t => t.Subject.Id == visitSearchDTO.SubjectId)