diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index a635ca8b8..81d3560ba 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -1675,6 +1675,11 @@ + + + + + 问题ID diff --git a/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs b/IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs index 9b7ab0fb7..7aea63a3e 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 7add561b2..8e2911e91 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 7f2735975..75a88577c 100644 --- a/IRaCIS.Core.Domain/Trial/DataInspection.cs +++ b/IRaCIS.Core.Domain/Trial/DataInspection.cs @@ -106,20 +106,20 @@ namespace IRaCIS.Core.Domain.Models /// /// 创建人名称 /// - public string CreateUserName { get; set; } - + public string CreateUserName { get; set; } = string.Empty; + public string CreateUserRealName { get; set; } = string.Empty; /// /// 角色名称 /// - public string RoleName { get; set; } + public string RoleName { get; set; } = string.Empty; /// /// 标识 /// - public string Identification { get; set; } + public string Identification { get; set; } = string.Empty; ///// ///// 访视计划ID