临床数据查询修改

IRaCIS.Core.Application/Service/Reading/ClinicalData/ClinicalAnswerService.cs

@@ -540,6 +540,7 @@ namespace IRaCIS.Core.Application.Service
 
 
             var query = _readModuleRepository.Where(x => x.TrialId == inDto.TrialId)
+                .WhereIf(inDto.ReadModuleId==null,x=>x.TrialReadingCriterion.IsConfirm)
                 .WhereIf(inDto.ReadModuleId != null, x => x.Id == inDto.ReadModuleId)
                 .WhereIf(inDto.IsCRCConfirm != null, x => x.IsCRCConfirm == inDto.IsCRCConfirm)
                  .WhereIf(inDto.IsPMConfirm != null, x => x.IsPMConfirm == inDto.IsPMConfirm)

IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs

@@ -437,6 +437,12 @@ namespace IRaCIS.Core.Application
             var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, inQuery.SortField, inQuery.Asc, string.IsNullOrWhiteSpace(inQuery.SortField), defalutSortArray);
 
 
+                })).CurrentPageData.Count();
+            }
+
+
+            result.CurrentPageData = result.CurrentPageData.Where(x => x.ReadModuleCount != 0).ToList();
+
             var toBeDealedCount = _subjectVisitRepository
                  //.Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id) && t.Trial.clinicalDataTrialSets.Any(t => t.ClinicalDataLevel == ClinicalLevel.Subject && t.IsConfirm))
                  .Where(u => u.IsBaseLine && u.SubmitState != SubmitStateEnum.Submitted).Count();