S-73

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

@@ -205,7 +205,7 @@ namespace IRaCIS.Core.Application
 
                     ToBeRepliedCount = t.SubjectVisitList.Where(u => u.CheckState == CheckStateEnum.CVIng &&
                     u.CheckChallengeDialogList.OrderByDescending(t => t.CreateTime).First().UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator).Count(),
-                }).Where(x => x.ToBeDealedCount > 0); ;
+                }).Where(x => x.ToBeRepliedCount > 0); 
 
 
 
@@ -248,7 +248,7 @@ namespace IRaCIS.Core.Application
                      UrgentCount = g.Where(u => u.OriginalReReadingTask.IsUrgent == true).Count(),
                      ToBeApprovalCount = g.Count(),
 
-                 }).Where(x => x.ToBeDealedCount > 0); ;
+                 }).Where(x => x.ToBeApprovalCount > 0);
 
 
             var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ReReadingApplyToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
@@ -286,7 +286,7 @@ namespace IRaCIS.Core.Application
 
                         IsUrgent = t.IsUrgent || t.IsSubjectExpeditedView,
                         ToBeApprovalCount = t.EnrollList.Where(u => u.EnrollStatus == EnrollStatus.InviteIntoGroup).Count()
-                    }).Where(x => x.ToBeDealedCount > 0); ;
+                    }).Where(x => x.ToBeApprovalCount > 0);
 
             var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ReviewerSelectToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
 
@@ -318,7 +318,7 @@ namespace IRaCIS.Core.Application
 
                  
                     ToBeApprovalCount = t.ReadModuleList.Where(u => u.IsCRCConfirm&&!u.IsPMConfirm).Count()
-                }).Where(x => x.ToBeDealedCount > 0); ;
+                }).Where(x => x.ToBeApprovalCount > 0);
 
             var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ReviewerSelectToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
        
@@ -363,7 +363,7 @@ namespace IRaCIS.Core.Application
 
                         IsUrgent = t.IsUrgent || t.IsSubjectExpeditedView,
                         ToBeApprovalCount = t.EnrollList.Where(u => u.EnrollStatus == EnrollStatus.HasCommittedToCRO).Count()
-                    }).Where(x => x.ToBeDealedCount > 0); ;
+                    }).Where(x => x.ToBeApprovalCount > 0) ;
 
             var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ReviewerSelectToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
 
@@ -400,7 +400,7 @@ namespace IRaCIS.Core.Application
                     UrgentCount = g.Where(u => u.OriginalReReadingTask.IsUrgent == true).Count(),
                     ToBeApprovalCount = g.Count(),
 
-                }).Where(x => x.ToBeDealedCount > 0); ;
+                }).Where(x => x.ToBeApprovalCount > 0);
 
 
             var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ReReadingApprovalToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
@@ -531,7 +531,7 @@ namespace IRaCIS.Core.Application
                     ToBeReplyedCount = t.SubjectVisitList.Where(c => c.TrialSite.CRCUserList.Any(u => u.UserId == _userInfo.Id))
                     .Where(u => u.CheckState == CheckStateEnum.CVIng && u.CheckChallengeState == CheckChanllengeTypeEnum.PMWaitCRCReply).Count()
 
-                }).Where(x => x.ToBeDealedCount > 0); ;
+                }).Where(x => x.ToBeReplyedCount > 0);
 
 
 
@@ -577,7 +577,7 @@ namespace IRaCIS.Core.Application
                     .Where(c => c.TrialSite.CRCUserList.Any(u => u.UserId == _userInfo.Id))
                     .Where(u => u.SubmitState == SubmitStateEnum.ToSubmit && u.IsPMBackOrReReading).Count(),
 
-                }).Where(x => x.ToBeDealedCount > 0); ;
+                }).Where(x => x.ToBeReUploadCount > 0);
 
             var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageReUploadToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
 
@@ -674,7 +674,7 @@ namespace IRaCIS.Core.Application
                     //待审核通过，统计从已领取到QC提交之间的      已领取 待审核 审核中   (审核完成  领取人就会清理 所以只用查询当前领取人是自己的就好了)
                     ToBeReviewedCount = t.SubjectVisitList.Where(u => u.CurrentActionUserId == _userInfo.Id).Count()
 
-                }).Where(x => x.ToBeDealedCount > 0); ;
+                }).Where(x => x.UrgentCount > 0); 
 
             var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(ImageQualityToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);
 
@@ -791,7 +791,7 @@ namespace IRaCIS.Core.Application
 
                      HaveSignedCount = c.VisitTaskList.Where(t => t.DoctorUserId == _userInfo.Id && (t.TaskState == TaskState.Effect || t.TaskState == TaskState.Freeze)
                                        && t.ReadingTaskState == ReadingTaskState.HaveSigned).Count(),
-                 }).Where(x => x.ToBeDealedCount > 0);
+                 }).Where(x => x.UnReadCount > 0);
 
             ;