From 8f2d7800f8fa8b6d680598366de303b58aad0755 Mon Sep 17 00:00:00 2001
From: vaining01 <276653425@qq.com>
Date: Wed, 4 Dec 2024 12:57:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E6=A3=80=E6=8A=A5=E5=91=8A=E4=B8=8E?=
 =?UTF-8?q?=E8=81=8C=E4=B8=9A=E6=8A=A5=E5=91=8A=E5=8D=95=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?LIS=E7=9A=84=E9=80=81=E6=A3=80=E4=B8=8E=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reports/0005/Rpt0005HBsAgAsbitem.cs                     | 3 +++
 .../Reports/0005/Rpt0005RegisterCheckAsbitem.cs             | 4 ++++
 .../Reports/ConvertRpt/ConvertToReport.cs                   | 6 ++++++
 3 files changed, 13 insertions(+)

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
         /// 体检审核时间
         /// </summary>
         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);
                     }