IRaCIS.Core.Application/Service/Allocation/DTO/VisitTaskViewModel.cs

@@ -299,12 +299,11 @@ namespace IRaCIS.Core.Application.ViewModel
             }
         }
 
-		public int UrgentCount { get; set; }
 
-		// public int UrgentCount => UnReadCanReadTaskList.Count(t => t.IsUrgent);
 
-		public List<IRUnreadTaskView> UnReadCanReadTaskList { get; set; } = new List<IRUnreadTaskView>();
+        public int UrgentCount => UnReadCanReadTaskList.Count(t => t.IsUrgent);
-		// public List<IRUnreadTaskView> UnReadCanReadTaskList => UnReadTaskList.Where(y => y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true)).ToList();
+
+        public List<IRUnreadTaskView> UnReadCanReadTaskList => UnReadTaskList.Where(y => y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true)).ToList();
 
         public List<IRUnreadTaskView> UnReadTaskList { get; set; } = new List<IRUnreadTaskView>();
     }

IRaCIS.Core.Application/Service/Allocation/VisitTaskService.cs

@@ -1114,32 +1114,6 @@ namespace IRaCIS.Core.Application.Service.Allocation
                 ).Count(),
 
 
-				UnReadCanReadTaskList= x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned)
-				.Where(y => y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true))
-				.OrderBy(x => x.VisitTaskNum)
-				.Select(u => new IRUnreadTaskView()
-				{
-					Id = u.Id,
-					IsUrgent = u.IsUrgent,
-					VisitNum = u.VisitTaskNum,
-					TaskBlindName = u.TaskBlindName,
-					VisistId = u.SourceSubjectVisitId,
-					SuggesteFinishedTime = u.SuggesteFinishedTime,
-					ReadingCategory = u.ReadingCategory,
-					IsAnalysisCreate = u.IsAnalysisCreate,
-					ArmEnum = u.ArmEnum,
-					TrialReadingCriterionId = u.TrialReadingCriterionId,
-					IsNeedClinicalDataSign = u.IsNeedClinicalDataSign,
-					IsClinicalDataSign = u.IsClinicalDataSign,
-					IsFrontTaskNeedSignButNotSign = u.IsFrontTaskNeedSignButNotSign
-				})
-				.ToList(),
-
-
-				UrgentCount = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState != ReadingTaskState.HaveSigned)
-				.Where(y => y.IsFrontTaskNeedSignButNotSign == false && (y.IsNeedClinicalDataSign == false || y.IsClinicalDataSign == true))
-				.Where(x=>x.IsUrgent).Count(),
-
                 //已读任务量
                 HaveReadTaskCount = x.Where(y => y.TrialReadingCriterionId == trialReadingCriterionId && y.ReadingTaskState == ReadingTaskState.HaveSigned).Count(),
 
@@ -1174,7 +1148,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
 
             var result = new List<IRUnReadSubjectView>();
 
-            var propName = string.IsNullOrWhiteSpace(inDto.Page!.SortField) ? "UrgentCount" : inDto.Page.SortField;
+            var propName = string.IsNullOrWhiteSpace(inDto.Page!.SortField) ? "UnReadCanReadTaskCount" : inDto.Page.SortField;
 
             var visitTaskOrderQuery = inDto.Page.Asc ? visitTaskQuery.OrderBy(propName) : visitTaskQuery.OrderBy(propName + " desc");
             if (inDto.Page != null)