From bcdd8b7e2be3e34b2cdc9eff0cb91944d87490e4 Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Tue, 18 Jul 2023 13:46:46 +0800 Subject: [PATCH] S-74 --- .../Service/TrialSiteUser/DTO/PersonalWorkstationViewModel.cs | 2 ++ .../Service/TrialSiteUser/PersonalWorkstation.cs | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/PersonalWorkstationViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/PersonalWorkstationViewModel.cs index 33ccd99e4..2bdfd6ff9 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/PersonalWorkstationViewModel.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/PersonalWorkstationViewModel.cs @@ -256,6 +256,8 @@ namespace IRaCIS.Core.Application.Contracts public int? UrgentCount { get; set; } public int? ToBeDealedCount { get; set; } + + public int? ReadModuleCount { get; set; } } public class TrialToBeDoneQuery : PageInput diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs index 7fef5df9d..38cc91d51 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs @@ -441,8 +441,8 @@ namespace IRaCIS.Core.Application TrialCode = t.TrialCode, UrgentCount = t.SubjectVisitList.Where(u => u.IsBaseLine && u.SubmitState != SubmitStateEnum.Submitted && u.IsUrgent).Count(), ToBeDealedCount = t.ReadingClinicalDataList.Where(x=>!x.IsSign&& x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC && x.ClinicalDataTrialSet.ClinicalDataLevel != ClinicalLevel.SubjectVisit).Count(), - - }).Where(x=>x.ToBeDealedCount>0); + ReadModuleCount=t.ReadModuleList.Count(), + }).Where(x=>x.ToBeDealedCount>0).Where(x => x.ReadModuleCount > 0); var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageClinicalDataToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);