IRaCIS.Core.Application/Service/Doctor/DTO/DoctorModel.cs

@@ -182,9 +182,6 @@ 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

IRaCIS.Core.Application/Service/Doctor/_MapConfig.cs

@@ -60,8 +60,7 @@ 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))
@@ -81,8 +80,7 @@ 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))

IRaCIS.Core.Application/Service/Institution/SponsorService.cs

@@ -35,7 +35,11 @@ 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();
         }
@@ -68,6 +72,11 @@ 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);