整理仓储2

IRaCIS.Core.Application/Service/SiteSurvey/TrialSiteSurveyService.cs

@@ -37,11 +37,13 @@ namespace IRaCIS.Core.Application.Contracts
         IRepository<User> _userRepository,
         IRepository<Trial> _trialRepository,
         IRepository<TrialSite> _trialSiteRepository,
+        IRepository<Doctor> _doctorRepository,
         IRepository<VerificationCode> _verificationCodeRepository,
         IRepository<TrialUser> _trialUserRepository,
         IRepository<TrialSiteUser> _trialSiteUserRepository,
         IDistributedLockProvider _distributedLockProvider,
         ITokenService _tokenService,
+        IRepository<UserType> _userTypeRepository,
         IMailVerificationService _mailVerificationService,
         IOptionsMonitor<SystemEmailSendConfig> systemEmailConfig) : BaseService, ITrialSiteSurveyService
     {
@@ -105,7 +107,7 @@ namespace IRaCIS.Core.Application.Contracts
                     //删除验证码历史记录
                     await _verificationCodeRepository.BatchDeleteNoTrackingAsync(t => t.Id == verificationRecord.Id);
 
-                    var dockerInfo = await _repository.Where<Doctor>(t => t.EMail == inDto.EmailOrPhone || t.Phone == inDto.EmailOrPhone).FirstOrDefaultAsync();
+                    var dockerInfo = await _doctorRepository.Where(t => t.EMail == inDto.EmailOrPhone || t.Phone == inDto.EmailOrPhone).FirstOrDefaultAsync();
 
                     if (dockerInfo != null)
                     {
@@ -167,7 +169,7 @@ namespace IRaCIS.Core.Application.Contracts
 
             #region 20230804  修改调研表逻辑
 
-            var verifyRecord = await _repository.FirstOrDefaultAsync<VerificationCode>(t => (t.EmailOrPhone == userInfo.EmailOrPhone) && t.Code == userInfo.verificationCode && t.CodeType == userInfo.verificationType);
+            var verifyRecord = await _verificationCodeRepository.FirstOrDefaultAsync(t => (t.EmailOrPhone == userInfo.EmailOrPhone) && t.Code == userInfo.verificationCode && t.CodeType == userInfo.verificationType);
             //检查数据库是否存在该验证码
             if (verifyRecord == null)
             {
@@ -630,7 +632,7 @@ namespace IRaCIS.Core.Application.Contracts
 
             survey.IsDeleted = true;
 
-            await _repository.SaveChangesAsync();
+            await _trialSiteSurveyRepository.SaveChangesAsync();
 
             return ResponseOutput.Ok();
 
@@ -779,7 +781,7 @@ namespace IRaCIS.Core.Application.Contracts
 
                         saveItem.UserName = saveItem.UserCode;
 
-                        saveItem.UserTypeEnum = _repository.Where<UserType>(t => t.Id == saveItem.UserTypeId).Select(t => t.UserTypeEnum).First();
+                        saveItem.UserTypeEnum = _userTypeRepository.Where(t => t.Id == saveItem.UserTypeId).Select(t => t.UserTypeEnum).First();
 
 
                         var newUser = _userRepository.AddAsync(saveItem).Result;
@@ -890,7 +892,7 @@ namespace IRaCIS.Core.Application.Contracts
             });
 
 
-            await _repository.SaveChangesAsync();
+            await _trialSiteUserRepository.SaveChangesAsync();
         }