From a3f12b2a5362d45d2d6398c3f5ae667683c98c35 Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 28 May 2024 10:00:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8C=BB=E7=94=9F=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Service/Doctor/DTO/DoctorModel.cs                 |  3 +++
 IRaCIS.Core.Application/Service/Doctor/_MapConfig.cs  |  6 ++++--
 .../Service/Institution/SponsorService.cs             | 11 +----------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs b/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs
index 890447734..62e84fc93 100644
--- a/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs
+++ b/IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs
@@ -182,6 +182,9 @@ namespace IRaCIS.Application.Contracts
         public string OptUserName { get; set; } = string.Empty;
         public DateTime? OptTime { get; set; }
         public string? OptTimeStr => OptTime?.ToString("yyyy-MM-dd HH:mm:ss");
+
+
+        public string DoctorUserName { get; set; }
     }
 
     public class DoctorOptDTO
diff --git a/IRaCIS.Core.Application/Service/Doctor/_MapConfig.cs b/IRaCIS.Core.Application/Service/Doctor/_MapConfig.cs
index d61520299..692e9c4f0 100644
--- a/IRaCIS.Core.Application/Service/Doctor/_MapConfig.cs
+++ b/IRaCIS.Core.Application/Service/Doctor/_MapConfig.cs
@@ -60,7 +60,8 @@ namespace IRaCIS.Core.Application.Service
             CreateMap<AddOrUpdateDicDTO, Dictionary>().ReverseMap();
 
             //医生列表、项目显示列表模型转换
-            CreateMap<DoctorDTO, SelectionReviewerDTO>();
+            CreateMap<DoctorDTO, SelectionReviewerDTO>()
+                ;
 
             CreateMap<User, UserBasicInfo>()
              .ForMember(d => d.UserTypeShortName, u => u.MapFrom(t => t.UserTypeRole.UserTypeShortName))
@@ -80,7 +81,8 @@ namespace IRaCIS.Core.Application.Service
                   .ForMember(d => d.UserName, u => u.MapFrom(doctor => doctor.LastName + " / " + doctor.FirstName));
 
             #region 医生基本信息  
-            CreateMap<Doctor, SelectionReviewerDTO>();
+            CreateMap<Doctor, SelectionReviewerDTO>()
+                .ForMember(d => d.DoctorUserName, u => u.MapFrom(t => t.User.UserName));
             CreateMap<Doctor, DoctorDTO>().IncludeMembers(t => t.Hospital).Include<Doctor, SelectionReviewerDTO>()
                  .ForMember(d => d.AccountUserName, u => u.MapFrom(s => s.EnrollList.Where(t=>t.DoctorUserId!=null).Select(c=>c.DoctorUser.UserName).FirstOrDefault()))
                  .ForMember(d => d.Department, u => u.MapFrom(s => s.Department.Value))
diff --git a/IRaCIS.Core.Application/Service/Institution/SponsorService.cs b/IRaCIS.Core.Application/Service/Institution/SponsorService.cs
index d553f68db..41412edec 100644
--- a/IRaCIS.Core.Application/Service/Institution/SponsorService.cs
+++ b/IRaCIS.Core.Application/Service/Institution/SponsorService.cs
@@ -35,11 +35,7 @@ namespace IRaCIS.Application.Services
         /// <summary> 分页获取申办方列表 </summary>
         public async  Task<IEnumerable<SponsorSelectDTO>> GetAllSponsorList(Guid? sponsorId)
         {
-            //Expression<Func<Sponsor, bool>> sponsorLambda = x => true;
-            //if (!string.IsNullOrWhiteSpace(sponsorSearchModel.SponsorName))
-            //{
-            //    sponsorLambda = sponsorLambda.And(t => t.SponsorName.Contains(sponsorSearchModel.SponsorName.Trim()));
-            //}
+
             var sponsorQueryable = _sponsorRepository.Where(t => t.IsTrialLevel == false || t.Id == sponsorId).ProjectTo<SponsorSelectDTO>(_mapper.ConfigurationProvider,new { isEn_Us= _userInfo.IsEn_Us});
             return await sponsorQueryable.ToListAsync();
         }
@@ -72,11 +68,6 @@ namespace IRaCIS.Application.Services
                 //---该申办方已经加入项目，不允许删除。
                 return ResponseOutput.NotOk(_localizer["Sponsor_InProject"]);
             }
-            //if (_userRepository.Find().Any(t => t.OrganizationId == sponsorId))
-            //{
-            //    return ResponseOutput.NotOk("该申办方下存在用户，暂时无法删除。");
-            //}
-          
 
             var success = await _sponsorRepository.BatchDeleteNoTrackingAsync(x => x.Id == sponsorId);
             return ResponseOutput.Result(success);