修改一版

IRaCIS.Core.Application/IRaCIS.Core.Application.xml

@@ -156,6 +156,21 @@
             子类
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionAddDTO.ObjectType">
+            <summary>
+            对象名称
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionAddDTO.OptType">
+            <summary>
+            操作类型
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionAddDTO.ModuleType">
+            <summary>
+            功能模块
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionAddDTO.CreateUserName">
             <summary>
             创建人名称
@@ -196,11 +211,6 @@
             项目编码
             </summary>
         </member>
-        <member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionAddDTO.ObjectType">
-            <summary>
-            对象名称
-            </summary>
-        </member>
         <member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionAddDTO.Identification">
             <summary>
             标识

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;
-
 
+        /// <summary>
+        /// 子类
+        /// </summary>
+        public Guid? ChildrenType { get; set; }
+        /// <summary>
+        /// 对象名称
+        /// </summary>
+        public Guid? ObjectType { get; set; }
+        /// <summary>
+        /// 操作类型
+        /// </summary>
+        public Guid? OptType { get; set; }
+        /// <summary>
+        /// 功能模块
+        /// </summary>
+        public Guid? ModuleType { get; set; }
 
         public string BlindName { get; set; } = string.Empty;
         public string Reason { get; set; } = string.Empty;
 
 
-        /// <summary>
-        /// 子类
-        /// </summary>
-        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> EnumList { get; set; } = new List<EnumList> { };
 
 
-        /// <summary>
-		/// 对象名称
-		/// </summary>
-		public string ObjectType { get; set; } = string.Empty;
-
         /// <summary>
         /// 标识
         /// </summary>

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;

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<SubjectVisit>(item, type, x => new DataInspection()
                 {
+                    SubjectCode= subjectCode,
+                    SubjectId=x.SubjectId,
                     SubjectVisitId = x.Id,
                     SubjectVisitName=x.VisitName,
                 });

IRaCIS.Core.Infra.EFCore/Repository/Repository.cs

@@ -601,6 +601,11 @@ namespace IRaCIS.Core.Infra.EFCore
 
             var JsonData = JsonConvert.DeserializeObject<IDictionary<string, object>>(json);
 
+            if (JsonData == null)
+            {
+                return json;
+            }
+
             foreach (var item in JsonData.Keys)
             {
                 var datefirst = list.FirstOrDefault(x => x.Code.ToLower() == item.ToLower());