From a85c2d131661c2cf1906be4736096c31a50d23fc Mon Sep 17 00:00:00 2001 From: he <10978375@qq.com> Date: Fri, 6 May 2022 10:08:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/Inspection/InspectionService.cs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs index 00e00396e..19a03b97d 100644 --- a/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs +++ b/IRaCIS.Core.Application/Service/Inspection/InspectionService.cs @@ -50,8 +50,10 @@ namespace IRaCIS.Core.Application.Service.Inspection from leftparent in parenttemp.DefaultIfEmpty() join user in _repository.GetQueryable() on data.CreateUserId equals user.Id into usertemp from leftuser in usertemp.DefaultIfEmpty() + join usertype in _repository.GetQueryable() on leftuser.UserTypeId equals usertype.Id into usertypetemp + from leftusertype in usertypetemp.DefaultIfEmpty() + - @@ -125,13 +127,13 @@ namespace IRaCIS.Core.Application.Service.Inspection UserFirstName = leftuser.FirstName, UserLastName = leftuser.LastName, //SubjectCode=leftsubject.Code, - SubjectCode =data.SubjectCode, - SubjectVisitName=data.SubjectVisitName, - CreateUserName = data.CreateUserName, - RoleName=data.RoleName, - TrialName=data.TrialName, - SiteCode=data.SiteCode, - ResearchProgramNo=data.ResearchProgramNo, + SubjectCode =leftsubject.Code, + SubjectVisitName=leftsubjectVisit.VisitName, + CreateUserName = leftuser.FirstName + leftuser.LastName, + RoleName= leftusertype.UserTypeShortName, + TrialName= leftrial.ExperimentName, + SiteCode=leftsite.SiteCode, + ResearchProgramNo= leftrial.ResearchProgramNo, ObjectType=data.ObjectType, Description=leftfrontAuditConfig.Description, ModuleTypeName= leftmoduleTypec.ValueCN,