Browse Source

个检报告与职业报告单增加LIS的送检与审核时间

master
vaining01 11 months ago
parent
commit
8f2d7800f8
  1. 3
      src/Shentun.Peis.Application.Contracts/Reports/0005/Rpt0005HBsAgAsbitem.cs
  2. 4
      src/Shentun.Peis.Application.Contracts/Reports/0005/Rpt0005RegisterCheckAsbitem.cs
  3. 6
      src/Shentun.Peis.Application/Reports/ConvertRpt/ConvertToReport.cs

3
src/Shentun.Peis.Application.Contracts/Reports/0005/Rpt0005HBsAgAsbitem.cs

@ -19,5 +19,8 @@ namespace Shentun.Peis.Reports
public string samplerName { get; set; } public string samplerName { get; set; }
public string samplingTime { get; set; } public string samplingTime { get; set; }
public string summarysText { get; set; } public string summarysText { get; set; }
public string AuditorDateTime { get; set; }
public string SubmissionTime { get; set; }
} }
} }

4
src/Shentun.Peis.Application.Contracts/Reports/0005/Rpt0005RegisterCheckAsbitem.cs

@ -46,5 +46,9 @@ namespace Shentun.Peis.Reports
/// 体检审核时间 /// 体检审核时间
/// </summary> /// </summary>
public string auditDateTime { get; set; } public string auditDateTime { get; set; }
public string AuditorDateTime { get; set; }
public string SubmissionDateTime { get; set; }
} }
} }

6
src/Shentun.Peis.Application/Reports/ConvertRpt/ConvertToReport.cs

@ -1092,6 +1092,8 @@ namespace Shentun.Peis.Reports.ConvertRpt
isAudit = Convert.ToString(asbitem.IsAudit), isAudit = Convert.ToString(asbitem.IsAudit),
auditorUserName = asbitem.AuditorUserName, auditorUserName = asbitem.AuditorUserName,
auditDateTime = asbitem.AuditTime, auditDateTime = asbitem.AuditTime,
AuditorDateTime = asbitem.AuditorTime,
SubmissionDateTime = asbitem.SubmissionTime,
}; };
@ -1502,6 +1504,8 @@ namespace Shentun.Peis.Reports.ConvertRpt
isAudit = Convert.ToString(asbitem.IsAudit), isAudit = Convert.ToString(asbitem.IsAudit),
auditorUserName = asbitem.AuditorUserName, auditorUserName = asbitem.AuditorUserName,
auditDateTime = asbitem.AuditTime, auditDateTime = asbitem.AuditTime,
AuditorDateTime=asbitem.AuditorTime,
SubmissionDateTime = asbitem.SubmissionTime,
}; };
if (asbitem.AsbitemNames.Contains("乙肝")) if (asbitem.AsbitemNames.Contains("乙肝"))
@ -1520,6 +1524,8 @@ namespace Shentun.Peis.Reports.ConvertRpt
samplerName = asbitem.SamplerName, samplerName = asbitem.SamplerName,
samplingTime = asbitem.SamplingTime, samplingTime = asbitem.SamplingTime,
lisSampleNo = asbitem.LisSampleNo, lisSampleNo = asbitem.LisSampleNo,
AuditorDateTime = asbitem.AuditorTime,
SubmissionDateTime = asbitem.SubmissionTime,
}; };
dHBsAgList.Add(hb); dHBsAgList.Add(hb);
} }

Loading…
Cancel
Save