diff --git a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs index 1c0b57b64..ecb6ae1c4 100644 --- a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs @@ -103,7 +103,7 @@ namespace IRaCIS.Core.Application.Service.Inspection CreateTime = data.CreateTime, CreateUserId = data.CreateUserId, ModuleType = leftmoduleTypec.Id, - BlindName = data.BlindName, + BlindName = leftsubjectVisit.BlindName, TrialId = data.TrialId, SiteId = data.SiteId, SubjectId = data.SubjectId, @@ -122,7 +122,7 @@ namespace IRaCIS.Core.Application.Service.Inspection LastName = leftsubject.LastName, Id = data.Id, ParentJson = leftparent.JsonDetail, - VisitName = data.SubjectVisitName, + VisitName = leftsubjectVisit.VisitName, CreateUser = leftuser.UserName, UserFirstName = leftuser.FirstName, UserLastName = leftuser.LastName, @@ -179,10 +179,14 @@ namespace IRaCIS.Core.Application.Service.Inspection /// public async Task RecordSing(SignDTO SignInfo) { - var verifyResult = await VerifySignatureAsync(SignInfo); - var signId = await AddSignRecordAsync(SignInfo); - _userInfo.SignId = signId; - await _repository.BatchUpdateAsync(t => t.Id == signId, u => new TrialSign() { IsCompleted = true }); + if (SignInfo != null) + { + var verifyResult = await VerifySignatureAsync(SignInfo); + var signId = await AddSignRecordAsync(SignInfo); + _userInfo.SignId = signId; + await _repository.BatchUpdateAsync(t => t.Id == signId, u => new TrialSign() { IsCompleted = true }); + } + } /// diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index 5183f7c77..63a467795 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -231,6 +231,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(NoneDicomStudy))) { var entity = item.Entity as NoneDicomStudy; + var filecount =await _dbContext.NoneDicomStudyFile.Where(x => x.NoneDicomStudyId == entity.Id).CountAsync(); switch (GetRequestUrl().ToLower()) { case "nonedicomstudy/addorupdatenonedicomstudy": @@ -241,15 +242,27 @@ namespace IRaCIS.Core.Infra.EFCore.Common await InsertInspection(item, type, x => new DataInspection() { GeneralId = x.Id, + },new { + FileCount= filecount, }); } // 非Dicom文件 foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(NoneDicomStudyFile))) { + var entity = item.Entity as NoneDicomStudyFile; + var noneDicomStudy = entity.NoneDicomStudy; + if (noneDicomStudy == null) + { + noneDicomStudy = await _dbContext.NoneDicomStudy.FirstOrDefaultAsync(x => x.Id == entity.NoneDicomStudyId); + } + noneDicomStudy = noneDicomStudy ?? new NoneDicomStudy(); await InsertInspection(item, type, x => new DataInspection() { GeneralId = x.Id, + TrialId= noneDicomStudy.TrialId, + SubjectId=noneDicomStudy.SubjectId, + SubjectVisitId=noneDicomStudy.SubjectVisitId, }); } @@ -356,7 +369,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common /// 要赋值的对象 public void MapData(dynamic data, dynamic mapData) { - List column = new List() { "TrialId", "SiteId", "SubjectId", "SubjectVisitId", "CreateUserName", "TrialName", "SiteName", "SubjectCode", "SubjectVisitName", "RoleName", "SiteCode", "ResearchProgramNo" }; + List column = new List() { "TrialId", "SiteId", "SubjectId", "SubjectVisitId", "CreateUserName", "TrialName", "SiteName", "SubjectCode", "VisitName","SubjectVisitName", "RoleName", "SiteCode", "ResearchProgramNo" }; foreach (var item in column) { try