Merge branch 'Test_IRC_Net8' of https://gitea.frp.extimaging.com/XCKJ/irc-netcore-api into Test_IRC_Net8
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
commit
efb9532fbc
|
@ -2611,6 +2611,10 @@ namespace IRaCIS.Core.Infra.EFCore.Common
|
|||
if (entity.ReadingScope == ReadingScopeEnum.Site)
|
||||
{
|
||||
var siteIds = entity.ReadingPeriodSites.Select(t => t.TrialSiteId).ToList();
|
||||
if(siteIds == null || siteIds.Count == 0)
|
||||
{
|
||||
siteIds= await _dbContext.ReadingPeriodSite.Where(c => c.ReadingPeriodSetId== entity.Id).Select(t => t.TrialSiteId).ToListAsync();
|
||||
}
|
||||
var nameList = _dbContext.TrialSite.Where(c => c.TrialId == entity.TrialId && siteIds.Contains(c.Id)).Select(t => t.TrialSiteCode).ToList();
|
||||
|
||||
siteCodes = String.Join(',', nameList);
|
||||
|
|
|
@ -461,6 +461,8 @@ public class IRaCISDBContext : DbContext
|
|||
public virtual DbSet<TrialSiteUserRole> UserTrialSite { get; set; }
|
||||
public virtual DbSet<TrialSite> TrialSite { get; set; }
|
||||
|
||||
public virtual DbSet<ReadingPeriodSite> ReadingPeriodSite { get; set; }
|
||||
|
||||
public virtual DbSet<Site> Site { get; set; }
|
||||
|
||||
public virtual DbSet<UserRole> User { get; set; }
|
||||
|
|
Loading…
Reference in New Issue