From 39766b161064a6f2d30faab2d21e85e5e36b3072 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 21 Oct 2022 17:22:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../IRaCIS.Core.Application.xml                 |  7 +++++++
 .../Document/TrialEmailNoticeConfigService.cs   | 17 +++++++++++++++++
 .../Service/Document/_MapConfig.cs              |  6 ++++++
 .../TrialSiteUser/DTO/UserTrialViewModel.cs     |  8 ++++++++
 .../TrialSiteUser/TrialMaintenanceService.cs    |  1 -
 5 files changed, 38 insertions(+), 1 deletion(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index a416abc91..cb6987d01 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -413,6 +413,13 @@
             <returns></returns>
             <exception cref="T:IRaCIS.Core.Infrastructure.BusinessValidationFailedException"></exception>
         </member>
+        <member name="M:IRaCIS.Core.Application.Service.TrialEmailNoticeConfigService.GetTrialUserSelectList(IRaCIS.Application.Contracts.TrialMaintenanceQuery)">
+            <summary>
+            选择人员下拉
+            </summary>
+            <param name="param"></param>
+            <returns></returns>
+        </member>
         <member name="M:IRaCIS.Core.Application.Service.ImageAndDoc.StudyService.Preview(System.Guid)">
             <summary> 指定资源Id，渲染Dicom检查的Jpeg预览图像  </summary>
             <param name="studyId"> Dicom检查的Id </param>
diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
index 9ac53e337..11acd0740 100644
--- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs
@@ -11,6 +11,7 @@ using IRaCIS.Core.Application.ViewModel;
 using IRaCIS.Core.Domain.Share;
 using IRaCIS.Core.Infrastructure;
 using IRaCIS.Core.Application.Helper;
+using IRaCIS.Application.Contracts;
 
 namespace IRaCIS.Core.Application.Service
 {
@@ -269,6 +270,22 @@ namespace IRaCIS.Core.Application.Service
 
 
 
+        /// <summary>
+        /// 选择人员下拉
+        /// </summary>
+        /// <param name="param"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<List<TrialUserSelct>> GetTrialUserSelectList(Guid trialId)
+        {
+
+            var query = _trialUserRepository.Where(t => t.TrialId == param.TrialId && t.IsDeleted==false,false,true ).IgnoreQueryFilters()
+                
+                .ProjectTo<TrialUserSelct>(_mapper.ConfigurationProvider);
+
+            return await query.ToListAsync();
+
+        }
 
         [HttpPost]
         public async Task<List<TrialEmailNoticeConfigView>> GetTrialEmailNoticeConfigList(TrialEmailNoticeConfigQuery inQuery)
diff --git a/IRaCIS.Core.Application/Service/Document/_MapConfig.cs b/IRaCIS.Core.Application/Service/Document/_MapConfig.cs
index dbfe62d1a..3edff6750 100644
--- a/IRaCIS.Core.Application/Service/Document/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Document/_MapConfig.cs
@@ -74,6 +74,12 @@ namespace IRaCIS.Core.Application.Service
 
             CreateMap<TrialEmailNoticeConfigAddOrEdit, TrialEmailNoticeConfig>();
 
+            CreateMap<TrialUser, TrialUserSelct>()
+                 .ForMember(d => d.Phone, c => c.MapFrom(t => t.User.Phone))
+                 .ForMember(d => d.Email, c => c.MapFrom(t => t.User.EMail))
+                 .ForMember(d => d.RealName, c => c.MapFrom(t => t.User.FullName))
+                .ForMember(d => d.UserName, c => c.MapFrom(t => t.User.UserName));
+            
 
             CreateMap<TrialEmailNoticeUser, EmailUserInfoDto>()
                 .ForMember(d => d.Email, c => c.MapFrom(t => t.User.EMail))
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs
index c10b1f7ca..9206d9a83 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/UserTrialViewModel.cs
@@ -41,7 +41,15 @@ namespace IRaCIS.Application.Contracts
 
     }
 
+    public class TrialUserSelct: UserTrialCommand
+    {
+        public string Phone { get; set; } = String.Empty;
 
+        public string Email { get; set; } = string.Empty;
+
+        public string RealName { get; set; } = String.Empty;
+        public string UserName { get; set; } = String.Empty;
+    }
 
     public class TrialMaintenanceDTO : UserTrialCommand
     {
diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
index 052293757..b2dafc9e3 100644
--- a/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
+++ b/IRaCIS.Core.Application/Service/TrialSiteUser/TrialMaintenanceService.cs
@@ -83,7 +83,6 @@ namespace IRaCIS.Application.Services
 
 
 
-
         /// <summary> Setting页面  为 site 勾选CRC用户列表</summary> 
         [HttpPost]
         public async Task<PageOutput<AssginSiteCRCListDTO>> GetSiteCRCScreeningList(SiteCRCQuery param)