From 166c64798ec294252264b47511dea18f9d7c3dd7 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Mon, 3 Jul 2023 16:55:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=97=B6=E4=B8=8D=E8=AE=A9=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TrialSiteUser/PersonalWorkstation.cs      | 48 +++++++++++++++----
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
index 4eb79a67f..88c160c32 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/PersonalWorkstation.cs
@@ -871,11 +871,12 @@ namespace IRaCIS.Core.Application
                     TrialCode = g.Key.TrialCode,
                     CriterionName = g.Key.CriterionName,
                     TrialReadingCriterionId = g.Key.TrialReadingCriterionId,
-                    UrgentCount = g.Where(u => u.VisitTask.IsUrgent
-                    && u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First().UserTypeEnumInt == (int)UserTypeEnum.MIM).Count(),
 
-                    ToBeReplyedCount = g.Where(u =>
-                     u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First().UserTypeEnumInt == (int)UserTypeEnum.MIM).Count(),
+                    //UrgentCount = g.Where(u => u.VisitTask.IsUrgent
+                    //&& u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First().UserTypeEnumInt == (int)UserTypeEnum.MIM).Count(),
+
+                    //ToBeReplyedCount = g.Where(u =>
+                    // u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First().UserTypeEnumInt == (int)UserTypeEnum.MIM).Count(),
 
                 });
 
@@ -929,15 +930,44 @@ namespace IRaCIS.Core.Application
                     TrialCode = g.Key.TrialCode,
                     CriterionName = g.Key.CriterionName,
 
-                    UrgentCount = g.Where(u => u.VisitTask.IsUrgent
-                    && u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First().UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer).Count(),
+                   //UrgentCount = g.Where(u => u.VisitTask.IsUrgent).Select(u => u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First())
+                   //.Count(t => t.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer),
 
-                    ToBeReplyedCount = g.Where(u =>
-                     u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First().UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer).Count(),
+                   //ToBeReplyedCount = g.Select(t => t.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First()).Count(t => t.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer),
 
                     ToBeReviewedCount=g.Where(u =>  !u.IsInvalid && u.AuditState != MedicalReviewAuditState.HaveSigned).Count()
 
-                });
+               });
+
+            #endregion
+            //var query = _trialReadingCriterionRepository
+            //     .Where(t => t.Trial.TrialUserList.Any(t => t.UserId == _userInfo.Id))
+            //    //.Where(t => t.IsClosedDialog == false)
+            //    .GroupBy(t => new
+            //    {
+            //        t.TrialId,
+            //        t.Trial.ResearchProgramNo,
+            //        t.Trial.ExperimentName,
+            //        t.Trial.TrialCode,
+            //        t.VisitTask.TrialReadingCriterionId,
+            //        t.VisitTask.TrialReadingCriterion.CriterionName
+            //    })
+            //    .Select(g => new MedicalCommentsToBeDoneDto()
+            //    {
+            //        TrialId = g.Key.TrialId,
+            //        ResearchProgramNo = g.Key.ResearchProgramNo,
+            //        ExperimentName = g.Key.ExperimentName,
+            //        TrialCode = g.Key.TrialCode,
+            //        CriterionName = g.Key.CriterionName,
+
+            //        UrgentCount = g.Where(u => u.VisitTask.IsUrgent).Select(u=>u.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First())
+            //        .Count(t=>t.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer),
+
+            //        ToBeReplyedCount = g.Select(t=>t.ReadingMedicalReviewDialogList.OrderByDescending(l => l.CreateTime).First()).Count(t=>t.UserTypeEnumInt == (int)UserTypeEnum.IndependentReviewer),
+
+            //        ToBeReviewedCount=g.Where(u =>  !u.IsInvalid && u.AuditState != MedicalReviewAuditState.HaveSigned).Count()
+
+            //    });
 
             var result = await query.ToPagedListAsync(inQuery.PageIndex, inQuery.PageSize, string.IsNullOrEmpty(inQuery.SortField) ? nameof(MedicalCommentsToBeDoneDto.TrialId) : inQuery.SortField, inQuery.Asc);