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