diff --git a/src/Shentun.Peis.Application.Contracts/Reports/0005/Rpt0005RegisterCheckAsbitem.cs b/src/Shentun.Peis.Application.Contracts/Reports/0005/Rpt0005RegisterCheckAsbitem.cs index 7936761..6d28495 100644 --- a/src/Shentun.Peis.Application.Contracts/Reports/0005/Rpt0005RegisterCheckAsbitem.cs +++ b/src/Shentun.Peis.Application.Contracts/Reports/0005/Rpt0005RegisterCheckAsbitem.cs @@ -26,7 +26,7 @@ namespace Shentun.Peis.Reports public string lisSampleNo { get; set; } public string samplerName { get; set; } - public string samplingTime { get; set; } + public string samplingDateTime { get; set; } public string summarysText { get; set; } /// @@ -45,6 +45,6 @@ namespace Shentun.Peis.Reports /// /// 体检审核时间 /// - public string auditTime { get; set; } + public string auditDateTime { get; set; } } } diff --git a/src/Shentun.Peis.Application/Reports/ConvertRpt/ConvertToReport.cs b/src/Shentun.Peis.Application/Reports/ConvertRpt/ConvertToReport.cs index 7a15834..6c410b4 100644 --- a/src/Shentun.Peis.Application/Reports/ConvertRpt/ConvertToReport.cs +++ b/src/Shentun.Peis.Application/Reports/ConvertRpt/ConvertToReport.cs @@ -1086,12 +1086,12 @@ namespace Shentun.Peis.Reports.ConvertRpt auditorName = asbitem.AuditorName, auditorSignUrl = asbitem.AuditorNameSignUrl, samplerName = asbitem.SamplerName, - samplingTime = asbitem.SamplingTime, + samplingDateTime = asbitem.SamplingTime, checkDate = asbitem.CheckDate.ToString("yyyy-MM-dd HH:mm:ss"), auditorUserSignUrl = asbitem.AuditorUserSignUrl, isAudit = Convert.ToString(asbitem.IsAudit), auditorUserName = asbitem.AuditorUserName, - auditTime = asbitem.AuditTime, + auditDateTime = asbitem.AuditTime, }; @@ -1496,12 +1496,12 @@ namespace Shentun.Peis.Reports.ConvertRpt auditorName = asbitem.AuditorName, auditorSignUrl = asbitem.AuditorNameSignUrl, samplerName = asbitem.SamplerName, - samplingTime = asbitem.SamplingTime, + samplingDateTime = asbitem.SamplingTime, lisSampleNo = asbitem.LisSampleNo, auditorUserSignUrl = asbitem.AuditorUserSignUrl, isAudit = Convert.ToString(asbitem.IsAudit), auditorUserName = asbitem.AuditorUserName, - auditTime = asbitem.AuditTime, + auditDateTime = asbitem.AuditTime, }; if (asbitem.AsbitemNames.Contains("乙肝"))