修改稽查

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

@@ -347,7 +347,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
         public string ExperimentName { get; set; } = string.Empty;
 
 
-
+        public string BlindName { get; set; }
 
         public string FirstName { get; set; } = string.Empty;
 
@@ -371,7 +371,7 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
 
         public bool? InPlan { get; set; }
 
-        public string OptTypeName { get; set; } = string.Empty;
+        public string OptType { get; set; } = string.Empty;
 
         public Guid? FrontAuditConfigId { get; set; }
 
@@ -381,6 +381,36 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
         /// </summary>
         public string ParentIdentification { get; set; }
 
+        /// <summary>
+        /// 项目名称
+        /// </summary>
+        public string TrialName { get; set; }
+
+        /// <summary>
+        /// 中心Code
+        /// </summary>
+        public string SiteCode { get; set; }
+
+        /// <summary>
+        /// 项目编码
+        /// </summary>
+        public string ResearchProgramNo { get; set; }
+
+        /// <summary>
+        /// 中心名称
+        /// </summary>
+        public string SiteName { get; set; }
+
+        /// <summary>
+        /// 受试者名称
+        /// </summary>
+        public string SubjectCode { get; set; }
+
+        /// <summary>
+        /// 访视名称
+        /// </summary>
+        public string SubjectVisitName { get; set; }
+
 
     }
 

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

@@ -88,7 +88,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
                         {
                             CreateTime = data.CreateTime,
                             CreateUserId = data.CreateUserId,
-                            ModuleType = leftmoduleTypec.Id,
+                            ModuleTypeId = leftmoduleTypec.Id,
                             BlindName = leftsubjectVisit.BlindName,
                             TrialId = data.TrialId,
                             SiteId = data.SiteId,
@@ -100,7 +100,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
                             IsSign = data.IsSign,
                             SignId = data.SignId,
                             ParentId = data.ParentId,
-                            ChildrenType = data.ChildrenType,
+                            ChildrenTypeId = data.ChildrenTypeId,
                             //JsonDetail = data.JsonDetail,
                             //SiteName = data.SiteName,
                             //ExperimentName = data.TrialName,
@@ -120,19 +120,19 @@ namespace IRaCIS.Core.Application.Service.Inspection
                             TrialName= leftrial.ExperimentName,
                             SiteCode= lefttrialSite.TrialSiteCode,
                             ResearchProgramNo= leftrial.ResearchProgramNo,
-                            ObjectType=data.ObjectType,
+                            ObjectTypeId=data.ObjectTypeId,
                             Description=leftfrontAuditConfig.Description,
                             ModuleTypeName= leftmoduleTypec.ValueCN,
                             SignText= lefttrialSign.SignText,
                             Identification= leftfrontAuditConfig.Identification,
                             FrontAuditConfigId= leftfrontAuditConfig.Id,
                             ParentIdentification = leftparent.Identification,
-                            OptType = leftOptType.Id,
+                            OptTypeId = leftOptType.Id,
                             VisitNum=leftsubjectVisit.VisitNum,
                             InPlan= leftsubjectVisit.InPlan,
                             //IsFrontAdd=data.IsFrontAdd,
                             BatchId =data.BatchId,
-                            OptTypeName = leftOptType.Value,
+                            OptType = leftOptType.Value,
                         };
 
             query = query.WhereIf(dto.SiteId != null, x => x.SiteId == dto.SiteId)
@@ -142,7 +142,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
                  //.WhereIf(dto.VisitPlanInfo != (decimal)1.11,x=>x.InPlan!=null&& x.InPlan==false)
                  .WhereIf(dto.StartTime != null, x => x.CreateTime >= dto.StartTime)
                  .WhereIf(dto.EndTime != null, x => x.CreateTime <= dto.EndTime)
-                 .WhereIf(dto.ModuleType!=null, x => x.ModuleType == dto.ModuleType)
+                 .WhereIf(dto.ModuleType!=null, x => x.ModuleTypeId == dto.ModuleType)
                  .WhereIf(!dto.Description.IsNullOrEmpty(), x => x.Description == dto.Description)
                  .WhereIf(!dto.OpByUserName.IsNullOrEmpty(), x => x.CreateUserName.Contains(dto.OpByUserName))
                  //.WhereIf(!dto.SubjectInfo.IsNullOrEmpty(), x => x.SubjectCode.Contains(dto.SubjectInfo))