修改问题 添加字段

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

@@ -630,6 +630,16 @@
             角色名称
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionAddDTO.SiteCode">
+            <summary>
+            中心Code
+            </summary>
+        </member>
+        <member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.DataInspectionAddDTO.ResearchProgramNo">
+            <summary>
+            项目编码
+            </summary>
+        </member>
         <member name="T:IRaCIS.Core.Application.Service.Inspection.DTO.InsBasicTrialConfig">
             <summary>
             配置 基础逻辑信息

IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs

@@ -66,6 +66,17 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
         public string RoleName { get; set; } = string.Empty;
 
 
+        /// <summary>
+		/// 中心Code
+		/// </summary>
+		public string SiteCode { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 项目编码
+        /// </summary>
+        public string ResearchProgramNo { get; set; } = string.Empty;
+
+
         ////需要单独处理
         //public string IP { get; set; }
 

IRaCIS.Core.Application/Service/Inspection/InspectionService.cs

@@ -73,6 +73,8 @@ namespace IRaCIS.Core.Application.Service.Inspection
                             CreateUserName = data.CreateUserName,
                             RoleName=data.RoleName,
                             TrialName=data.TrialName,
+                            SiteCode=data.SiteCode,
+                            ResearchProgramNo=data.ResearchProgramNo,
                         };
 
             query = query.WhereIf(!dto.BlindName.IsNullOrEmpty(), x => x.BlindName == dto.BlindName)
@@ -254,32 +256,14 @@ namespace IRaCIS.Core.Application.Service.Inspection
             await _repository.AddAsync(add);
             if (addDto.OptType.ToLower() == "Add".ToLower()&& Statusdata!=null)
             {
-              
 
-                DataInspection ststus = new DataInspection()
-                {
-                    SignId = signId,
-                    SiteId = add.SiteId,
-                    SubjectId = add.SubjectId,
-                    SubjectVisitId = add.SubjectVisitId,
-                    IsSign = add.IsSign,
-                    BlindName = add.BlindName,
-                    ChildrenType = "Status",
-                    OptType = "Init",
-                    CreateTime = add.CreateTime.AddSeconds(1),
-                    CreateUserId = add.CreateUserId,
-                    IP = add.IP,
-                    ModuleType = add.ModuleType,
-                    TrialId = add.TrialId,
-                    JsonDetail = JsonConvert.SerializeObject(Statusdata),
-                    TrialName=add.TrialName,
-                    SiteName=add.SiteName,
-                    SubjectCode = add.SubjectCode,
-                    SubjectVisitName=add.SubjectVisitName,
-                    CreateUserName=add.CreateUserName,
-                    RoleName=add.RoleName,
-                };
 
+                DataInspection ststus=JsonConvert.DeserializeObject<DataInspection>(JsonConvert.SerializeObject(add))??new DataInspection();
+                ststus.CreateTime = add.CreateTime.AddSeconds(1);
+                ststus.JsonDetail = JsonConvert.SerializeObject(Statusdata);
+                ststus.ChildrenType = "Status";
+                ststus.OptType = "Init";
+                ststus.Id = Guid.NewGuid();
                 await _repository.AddAsync(ststus);
             }
 
@@ -296,23 +280,32 @@ namespace IRaCIS.Core.Application.Service.Inspection
         public async Task SetInspectionNameValue(DataInspection Data)
         {
             #region 项目名称
+
+            var trialdata = await _repository.GetQueryable<Trial>().FirstOrDefaultAsync(x => x.Id == Data.TrialId);
+            Data.ResearchProgramNo = trialdata?.ResearchProgramNo;
             if (Data.TrialName.IsNullOrEmpty())
             {
-                Data.TrialName = (await _repository.GetQueryable<Trial>().FirstOrDefaultAsync(x => x.Id == Data.TrialId))?.ExperimentName;
+                Data.TrialName = trialdata?.ExperimentName;
             }
             #endregion
 
 
             #region 测试中心名称
+
+            var sitedata = await _repository.GetQueryable<Site>().FirstOrDefaultAsync(x => x.Id == Data.SiteId);
+            Data.SiteCode = sitedata?.SiteCode;
             if (Data.SiteName.IsNullOrEmpty())
             {
-                Data.SiteName = (await _repository.GetQueryable<Site>().FirstOrDefaultAsync(x => x.Id == Data.SiteId))?.SiteName;
+                Data.SiteName = sitedata?.SiteName;
             }
             #endregion
 
             #region 受试者
+
+          
             if (Data.SubjectCode.IsNullOrEmpty())
             {
+
                 Data.SubjectCode = (await _repository.GetQueryable<Subject>().FirstOrDefaultAsync(x => x.Id == Data.SubjectId))?.Code;
             }
             #endregion

IRaCIS.Core.Domain/Trial/DataInspection.cs

@@ -129,6 +129,16 @@ namespace IRaCIS.Core.Domain.Models
 		/// </summary>
 		public string RoleName { get; set; }
 
+		/// <summary>
+		/// 中心Code
+		/// </summary>
+		public string SiteCode { get; set; }
+
+		/// <summary>
+		/// 项目编码
+		/// </summary>
+		public string ResearchProgramNo { get; set; }
+
 	}
 
 

IRaCIS.Core.Infra.EFCore/Context/IRaCISDBContext.cs

@@ -307,7 +307,11 @@ namespace IRaCIS.Core.Infra.EFCore
                     case EntityState.Added:
                         if (t.Entity is IAuditAdd addEntity)
                         {
-                            addEntity.CreateTime = DateTime.UtcNow.AddHours(8);
+                            if (addEntity.CreateTime == default(DateTime))
+                            {
+                                addEntity.CreateTime = DateTime.UtcNow.AddHours(8);
+                            }
+                            
                             addEntity.CreateUserId = _userInfo.Id;
                         }