Merge branch 'master' of http://140.143.162.39:3000/shentun/peis

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; }
         /// <summary>
@@ -45,6 +45,6 @@ namespace Shentun.Peis.Reports
         /// <summary>
         /// 体检审核时间
         /// </summary>
-        public string auditTime { get; set; }
+        public string auditDateTime { get; set; }
     }
 }

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("乙肝"))