From c42000323beeec1aa8155c5c7ae9d064a756716e Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 26 Aug 2022 11:46:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A8=BD=E6=9F=A5=E5=88=97?=
=?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../IRaCIS.Core.Application.xml | 30 -----------------
.../Service/Inspection/DTO/InspectionModel.cs | 32 ++++++-------------
.../Service/Inspection/InspectionService.cs | 26 ++++++++++-----
.../Common/AuditingData.cs | 2 ++
4 files changed, 29 insertions(+), 61 deletions(-)
diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index 43a39ea58..a635ca8b8 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -536,36 +536,6 @@
父标识
-
-
- 项目名称
-
-
-
-
- 中心Code
-
-
-
-
- 项目编码
-
-
-
-
- 中心名称
-
-
-
-
- 受试者名称
-
-
-
-
- 访视名称
-
-
项目iD
diff --git a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
index d53abd461..9b7ab0fb7 100644
--- a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
+++ b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
@@ -344,7 +344,6 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
public class GetDataInspectionOutDto : DataInspection
{
- public string ExperimentName { get; set; } = string.Empty;
public string BlindName { get; set; }
@@ -357,9 +356,9 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
//public string ParentJson { get; set; } = string.Empty;
- public string CreateUser { get; set; } = string.Empty;
- public string UserFirstName { get; set; } = string.Empty;
- public string UserLastName { get; set; } = string.Empty;
+
+ public string CreateUserRealName { get; set; } = string.Empty;
+
public string Description { get; set; } = string.Empty;
public string ModuleTypeName { get; set; } = string.Empty;
@@ -381,34 +380,21 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
///
public string ParentIdentification { get; set; }
- ///
- /// 项目名称
- ///
- public string TrialName { get; set; }
- ///
- /// 中心Code
- ///
+ public string ExperimentName { get; set; }
+
+
public string SiteCode { get; set; }
- ///
- /// 项目编码
- ///
public string ResearchProgramNo { get; set; }
- ///
- /// 中心名称
- ///
+
public string SiteName { get; set; }
- ///
- /// 受试者名称
- ///
+
public string SubjectCode { get; set; }
- ///
- /// 访视名称
- ///
+
public string SubjectVisitName { get; set; }
diff --git a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
index 8ead2d8c0..7add561b2 100644
--- a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
+++ b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
@@ -111,16 +111,26 @@ namespace IRaCIS.Core.Application.Service.Inspection
Id = data.Id,
//ParentJson = leftparent.JsonDetail,
VisitName = leftsubjectVisit.VisitName,
- CreateUser = leftuser.UserName,
- UserFirstName = leftuser.FirstName,
- UserLastName = leftuser.LastName,
- //SubjectCode=leftsubject.Code,
- SubjectCode = leftsubject.Code,
SubjectVisitName = leftsubjectVisit.VisitName,
- CreateUserName = leftuser.FirstName + leftuser.LastName,
- RoleName = leftusertype.UserTypeShortName,
- TrialName = leftrial.ExperimentName,
+
+
+ //CreateUserName = leftuser.UserName,
+ //RoleName = leftusertype.UserTypeShortName,
+
+
+ CreateUserName = data.CreateUserName,
+ RoleName=data.RoleName,
+
+
+ CreateUserRealName = leftuser.FullName,
+ //UserFirstName = leftuser.FirstName,
+ //UserLastName = leftuser.LastName,
+ ExperimentName = leftrial.ExperimentName,
+
+
+ SubjectCode = leftsubject.Code,
SiteCode = lefttrialSite.TrialSiteCode,
+
ResearchProgramNo = leftrial.ResearchProgramNo,
ObjectTypeId = data.ObjectTypeId,
Description = leftfrontAuditConfig.Description,
diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index 99ca55936..89ec395cd 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@@ -1096,6 +1096,8 @@ namespace IRaCIS.Core.Infra.EFCore.Common
// inspection.ParentId = (await _dbContext.DataInspection.AsQueryable().Where(x => x.GeneralId == inspection.GeneralId && x.ObjectRelationParentId == inspection.ObjectRelationParentId).OrderByDescending(x => x.CreateTime).FirstOrDefaultAsync())?.Id;
//}
+ inspection.CreateUserName = _userInfo.UserName;
+ inspection.RoleName = _userInfo.UserTypeShortName;
inspection.CreateUserId = _userInfo.Id;
inspection.IP = _userInfo.IP;
inspection.CreateTime = inspection.CreateTime == default(DateTime) ? DateTime.Now : inspection.CreateTime;