diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index fbffa5625..a030fd170 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -156,6 +156,21 @@ 子类 + + + 对象名称 + + + + + 操作类型 + + + + + 功能模块 + + 创建人名称 @@ -196,11 +211,6 @@ 项目编码 - - - 对象名称 - - 标识 diff --git a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs index 4c0f8ddc7..c7784f5e8 100644 --- a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs +++ b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs @@ -24,19 +24,28 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO public Guid? SiteId { get; set; } public Guid? SubjectId { get; set; } public Guid? SubjectVisitId { get; set; } - public string ModuleType { get; set; } = string.Empty; - public string OptType { get; set; } = string.Empty; - + /// + /// 子类 + /// + public Guid? ChildrenType { get; set; } + /// + /// 对象名称 + /// + public Guid? ObjectType { get; set; } + /// + /// 操作类型 + /// + public Guid? OptType { get; set; } + /// + /// 功能模块 + /// + public Guid? ModuleType { get; set; } public string BlindName { get; set; } = string.Empty; public string Reason { get; set; } = string.Empty; - /// - /// 子类 - /// - public string ChildrenType { get; set; } = string.Empty; public bool IsSign { get; set; } public string JsonDetail { get; set; } = string.Empty; @@ -84,11 +93,6 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO public List EnumList { get; set; } = new List { }; - /// - /// 对象名称 - /// - public string ObjectType { get; set; } = string.Empty; - /// /// 标识 /// diff --git a/IRaCIS.Core.Application/Service/Visit/SubjectService.cs b/IRaCIS.Core.Application/Service/Visit/SubjectService.cs index 014c7372c..d415b381f 100644 --- a/IRaCIS.Core.Application/Service/Visit/SubjectService.cs +++ b/IRaCIS.Core.Application/Service/Visit/SubjectService.cs @@ -46,13 +46,13 @@ namespace IRaCIS.Application.Services }; - bool isadd = false; + Subject? mapedSubject = null; if (subjectCommand.Id == null) //insert { - isadd = true; + mapedSubject= await _subjectRepository.InsertFromDTOAsync(subjectCommand, false, verifyExp1); @@ -66,6 +66,7 @@ namespace IRaCIS.Application.Services svlist.ForEach(t => { + t.Subject = mapedSubject; t.SubjectId = mapedSubject.Id; t.TrialId = subjectCommand.TrialId; t.SiteId = subjectCommand.SiteId; diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs index fcbd98e30..0d2c82813 100644 --- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs +++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs @@ -94,8 +94,11 @@ namespace IRaCIS.Core.Infra.EFCore.Common // 访视 foreach (var item in entitys.Where(x => x.Entity.GetType() == typeof(SubjectVisit))) { + var subjectCode = (item.Entity as SubjectVisit).Subject?.Code; await InsertInspection(item, type, x => new DataInspection() { + SubjectCode= subjectCode, + SubjectId=x.SubjectId, SubjectVisitId = x.Id, SubjectVisitName=x.VisitName, }); diff --git a/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs b/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs index 3c8858fc5..3381e575f 100644 --- a/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs +++ b/IRaCIS.Core.Infra.EFCore/Repository/Repository.cs @@ -601,6 +601,11 @@ namespace IRaCIS.Core.Infra.EFCore var JsonData = JsonConvert.DeserializeObject>(json); + if (JsonData == null) + { + return json; + } + foreach (var item in JsonData.Keys) { var datefirst = list.FirstOrDefault(x => x.Code.ToLower() == item.ToLower());