From 3d401a82a1d966fdceb96127ddf32b4cfd1ee32c Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Fri, 26 Aug 2022 13:11:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E5=88=97=E8=A1=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 IRaCIS.Core.Application/IRaCIS.Core.Application.xml       | 5 +++++
 .../Service/Inspection/DTO/InspectionModel.cs             | 4 ++--
 .../Service/Inspection/InspectionService.cs               | 8 ++++----
 IRaCIS.Core.Domain/Trial/DataInspection.cs                | 8 ++++----
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
index a635ca8b..81d3560b 100644
--- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
+++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml
@@ -1675,6 +1675,11 @@
             
             </summary>
         </member>
+        <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TableQuestionDataInfo.Id">
+            <summary>
+            
+            </summary>
+        </member>
         <member name="P:IRaCIS.Core.Application.Service.Reading.Dto.TableQuestionDataInfo.ReadingQuestionId">
             <summary>
             问题ID
diff --git a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
index 9b7ab0fb..7aea63a3 100644
--- a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
+++ b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
@@ -348,9 +348,9 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
 
         public string BlindName { get; set; }
 
-        public string FirstName { get; set; } = string.Empty;
+        //public string FirstName { get; set; } = string.Empty;
 
-        public string LastName { get; set; } = string.Empty;
+        //public string LastName { get; set; } = string.Empty;
 
         public string VisitName { get; set; } = string.Empty;
 
diff --git a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
index 7add561b..8e2911e9 100644
--- a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
+++ b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
@@ -106,8 +106,9 @@ namespace IRaCIS.Core.Application.Service.Inspection
                             //JsonDetail = data.JsonDetail,
                             //SiteName = data.SiteName,
                             //ExperimentName = data.TrialName,
-                            FirstName = leftsubject.FirstName,
-                            LastName = leftsubject.LastName,
+                            //FirstName = leftsubject.FirstName,
+                            //LastName = leftsubject.LastName,
+
                             Id = data.Id,
                             //ParentJson = leftparent.JsonDetail,
                             VisitName = leftsubjectVisit.VisitName,
@@ -117,12 +118,11 @@ namespace IRaCIS.Core.Application.Service.Inspection
                             //CreateUserName = leftuser.UserName,
                             //RoleName = leftusertype.UserTypeShortName,
 
-
+                            CreateUserRealName=data.CreateUserName,
                             CreateUserName = data.CreateUserName,
                             RoleName=data.RoleName,
 
 
-                            CreateUserRealName = leftuser.FullName,
                             //UserFirstName = leftuser.FirstName,
                             //UserLastName = leftuser.LastName,
                             ExperimentName = leftrial.ExperimentName,
diff --git a/IRaCIS.Core.Domain/Trial/DataInspection.cs b/IRaCIS.Core.Domain/Trial/DataInspection.cs
index 7f273597..75a88577 100644
--- a/IRaCIS.Core.Domain/Trial/DataInspection.cs
+++ b/IRaCIS.Core.Domain/Trial/DataInspection.cs
@@ -106,20 +106,20 @@ namespace IRaCIS.Core.Domain.Models
 		/// <summary>
 		/// 创建人名称
 		/// </summary>
-		public string CreateUserName { get; set; }
-
+		public string CreateUserName { get; set; } = string.Empty;
 
+		public string CreateUserRealName { get; set; } = string.Empty;
 		/// <summary>
 		/// 角色名称
 		/// </summary>
-		public string RoleName { get; set; }
+		public string RoleName { get; set; } = string.Empty;
 
 
 
 		/// <summary>
 		/// 标识
 		/// </summary>
-		public string Identification { get; set; }
+		public string Identification { get; set; } = string.Empty;
 
 		///// <summary>
 		///// 访视计划ID