diff --git a/src/Shentun.Peis.Application.Contracts/Reports/0005/Rpt0005HBsAgAsbitem.cs b/src/Shentun.Peis.Application.Contracts/Reports/0005/Rpt0005HBsAgAsbitem.cs index d726c15..d9adb17 100644 --- a/src/Shentun.Peis.Application.Contracts/Reports/0005/Rpt0005HBsAgAsbitem.cs +++ b/src/Shentun.Peis.Application.Contracts/Reports/0005/Rpt0005HBsAgAsbitem.cs @@ -19,5 +19,8 @@ namespace Shentun.Peis.Reports public string samplerName { get; set; } public string samplingTime { get; set; } public string summarysText { get; set; } + + public string AuditorDateTime { get; set; } + public string SubmissionTime { get; set; } } } diff --git a/src/Shentun.Peis.Application.Contracts/Reports/0005/Rpt0005RegisterCheckAsbitem.cs b/src/Shentun.Peis.Application.Contracts/Reports/0005/Rpt0005RegisterCheckAsbitem.cs index 6d28495..c27e5b3 100644 --- a/src/Shentun.Peis.Application.Contracts/Reports/0005/Rpt0005RegisterCheckAsbitem.cs +++ b/src/Shentun.Peis.Application.Contracts/Reports/0005/Rpt0005RegisterCheckAsbitem.cs @@ -46,5 +46,9 @@ namespace Shentun.Peis.Reports /// 体检审核时间 /// public string auditDateTime { get; set; } + + public string AuditorDateTime { get; set; } + + public string SubmissionDateTime { get; set; } } } diff --git a/src/Shentun.Peis.Application/Reports/ConvertRpt/ConvertToReport.cs b/src/Shentun.Peis.Application/Reports/ConvertRpt/ConvertToReport.cs index 6c410b4..b12d98a 100644 --- a/src/Shentun.Peis.Application/Reports/ConvertRpt/ConvertToReport.cs +++ b/src/Shentun.Peis.Application/Reports/ConvertRpt/ConvertToReport.cs @@ -1092,6 +1092,8 @@ namespace Shentun.Peis.Reports.ConvertRpt isAudit = Convert.ToString(asbitem.IsAudit), auditorUserName = asbitem.AuditorUserName, auditDateTime = asbitem.AuditTime, + AuditorDateTime = asbitem.AuditorTime, + SubmissionDateTime = asbitem.SubmissionTime, }; @@ -1502,6 +1504,8 @@ namespace Shentun.Peis.Reports.ConvertRpt isAudit = Convert.ToString(asbitem.IsAudit), auditorUserName = asbitem.AuditorUserName, auditDateTime = asbitem.AuditTime, + AuditorDateTime=asbitem.AuditorTime, + SubmissionDateTime = asbitem.SubmissionTime, }; if (asbitem.AsbitemNames.Contains("乙肝")) @@ -1520,6 +1524,8 @@ namespace Shentun.Peis.Reports.ConvertRpt samplerName = asbitem.SamplerName, samplingTime = asbitem.SamplingTime, lisSampleNo = asbitem.LisSampleNo, + AuditorDateTime = asbitem.AuditorTime, + SubmissionDateTime = asbitem.SubmissionTime, }; dHBsAgList.Add(hb); }