S-15

2023-07-05 18:31:09 +08:00
parent 6dbfda36ee
commit 090868b299
4 changed files with 80 additions and 10 deletions
@@ -112,7 +112,6 @@ namespace IRaCIS.Core.Application.Contracts

    public class ReviewerSelectToBeDoneQuery : PageInput
    {
-
    }

    public class ReviewerSelectToBeDoneDto : TrialBaseInfoDto
@@ -21,15 +21,19 @@ namespace IRaCIS.Core.Application
        private readonly IRepository<TrialUser> _trialUserRepository;
        private readonly IRepository<TrialDocument> _trialDocumentRepository;
        private readonly IRepository<SystemDocument> _systemDocumentRepository;
+        private readonly IRepository<ReadModule> _readModuleRepository;
        private readonly IRepository<SystemNotice> _systemNoticeRepository;

        public PersonalWorkstation(IRepository<Trial> trialRepository, IRepository<TrialUser> trialUserRepository, IRepository<TrialDocument> trialDocumentRepository,
-            IRepository<SystemDocument> systemDocumentRepository, IRepository<SystemNotice> systemNoticeRepository)
+            IRepository<SystemDocument> systemDocumentRepository,
+             IRepository<ReadModule> readModuleRepository,
+            IRepository<SystemNotice> systemNoticeRepository)
        {
            _trialRepository = trialRepository;
            _trialUserRepository = trialUserRepository;
            _trialDocumentRepository = trialDocumentRepository;
            _systemDocumentRepository = systemDocumentRepository;
+            this._readModuleRepository = readModuleRepository;
            _systemNoticeRepository = systemNoticeRepository;
        }

@@ -302,8 +306,9 @@ namespace IRaCIS.Core.Application
        [HttpPost]
        public async Task<IResponseOutput<PageOutput<GetPMClinicalDataToBeDoneListOutDto>>> GetPMClinicalDataToBeDoneList(ReviewerSelectToBeDoneQuery inQuery)
        {
+            
            var query = _trialRepository
-            .Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
+                .Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
                .Select(t => new GetPMClinicalDataToBeDoneListOutDto()
                {
                    TrialId = t.Id,
@@ -317,8 +322,17 @@ namespace IRaCIS.Core.Application

            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ReviewerSelectToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
       
-            
-            return ResponseOutput.Ok(result, new { ToBeApprovalCount =  query.Sum(x=>x.ToBeApprovalCount) }); ;
+
+            var all =await _trialRepository
+                .Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
+                .Select(t => new GetPMClinicalDataToBeDoneListOutDto()
+                {
+
+
+                    ToBeApprovalCount = t.ReadModuleList.Where(u => u.IsCRCConfirm && !u.IsPMConfirm).Count()
+                }).ToListAsync();
+
+            return ResponseOutput.Ok(result, new { ToBeApprovalCount = all.Sum(x=>x.ToBeApprovalCount) }); ;
        }

        #endregion