S-85

2023-07-19 17:30:20 +08:00
parent ec53815bb0
commit b1cf4dc592
8 changed files with 103 additions and 19 deletions
@@ -441,11 +441,50 @@ namespace IRaCIS.Core.Application
                    ExperimentName = t.ExperimentName,
                    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(),
+                    ToBeDealedCount = t.ReadingClinicalDataList.Where(x=>!x.IsSign&& x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC && x.ClinicalDataTrialSet.ClinicalDataLevel != ClinicalLevel.SubjectVisit&& x.ClinicalDataTrialSet.ClinicalDataLevel != ClinicalLevel.Subject).Count(),
                    ToBeVisitCount= t.ReadingClinicalDataList.Where(x => !x.IsSign && x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC && x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit).Count(),
                    ToAllCount= t.ReadingClinicalDataList.Where(x => !x.IsSign && x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC ).Count(),
                    ReadModuleCount =t.ReadModuleList.Where(x=>!x.IsPMConfirm).Count(),
-                }).Where(x=>x.ToAllCount > 0);
+                }).Where(x=>x.ToBeDealedCount > 0);
+
+            var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageClinicalDataToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
+
+            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();
+
+            return ResponseOutput.Ok(result, new { TotalToBeDealedCount = toBeDealedCount });
+
+        }
+
+
+        /// <summary>
+        /// 临床数据  --CRC 待确认
+        /// </summary>
+        /// <param name="inQuery"></param>
+        /// <param name="_subjectVisitRepository"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IResponseOutput<PageOutput<ImageClinicalDataToBeDoneDto>>> GetImageClinicalDataToBeConfirmList(ImageClinicalDataToBeDoneQuery inQuery,
+            [FromServices] IRepository<SubjectVisit> _subjectVisitRepository,
+              [FromServices] IRepository<Trial> _trialRepository)
+        {
+
+            var query = _trialRepository
+                .Where(t => t.TrialUserList.Any(t => t.UserId == _userInfo.Id))
+                //.Where(t => t.clinicalDataTrialSets.Any(t => t.ClinicalDataLevel == ClinicalLevel.Subject && t.IsConfirm))
+                .Select(t => new ImageClinicalDataToBeDoneDto()
+                {
+                    TrialId = t.Id,
+                    ResearchProgramNo = t.ResearchProgramNo,
+                    ExperimentName = t.ExperimentName,
+                    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 && x.ClinicalDataTrialSet.ClinicalDataLevel != ClinicalLevel.Subject).Count(),
+                    ToBeVisitCount = t.ReadingClinicalDataList.Where(x => !x.IsSign && x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC && x.ClinicalDataTrialSet.ClinicalDataLevel == ClinicalLevel.SubjectVisit).Count(),
+                    ToAllCount = t.ReadingClinicalDataList.Where(x => !x.IsSign && x.ClinicalDataTrialSet.UploadRole == UploadRole.CRC).Count(),
+                    ReadModuleCount = t.ReadModuleList.Where(x => !x.IsPMConfirm).Count(),
+                }).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);