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

稽查修改数据
continuous-integration/drone/push Build is passing Details

Test_HIR_Net8
hang 2024-11-22 17:10:09 +08:00
parent 1f14adec2a
commit 7c25809ad5
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -3683,7 +3683,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
if (generalData.TrialId == null || /*generalData.TrialSiteId == null ||*/ generalData.SubjectId == null || generalData.TrialReadingCriterionId == null) if (generalData.TrialId == null || /*generalData.TrialSiteId == null ||*/ generalData.SubjectId == null || generalData.TrialReadingCriterionId == null)
{ {
var info = await _dbContext.VisitTask.Where(x => x.Id == inspection.VisitTaskId).Select(x => new { SubjectCode = x.Subject.Code, TrialSiteCode = x.Subject.TrialSite.TrialSiteCode, SubjectId = x.SubjectId, x.Subject.TrialSiteId, x.TrialId, x.SourceSubjectVisitId, ReadModuleSubjectVisitId = (Guid?)x.ReadModule.SubjectVisitId, x.TrialReadingCriterionId }).FirstOrDefaultAsync(); var info = await _dbContext.VisitTask.Where(x => x.Id == inspection.VisitTaskId).Select(x => new { SubjectCode = x.Subject.Code, SubjectId = x.SubjectId, x.Subject.TrialSiteId, x.TrialId, x.SourceSubjectVisitId, ReadModuleSubjectVisitId = (Guid?)x.ReadModule.SubjectVisitId, x.TrialReadingCriterionId }).FirstOrDefaultAsync();
generalData.TrialReadingCriterionId = info?.TrialReadingCriterionId ?? generalData.TrialReadingCriterionId; generalData.TrialReadingCriterionId = info?.TrialReadingCriterionId ?? generalData.TrialReadingCriterionId;
generalData.TrialId = info?.TrialId ?? generalData.TrialId; generalData.TrialId = info?.TrialId ?? generalData.TrialId;
@ -3692,7 +3692,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
generalData.SubjectVisitId = info?.SourceSubjectVisitId != null ? info?.SourceSubjectVisitId : (info?.ReadModuleSubjectVisitId != null ? info?.ReadModuleSubjectVisitId : null); generalData.SubjectVisitId = info?.SourceSubjectVisitId != null ? info?.SourceSubjectVisitId : (info?.ReadModuleSubjectVisitId != null ? info?.ReadModuleSubjectVisitId : null);
//以后移除 //以后移除
generalData.SiteCode = info?.TrialSiteCode ?? generalData.SiteCode;
generalData.SubjectCode = info?.SubjectCode ?? generalData.SubjectCode; generalData.SubjectCode = info?.SubjectCode ?? generalData.SubjectCode;
} }
@ -3715,7 +3714,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
if (generalData.TrialId == null /*|| generalData.TrialSiteId == null*/ || generalData.SubjectId == null) if (generalData.TrialId == null /*|| generalData.TrialSiteId == null*/ || generalData.SubjectId == null)
{ {
var info = await _dbContext.SubjectVisit.Where(x => x.Id == generalData.SubjectVisitId).Select(x => var info = await _dbContext.SubjectVisit.Where(x => x.Id == generalData.SubjectVisitId).Select(x =>
new { x.SubjectId, x.TrialSiteId, x.TrialId, SubjectCode = x.Subject.Code, TrialSiteCode = x.Subject.TrialSite.TrialSiteCode }).FirstOrDefaultAsync(); new { x.SubjectId, x.TrialSiteId, x.TrialId, SubjectCode = x.Subject.Code }).FirstOrDefaultAsync();
generalData.TrialId = info?.TrialId ?? generalData.TrialId; generalData.TrialId = info?.TrialId ?? generalData.TrialId;
@ -3723,7 +3722,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
generalData.SubjectId = info?.SubjectId ?? generalData.SubjectId; generalData.SubjectId = info?.SubjectId ?? generalData.SubjectId;
//以后移除 //以后移除
generalData.SiteCode = info?.TrialSiteCode ?? generalData.SiteCode;
generalData.SubjectCode = info?.SubjectCode ?? generalData.SubjectCode; generalData.SubjectCode = info?.SubjectCode ?? generalData.SubjectCode;
} }