自动产生一致性核查任务列表

2022-06-10 11:51:40 +08:00
parent 92274e954d
commit d1068711b4
8 changed files with 437 additions and 130 deletions
@@ -9,6 +9,7 @@ using IRaCIS.Core.Application.Auth;
 using IRaCIS.Core.Application.Service.Reading.Dto;
 using IRaCIS.Core.Domain.Share.Reading;
 using MassTransit;
+
 using IRaCIS.Core.Infra.EFCore.Common;
 using IRaCIS.Core.Infrastructure.Extention;

@@ -115,7 +116,9 @@ namespace IRaCIS.Application.Services
        [HttpPost]
        public async Task<PageOutput<PreviewTheReadingListOutDto>> GetPreviewTheReadingList(PreviewTheReadingListInDto inDto)
        {
-            var visitQuery = _subjectVisitRepository.Where(x => x.TrialId == inDto.TrialId &&x.LatestScanDate!=null)
+
+
+            var visitQuery = _subjectVisitRepository.Where(x => x.TrialId == inDto.TrialId && x.InPlan&&x.LatestScanDate!=null)
                .WhereIf(inDto.SiteIds.Count != 0, x => inDto.SiteIds.Contains(x.SiteId));
            var existsBubjectVisitsQuery=  _readModuleRepository.Where(y => y.ReadingSetType == inDto.ReadingSetType && y.TrialId == inDto.TrialId).Select(x => x.SubjectVisitId);
            visitQuery = visitQuery.Where(x => !existsBubjectVisitsQuery.Contains(x.Id))