diff --git a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs index 13f549d9..3c85fc65 100644 --- a/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs +++ b/IRaCIS.Core.Application/Service/Document/TrialEmailNoticeConfigService.cs @@ -785,7 +785,7 @@ namespace IRaCIS.Core.Application.Service ["TrialSiteCode"] = taskInfo.TrialSiteCode, ["SubjectCode"] = taskInfo.SubjectCode, ["VisitName"] = taskInfo.SourceSubjectVisitId != null ? taskInfo.VisitName : taskInfo.ModuleVisitName, - ["EarliestScanDate"] = taskInfo.SourceSubjectVisitId != null ? taskInfo.VisitEarliestScanDate?.ToString("yyyy-MM-DD") : taskInfo.ModuleEarliestScanDate?.ToString("yyyy-MM-DD"), + ["EarliestScanDate"] = taskInfo.SourceSubjectVisitId != null ? taskInfo.VisitEarliestScanDate?.ToString("yyyy-MM-DD") : taskInfo.ModuleEarliestScanDate?.ToString("yyyy-MM-dd"), ["SignTime"] = taskInfo.SignTime, ["Result"] = answer diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 905af45a..05ea90c1 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -1691,6 +1691,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common var entity = item.Entity as ReadingClinicalData; + var config= await _dbContext.ClinicalDataTrialSet.FindAsync(entity.ClinicalDataTrialSetId); + await InsertInspection(item.Entity as ReadingClinicalData, type, x => new InspectionConvertDTO() { @@ -1701,7 +1703,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common ObjectRelationParentId = entity.ClinicalDataTrialSetId, //ObjectRelationParentId2 = x.IsVisit == false?x.ReadingId:null - }); ; + },new {FileCountViewStr= config?.ClinicalDataLevel==ClinicalLevel.Subject && config?.ClinicalUploadType==ClinicalUploadType.Table?"NA": entity.FileCount.ToString() }); } //阅片期计划 @@ -2622,8 +2624,23 @@ namespace IRaCIS.Core.Infra.EFCore.Common { var info = await _dbContext.Subject.Where(x => x.Id == generalData.SubjectId).Select(x => new { SubjectId = x.Id, x.SiteId, x.TrialId, SubjectCode = x.Code, TrialSiteCode = x.TrialSite.TrialSiteCode }).FirstOrDefaultAsync(); - generalData.TrialId = info?.TrialId ?? generalData.TrialId; - generalData.SiteId = info?.SiteId ?? generalData.SiteId; + if (info == null) + { + var subject= _dbContext.Subject.Find(generalData.SubjectId); + + generalData.TrialId = subject?.TrialId; + generalData.SiteId = subject?.SiteId; + } + else + { + generalData.TrialId = info?.TrialId ?? generalData.TrialId; + generalData.SiteId = info?.SiteId ?? generalData.SiteId; + } + + + + + //以后移除 generalData.SiteCode = info?.TrialSiteCode ?? generalData.SiteCode;