From 5a4b1b04e420e7b1bfb1f1043da11ffb1ab9703e Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Wed, 12 Oct 2022 14:26:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DTO/TaskAllocationRuleViewModel.cs        | 20 +++++++++++++++----
 .../WorkLoad/DTO/DoctorWorkLoadViewModel.cs   | 18 +++++++++++++----
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs
index 4bbda9b6..6cade703 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs
@@ -104,12 +104,24 @@ namespace IRaCIS.Core.Application.ViewModel
         //public List<ReadingCategory> ReadingCategoryList { get; set; }
 
         public List<TrialReadingCriterionDto> TrialReadingCriterionList { get; set; }
+
         public List<TrialCriterionReadingCategory> CriterionReadingCategoryList { get; set; }
 
-        public List<CriterionReadingCategory> CriterionCategoryList => CriterionReadingCategoryList.Count == 0 ? TrialReadingCriterionList.Select(t => new CriterionReadingCategory() { EnrollId = EnrollId, TrialReadingCriterionId = t.TrialReadingCriterionId }).ToList() :
-             CriterionReadingCategoryList
-            .GroupBy(t => new { t.TrialReadingCriterionId, t.EnrollId })
-            .Select(g => new CriterionReadingCategory() { EnrollId = g.Key.EnrollId, TrialReadingCriterionId = g.Key.TrialReadingCriterionId, ReadingCategorys = g.Select(t => t.ReadingCategory).ToList() }).ToList();
+        public List<CriterionReadingCategory> CriterionCategoryList =>
+
+            TrialReadingCriterionList.Select(t =>
+            new CriterionReadingCategory() { 
+                EnrollId = EnrollId, 
+                TrialReadingCriterionId = t.TrialReadingCriterionId, 
+                ReadingCategorys = CriterionReadingCategoryList.Where(c => c.TrialReadingCriterionId == t.TrialReadingCriterionId).Select(t => t.ReadingCategory).OrderBy(c => c).ToList()
+            }).ToList();
+
+
+
+            //CriterionReadingCategoryList.Count == 0 ? TrialReadingCriterionList.Select(t => new CriterionReadingCategory() { EnrollId = EnrollId, TrialReadingCriterionId = t.TrialReadingCriterionId }).ToList() :
+            // CriterionReadingCategoryList
+            //.GroupBy(t => new { t.TrialReadingCriterionId, t.EnrollId })
+            //.Select(g => new CriterionReadingCategory() { EnrollId = g.Key.EnrollId, TrialReadingCriterionId = g.Key.TrialReadingCriterionId, ReadingCategorys = g.Select(t => t.ReadingCategory).OrderBy(t=>t).ToList() }).ToList();
 
     }
 
diff --git a/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs b/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs
index 8b382a04..cf178e89 100644
--- a/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs
+++ b/IRaCIS.Core.Application/Service/WorkLoad/DTO/DoctorWorkLoadViewModel.cs
@@ -268,10 +268,20 @@ namespace IRaCIS.Application.Contracts
         public List<TrialCriterionReadingCategory> CriterionReadingCategoryList { get; set; }
 
 
-        public List<CriterionReadingCategory> CriterionCategoryList => CriterionReadingCategoryList.Count==0? TrialReadingCriterionList.Select(t=>new CriterionReadingCategory() { EnrollId= EnrollId ,TrialReadingCriterionId=t.TrialReadingCriterionId}).ToList():
-             CriterionReadingCategoryList
-            .GroupBy(t => new { t.TrialReadingCriterionId, t.EnrollId })
-            .Select(g => new CriterionReadingCategory() { EnrollId = g.Key.EnrollId, TrialReadingCriterionId = g.Key.TrialReadingCriterionId, ReadingCategorys = g.Select(t => t.ReadingCategory).ToList() }).ToList();
+        public List<CriterionReadingCategory> CriterionCategoryList =>
+              TrialReadingCriterionList.Select(t =>
+            new CriterionReadingCategory()
+            {
+                EnrollId = EnrollId,
+                TrialReadingCriterionId = t.TrialReadingCriterionId,
+                ReadingCategorys = CriterionReadingCategoryList.Where(c => c.TrialReadingCriterionId == t.TrialReadingCriterionId).Select(t => t.ReadingCategory).OrderBy(c => c).ToList()
+            }).ToList();
+
+
+        //CriterionReadingCategoryList.Count==0? TrialReadingCriterionList.Select(t=>new CriterionReadingCategory() { EnrollId= EnrollId ,TrialReadingCriterionId=t.TrialReadingCriterionId}).ToList():
+        // CriterionReadingCategoryList
+        //.GroupBy(t => new { t.TrialReadingCriterionId, t.EnrollId })
+        //.Select(g => new CriterionReadingCategory() { EnrollId = g.Key.EnrollId, TrialReadingCriterionId = g.Key.TrialReadingCriterionId, ReadingCategorys = g.Select(t => t.ReadingCategory).OrderBy(t=>t).ToList() }).ToList();
 
 
     }