账户稽查修改

IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs

@@ -1269,17 +1269,23 @@ namespace IRaCIS.Core.Application.Service
 
             var emailNoticeConfigQueryable = _emailNoticeConfigRepository
 
-              .WhereIf(trialConfig.IsEnrollementQualificationConfirm == true, t => t.BusinessModuleEnum == BusinessModule.EligibilityVerification)
-              .WhereIf(trialConfig.IsPDProgressView == true, t => t.BusinessModuleEnum == BusinessModule.PDVerification)
+              .WhereIf(trialConfig.IsEnrollementQualificationConfirm == true && trialConfig.IsPDProgressView == false, t => t.BusinessModuleEnum == BusinessModule.EligibilityVerification || t.BusinessModuleEnum == BusinessModule.Eligibility_PDVerification)
+              .WhereIf(trialConfig.IsEnrollementQualificationConfirm == false && trialConfig.IsPDProgressView == true, t => t.BusinessModuleEnum == BusinessModule.PDVerification || t.BusinessModuleEnum == BusinessModule.Eligibility_PDVerification)
                .WhereIf(trialConfig.IsPDProgressView == true && trialConfig.IsEnrollementQualificationConfirm == true, t => t.BusinessModuleEnum == BusinessModule.PDVerification
-               && t.BusinessModuleEnum == BusinessModule.EligibilityVerification)
+               || t.BusinessModuleEnum == BusinessModule.EligibilityVerification || t.BusinessModuleEnum == BusinessModule.Eligibility_PDVerification)
               .ProjectTo<TrialSelectEmailNoticeConfigView>(_mapper.ConfigurationProvider);
 
 
             var list = await emailNoticeConfigQueryable.ToListAsync();
 
+            var addList = _mapper.Map<List<BatchAddTrialEmailNoticeConfig>>(list.Where(t => t.IsHaveSelected == false).ToList());
 
-            return await BatchAddSysEmailConfig(_mapper.Map<List<BatchAddTrialEmailNoticeConfig>>(list.Where(t => t.IsHaveSelected == false).ToList()));
+            foreach (var item in addList)
+            {
+                item.TrialId = trialId;
+            }
+
+            return await BatchAddSysEmailConfig(addList);
 
         }
         /// <summary>
@@ -1289,6 +1295,10 @@ namespace IRaCIS.Core.Application.Service
         /// <returns></returns>
         public async Task<IResponseOutput> BatchAddSysEmailConfig(List<BatchAddTrialEmailNoticeConfig> batchAddList)
         {
+            if (!batchAddList.Any())
+            {
+                return ResponseOutput.Ok();
+            }
 
             var first = batchAddList.First();
             var trialId = first.TrialId;
@@ -1351,7 +1361,7 @@ namespace IRaCIS.Core.Application.Service
         {
             //await SyncSystemEmainCofigDocListAsync(inQuery.TrialId);
 
-
+            var trialConfig = _trialRepository.Where(t => t.Id == inQuery.TrialId).Select(t => new { t.IsEnrollementQualificationConfirm, t.IsPDProgressView }).First();
 
             var trialEmailNoticeConfigQueryable = _trialEmailNoticeConfigRepository.Where(t => t.TrialId == inQuery.TrialId)
               .WhereIf(inQuery.IsDistinguishCriteria == false, t => t.TrialReadingCriterionId == null)