XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改稽查列表

Uat_Study
hang 2022-08-26 11:46:49 +08:00
parent 4de2da6ba2
commit c42000323b
4 changed files with 29 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -536,36 +536,6 @@
父标识 父标识
</summary> </summary>
</member> </member>
<member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.GetDataInspectionOutDto.TrialName">
<summary>
项目名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.GetDataInspectionOutDto.SiteCode">
<summary>
中心Code
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.GetDataInspectionOutDto.ResearchProgramNo">
<summary>
项目编码
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.GetDataInspectionOutDto.SiteName">
<summary>
中心名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.GetDataInspectionOutDto.SubjectCode">
<summary>
受试者名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.GetDataInspectionOutDto.SubjectVisitName">
<summary>
访视名称
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.GetDataInspectionDto.TrialId"> <member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.GetDataInspectionDto.TrialId">
<summary> <summary>
项目iD 项目iD

32
IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
View File

@ -344,7 +344,6 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
public class GetDataInspectionOutDto : DataInspection public class GetDataInspectionOutDto : DataInspection
{ {
public string ExperimentName { get; set; } = string.Empty;
public string BlindName { get; set; } 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 ParentJson { get; set; } = string.Empty;
public string CreateUser { get; set; } = string.Empty;
public string UserFirstName { get; set; } = string.Empty; public string CreateUserRealName { get; set; } = string.Empty;
public string UserLastName { get; set; } = string.Empty;
public string Description { get; set; } = string.Empty; public string Description { get; set; } = string.Empty;
public string ModuleTypeName { get; set; } = string.Empty; public string ModuleTypeName { get; set; } = string.Empty;
@ -381,34 +380,21 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
/// </summary> /// </summary>
public string ParentIdentification { get; set; } public string ParentIdentification { get; set; }
/// <summary>
/// 项目名称
/// </summary>
public string TrialName { get; set; }
/// <summary> public string ExperimentName { get; set; }
/// 中心Code
/// </summary>
public string SiteCode { get; set; } public string SiteCode { get; set; }
/// <summary>
/// 项目编码
/// </summary>
public string ResearchProgramNo { get; set; } public string ResearchProgramNo { get; set; }
/// <summary>
/// 中心名称
/// </summary>
public string SiteName { get; set; } public string SiteName { get; set; }
/// <summary>
/// 受试者名称
/// </summary>
public string SubjectCode { get; set; } public string SubjectCode { get; set; }
/// <summary>
/// 访视名称
/// </summary>
public string SubjectVisitName { get; set; } public string SubjectVisitName { get; set; }

26
IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
View File

@ -111,16 +111,26 @@ namespace IRaCIS.Core.Application.Service.Inspection
Id = data.Id, Id = data.Id,
//ParentJson = leftparent.JsonDetail, //ParentJson = leftparent.JsonDetail,
VisitName = leftsubjectVisit.VisitName, VisitName = leftsubjectVisit.VisitName,
CreateUser = leftuser.UserName,
UserFirstName = leftuser.FirstName,
UserLastName = leftuser.LastName,
//SubjectCode=leftsubject.Code,
SubjectCode = leftsubject.Code,
SubjectVisitName = leftsubjectVisit.VisitName, 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, SiteCode = lefttrialSite.TrialSiteCode,
ResearchProgramNo = leftrial.ResearchProgramNo, ResearchProgramNo = leftrial.ResearchProgramNo,
ObjectTypeId = data.ObjectTypeId, ObjectTypeId = data.ObjectTypeId,
Description = leftfrontAuditConfig.Description, Description = leftfrontAuditConfig.Description,

2
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -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.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.CreateUserId = _userInfo.Id;
inspection.IP = _userInfo.IP; inspection.IP = _userInfo.IP;
inspection.CreateTime = inspection.CreateTime == default(DateTime) ? DateTime.Now : inspection.CreateTime; inspection.CreateTime = inspection.CreateTime == default(DateTime) ? DateTime.Now : inspection.CreateTime;