XCKJ/irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改site关联

Browse Source
This commit is contained in:
hang
2024-06-03 14:37:38 +08:00
parent 4db3860ade
commit 0e23719c7b
101 changed files with 354 additions and 3290 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
+3 -3
View File
@@ -22,7 +22,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
{
public Guid? TrialId { get; set; }
public Guid? SiteId { get; set; }
public Guid? TrialSiteId { get; set; }
public Guid? SubjectId { get; set; }
public Guid? SubjectVisitId { get; set; }
@@ -336,7 +336,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
public Guid TrialId { get; set; }
public Guid SiteId { get; set; }
public Guid TrialSiteId { get; set; }
public string Code { get; set; } = string.Empty;
}
@@ -441,7 +441,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
/// <summary>
/// 中心
/// </summary>
public Guid? SiteId { get; set; }
public Guid? TrialSiteId { get; set; }
/// <summary>
/// 受试者
IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
+4 -5
View File
@@ -41,10 +41,9 @@ namespace IRaCIS.Core.Application.Service.Inspection
join trial in _repository.GetQueryable<Trial>().IgnoreQueryFilters() on data.TrialId equals trial.Id into trialtemp
from leftrial in trialtemp.DefaultIfEmpty()
join site in _repository.GetQueryable<Site>().IgnoreQueryFilters() on data.SiteId equals site.Id into sitetemp
from leftsite in sitetemp.DefaultIfEmpty()
join trialSite in _repository.GetQueryable<TrialSite>().IgnoreQueryFilters() on new { SiteId = leftsite.Id, Trialid = leftrial.Id } equals new { SiteId = trialSite.SiteId, Trialid = trialSite.TrialId } into trialSitetemp
join trialSite in _repository.GetQueryable<TrialSite>().IgnoreQueryFilters() on data.TrialSiteId equals trialSite.Id into trialSitetemp
from lefttrialSite in trialSitetemp.DefaultIfEmpty()
@@ -97,7 +96,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
BlindName = data.VisitTask.TaskBlindName,
TaskName = data.VisitTask.TaskName,
TrialId = data.TrialId,
SiteId = data.SiteId,
TrialSiteId = data.TrialSiteId,
SubjectId = data.SubjectId,
SubjectVisitId = data.SubjectVisitId,
//OptType = data.OptType,
@@ -161,7 +160,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
TrialReadingCriterionName = data.TrialReadingCriterion.CriterionName
};
query = query.WhereIf(dto.SiteId != null, x => x.SiteId == dto.SiteId)
query = query.WhereIf(dto.TrialSiteId != null, x => x.TrialSiteId == dto.TrialSiteId)
//.Where(x => (x.TrialId == dto.TrialId) || (x.TrialId == null && x.CreateTime >= trialData.CreateTime && x.CreateTime <= trialData.TrialFinishTime))
.Where(x => x.TrialId == dto.TrialId )