Compare commits

..

No commits in common. "4372202a5b38b4acd0b389f0b143e7240daf5243" and "cfa384d02a8bb024a072f464ac32c3473c7fddbe" have entirely different histories.

1 changed files with 4 additions and 4 deletions

View File

@ -850,13 +850,13 @@ namespace IRaCIS.Core.API.Controllers
throw new BusinessValidationFailedException(_localizer["UploadDownLoad_InvalidCenters"]); throw new BusinessValidationFailedException(_localizer["UploadDownLoad_InvalidCenters"]);
} }
foreach (var item in excelList.GroupBy(t => t.Email.Trim())) foreach (var item in excelList.GroupBy(t => t.Email))
{ {
var itemList = item.ToList(); var itemList = item.ToList();
var first = item.First(); var first = item.First();
if (itemList.Any(t => t.Email.Trim() != first.Email.Trim() || t.Phone.Trim() != first.Phone.Trim() || t.OrganizationName.Trim() != first.OrganizationName.Trim() || t.FirstName.Trim() != first.FirstName.Trim() || t.LastName.Trim() != first.LastName.Trim())) if (itemList.Any(t => t.Email != first.Email || t.Phone != first.Phone || t.OrganizationName != first.OrganizationName || t.FirstName != first.FirstName || t.LastName != first.LastName))
{ {
//同一邮箱,用户信息应该保持一致! //同一邮箱,用户信息应该保持一致!
@ -886,7 +886,7 @@ namespace IRaCIS.Core.API.Controllers
foreach (var item in excelList) foreach (var item in excelList)
{ {
switch (item.UserTypeStr.Trim().ToUpper()) switch (item.UserTypeStr.ToUpper())
{ {
case "CRC": case "CRC":
@ -903,7 +903,7 @@ namespace IRaCIS.Core.API.Controllers
} }
item.TrialSiteId = siteList.FirstOrDefault(t => t.TrialSiteCode.Trim().ToUpper() == item.TrialSiteCode.Trim().ToUpper()).TrialSiteId; item.TrialSiteId = siteList.FirstOrDefault(t => t.TrialSiteCode.ToUpper() == item.TrialSiteCode.ToUpper()).TrialSiteId;
} }
var list = excelList.Where(t => t.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator || t.UserTypeEnum == UserTypeEnum.CRA).ToList(); var list = excelList.Where(t => t.UserTypeEnum == UserTypeEnum.ClinicalResearchCoordinator || t.UserTypeEnum == UserTypeEnum.CRA).ToList();