修改一版

2022-07-22 14:12:33 +08:00
parent 494d0c53ae
commit 104c899a32
4 changed files with 78 additions and 29 deletions
@@ -162,7 +162,9 @@ namespace IRaCIS.Core.Application.ViewModel
        //public String TrialSiteCode { get; set; } = String.Empty;
        //public Guid TrialId { get; set; }

-        public Guid? SubjectId { get; set; }
+        public int Index { get; set; } = 0;
+
+        public Guid SubjectId { get; set; }
        public string SubjectCode { get; set; } = String.Empty;

        public bool IsUrgent => UnReadTaskList.Any(t => t.IsUrgent);
@@ -180,7 +182,15 @@ namespace IRaCIS.Core.Application.ViewModel
    {
        public Guid Id { get; set; }

+        public ReadingCategory ReadingCategory { get; set; }
        public bool IsUrgent { get; set; }
+
+        public decimal VisitNum { get; set; }
+
+        public string TaskBlindName { get; set; }
+
+
+        public Guid? VisistId { get; set; }
        public DateTime? SuggesteFinishedTime { get; set; }
    }

@@ -15,5 +15,7 @@ namespace IRaCIS.Core.Application.Service
        Task<IResponseOutput> ApplyReReading(ApplyReReadingCommand applyReReadingCommand);

        Task<IResponseOutput> ConfirmReReading(ConfirmReReadingCommand agreeReReadingCommand, [FromServices] IVisitTaskHelpeService _visitTaskCommonService);
+
+        (int, IOrderedQueryable<IRUnReadSubjectView>) GetOrderReadingIQueryable(Guid trialId);
    }
 }
@@ -987,7 +987,7 @@ namespace IRaCIS.Core.Application.Service.Allocation
        /// </summary>
        /// <param name="trialId"></param>
        /// <returns></returns>
-        public (int,IOrderedQueryable<IRUnReadSubjectView>?) GetOrderReadingIQueryable(Guid trialId)
+        public (int,IOrderedQueryable<IRUnReadSubjectView>) GetOrderReadingIQueryable(Guid trialId)
        {
            var visitGroupQuery = _visitTaskRepository.Where(x => x.TrialId == trialId && x.DoctorUserId == _userInfo.Id)
                  .Where(x => !x.Subject.IsDeleted)
@@ -1001,8 +1001,16 @@ namespace IRaCIS.Core.Application.Service.Allocation
                UnReadTaskCount = x.Where(y => y.ReReadingApplyState != ReReadingApplyState.HaveApplyed).Count(),
                ExistReadingApply = x.Any(y => y.ReReadingApplyState == ReReadingApplyState.HaveApplyed),
                UnReadTaskList = x.Where(y => y.ReReadingApplyState != ReReadingApplyState.HaveApplyed).OrderBy(x=>x.VisitTaskNum)
-                .Select(u => new IRUnreadTaskView() { Id = u.Id, IsUrgent = u.IsUrgent, SuggesteFinishedTime = u.SuggesteFinishedTime }).ToList(),
-            }).Where(x => x.UnReadTaskCount > 0).OrderBy(x => x.SubjectId);
+                .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,
+                }).ToList(),
+            }).OrderBy(x => x.SubjectId);