IRaCIS.Core.API/Controllers/UploadDownLoadController.cs

@@ -297,7 +297,7 @@ namespace IRaCIS.Core.API.Controllers
         [HttpPost, Route("Study/ArchiveStudy")]
         [DisableFormValueModelBinding]
         [DisableRequestSizeLimit]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> ArchiveStudyNew(Guid trialId, Guid subjectVisitId, string studyInstanceUid, Guid? abandonStudyId, Guid studyMonitorId,
              [FromServices] ILogger<UploadDownLoadController> _logger,
              [FromServices] IStudyService _studyService,
@@ -452,7 +452,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="_studyMonitorRepository"></param>
         /// <returns></returns>
         [HttpPost, Route("Study/PreArchiveStudy")]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> PreArchiveStudy(PreArchiveStudyCommand preArchiveStudyCommand,
      [FromServices] IStudyService _studyService,
      [FromServices] IRepository<StudyMonitor> _studyMonitorRepository)
@@ -488,7 +488,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <param name="_noneDicomStudyFileRepository"></param>
         /// <returns></returns>
         [HttpPost("NoneDicomStudy/UploadNoneDicomFile")]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
         public async Task<IResponseOutput> UploadNoneDicomFile(UploadNoneDicomFileCommand incommand,
             [FromServices] IRepository<NoneDicomStudy> _noneDicomStudyRepository,
             [FromServices] IRepository<StudyMonitor> _studyMonitorRepository,
@@ -560,7 +560,7 @@ namespace IRaCIS.Core.API.Controllers
         /// <returns></returns>
         /// <exception cref="BusinessValidationFailedException"></exception>
         [HttpPost("QCOperation/UploadVisitCheckExcel/{trialId:guid}")]
-        [TrialGlobalLimit("AfterStopCannNotOpt")]
+        [TrialGlobalLimit( "AfterStopCannNotOpt" )]
 
         public async Task<IResponseOutput> UploadVisitCheckExcel(Guid trialId, [FromServices] IOSSService oSSService, [FromServices] IRepository<InspectionFile> _inspectionFileRepository)
         {
@@ -850,18 +850,11 @@ namespace IRaCIS.Core.API.Controllers
                 throw new BusinessValidationFailedException(_localizer["UploadDownLoad_InvalidCenters"]);
             }
 
-            foreach (var item in excelList.GroupBy(t => t.Email))
+            if (excelList.GroupBy(t => new { t.TrialSiteCode, t.UserTypeStr, t.Email }).Any(g => g.Count() > 1))
             {
-                var itemList = item.ToList();
+                //	同一邮箱，同一用户类型，只能生成一个账户,请核查Excel数据
 
-                var first = item.First();
+                throw new BusinessValidationFailedException(_localizer["UploadDownLoad_CheckDuplicateAccounts"]);
-
-                if (itemList.Any(t => t.Email != first.Email || t.Phone != first.Phone || t.OrganizationName != first.OrganizationName || t.FirstName != first.FirstName || t.LastName != first.LastName))
-                {
-                    //同一邮箱，用户信息应该保持一致！
-
-                    throw new BusinessValidationFailedException(_localizer["UploadDownLoad_CheckDuplicateAccounts"]);
-                }
             }
 
             if (excelList.Any(t => !t.Email.Contains("@")))