From 27a584575c8f16a9a5c4695aaf72f3377a862bdf Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 10 Jun 2022 14:12:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=BB=E7=94=9F=E4=B8=8B=E6=8B=89=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/IRaCIS.Core.Application.xml |  5 +++++
 .../Allocation/DTO/TaskAllocationRuleViewModel.cs   |  6 +++++-
 .../Service/Allocation/TaskAllocationRuleService.cs | 13 +++++++++++--
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 5b8df9988..0ff2820ca 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -1094,6 +1094,11 @@
             名称
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingClinicalDataListOutDto.ClinicalDataTrialSetId">
+            <summary>
+            下拉ID
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.GetReadingClinicalDataListOutDto.ClinicalDataLevel">
             <summary>
             临床级别
diff --git a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs
index 9bacbbbab..a5d761a1b 100644
--- a/IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/DTO/TaskAllocationRuleViewModel.cs
@@ -74,7 +74,11 @@ namespace IRaCIS.Core.Application.ViewModel
 
     public class  TrialDoctorUserSelectView
     {
-        public Guid DoctorUserId { get; set; }
+        public Guid TrialId { get; set; }
+
+        public ReadingMethod ReadingType { get; set; }
+
+        public Guid? DoctorUserId { get; set; }
 
         public string UserCode { get; set; }
 
diff --git a/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs b/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs
index 7b380cde5..ddfd69b87 100644
--- a/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs
+++ b/IRaCIS.Core.Application/Service/Allocation/TaskAllocationRuleService.cs
@@ -82,9 +82,18 @@ namespace IRaCIS.Core.Application.Service
         {
             var query = from enroll in _enrollRepository.Where(t => t.TrialId == trialId)
                         join user in _userRepository.AsQueryable() on enroll.DoctorId equals user.DoctorId
-                        select user;
+                        select new TrialDoctorUserSelectView()
+                        {
+                            TrialId = enroll.TrialId,
+                            ReadingType=enroll.Trial.ReadingType,
+                            DoctorUserId= user.Id,
+                            FullName=user.FullName,
+                            UserCode=user.UserCode,
+                            UserName=user.UserName,
+                            UserTypeEnum=user.UserTypeRole.UserTypeEnum
+                        };
 
-            return query.ProjectTo<TrialDoctorUserSelectView>(_mapper.ConfigurationProvider).ToList();
+            return query.ToList();
         }