送检时间

src/Shentun.Peis.Application.Contracts/ImportLisResults/CreateImportLisResultDto.cs

@@ -70,5 +70,15 @@ namespace Shentun.Peis.ImportLisResults
         /// lis标本号
         /// </summary>
         public string LisSampleNo { get; set; }
+
+        /// <summary>
+        /// 审核时间  第三方
+        /// </summary>
+        public DateTime? AuditorTime { get; set; }
+
+        /// <summary>
+        /// 送检时间  第三方
+        /// </summary>
+        public DateTime? SubmissionTime { get; set; }
     }
 }

src/Shentun.Peis.Application.Contracts/ImportLisResults/ImportResultByLisRequestNoInputDto.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Text;
 
 namespace Shentun.Peis.ImportLisResults
@@ -64,6 +65,16 @@ namespace Shentun.Peis.ImportLisResults
         /// </summary>
         public string LisSampleNo { get; set; }
 
+        /// <summary>
+        /// 审核时间  第三方
+        /// </summary>
+        public DateTime? AuditorTime { get; set; }
+
+        /// <summary>
+        /// 送检时间  第三方
+        /// </summary>
+        public DateTime? SubmissionTime { get; set; }
+
 
     }
 }

src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs

@@ -336,6 +336,16 @@ namespace Shentun.Peis.PrintReports
         /// </summary>
         public string SamplingTime { get; set; }
 
+        /// <summary>
+        /// 审核时间  第三方
+        /// </summary>
+        public string AuditorTime { get; set; }
+
+        /// <summary>
+        /// 送检时间  第三方
+        /// </summary>
+        public string SubmissionTime { get; set; }
+
         /// <summary>
         /// 项目类别下的组合项目列表
         /// </summary>

src/Shentun.Peis.Application.Contracts/RegisterChecks/UpdateCheckResultDto.cs

@@ -3,6 +3,7 @@ using Shentun.Peis.RegisterCheckSuggestions;
 using Shentun.Peis.RegisterCheckSummarys;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations.Schema;
 using System.Text;
 
 namespace Shentun.Peis.RegisterChecks
@@ -37,6 +38,16 @@ namespace Shentun.Peis.RegisterChecks
         /// </summary>
         public string LisSampleNo { get; set; }
 
+        /// <summary>
+        /// 审核时间  第三方
+        /// </summary>
+        public DateTime? AuditorTime { get; set; }
+
+        /// <summary>
+        /// 送检时间  第三方
+        /// </summary>
+        public DateTime? SubmissionTime { get; set; }
+
     }
 
     public class UpdateRegisterCheckItemDetail

src/Shentun.Peis.Application/ImportLisResults/ImportLisResultAppService.cs

@@ -205,6 +205,8 @@ namespace Shentun.Peis.ImportLisResults
                         lisRequestItem.registerCheck.ExecOrganizationUnitId = inputItem.ExecOrganizationUnitId;
                         lisRequestItem.registerCheck.AuditorName = inputItem.AuditorName;
                         lisRequestItem.registerCheck.LisSampleNo = inputItem.LisSampleNo;
+                        lisRequestItem.registerCheck.AuditorTime = inputItem.AuditorTime;
+                        lisRequestItem.registerCheck.SubmissionTime = inputItem.SubmissionTime;
                         registerChecks.Add(lisRequestItem.registerCheck);
                     }
                 }
@@ -264,8 +266,9 @@ namespace Shentun.Peis.ImportLisResults
 
                     }).ToList(),
                     LisSampleNo = registerCheck.LisSampleNo,
-                    AuditorName = registerCheck.AuditorName
-
+                    AuditorName = registerCheck.AuditorName,
+                    AuditorTime = registerCheck.AuditorTime,
+                    SubmissionTime = registerCheck.SubmissionTime
                 };
 
                 var getDiagnosisResultRequestDto = new GetDiagnosisResultRequestDto()
@@ -516,7 +519,9 @@ namespace Shentun.Peis.ImportLisResults
                         Result = item.Result,
                         Unit = item.Unit,
                         AuditorName = item.AuditorName,
-                        LisSampleNo = item.LisSampleNo
+                        LisSampleNo = item.LisSampleNo,
+                        AuditorTime = item.AuditorTime,
+                        SubmissionTime = item.SubmissionTime
                     };
                     inputDtoList.Add(inputDto);
                 }
@@ -611,6 +616,8 @@ namespace Shentun.Peis.ImportLisResults
                         lisRequestItem.registerCheck.ExecOrganizationUnitId = inputItem.ExecOrganizationUnitId;
                         lisRequestItem.registerCheck.AuditorName = inputItem.AuditorName;
                         lisRequestItem.registerCheck.LisSampleNo = inputItem.LisSampleNo;
+                        lisRequestItem.registerCheck.SubmissionTime = inputItem.SubmissionTime;
+                        lisRequestItem.registerCheck.AuditorTime = inputItem.AuditorTime;
                         registerChecks.Add(lisRequestItem.registerCheck);
                     }
                 }
@@ -670,8 +677,9 @@ namespace Shentun.Peis.ImportLisResults
 
                     }).ToList(),
                     LisSampleNo = registerCheck.LisSampleNo,
-                    AuditorName = registerCheck.AuditorName
-
+                    AuditorName = registerCheck.AuditorName,
+                    AuditorTime = registerCheck.AuditorTime,
+                    SubmissionTime = registerCheck.SubmissionTime
                 };
 
                 var getDiagnosisResultRequestDto = new GetDiagnosisResultRequestDto()

src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs

@@ -3,6 +3,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
+using Npgsql.Internal.TypeHandlers.DateTimeHandlers;
 using NPOI.POIFS.Properties;
 using NUglify.Helpers;
 using Shentun.Peis.AsbitemGuides;
@@ -1384,6 +1385,8 @@ namespace Shentun.Peis.PrintReports
                 #region 第三方传过来的审核信息
                 //lis审核医生+标本号
                 medicalReportRegisterCheckDto.LisSampleNo = registerCheckRow.registerCheck.LisSampleNo;
+                medicalReportRegisterCheckDto.SubmissionTime = DataHelper.ConversionDateToString(registerCheckRow.registerCheck.SubmissionTime);
+                medicalReportRegisterCheckDto.AuditorTime = DataHelper.ConversionDateToString(registerCheckRow.registerCheck.AuditorTime);
                 // medicalReportRegisterCheckDto.LisAuditorDoctorName = registerCheckRow.registerCheck.LisAuditorDoctorName;
 
                 //lis审核医生

src/Shentun.Peis.Application/RegisterChecks/RegisterCheckAppService.cs

@@ -372,6 +372,10 @@ namespace Shentun.Peis.RegisterChecks
                 registerCheck.AuditorName = input.AuditorName;
             if (!string.IsNullOrWhiteSpace(input.LisSampleNo))
                 registerCheck.LisSampleNo = input.LisSampleNo;
+            if (input.SubmissionTime!=null)
+                registerCheck.SubmissionTime = input.SubmissionTime;
+            if (input.AuditorTime != null)
+                registerCheck.AuditorTime = input.AuditorTime;
             //更新人员登记信息完成标志
             patientRegister.CompleteFlag = PatientRegisterCompleteFlag.PartCheck;
             await _patientRegisterRepository.UpdateAsync(patientRegister);

src/Shentun.Peis.Domain/RegisterChecks/RegisterCheck.cs

@@ -280,11 +280,23 @@ namespace Shentun.Peis.Models
         public DateTime? PacsUploadDate { get; set; }
 
         /// <summary>
-        /// 审核医生  原有lis_auditor_doctor_name  改名
+        /// 审核医生  原有lis_auditor_doctor_name  改名  第三方
         /// </summary>
         [Column("auditor_name")]
         public string AuditorName { get; set; }
 
+        /// <summary>
+        /// 审核时间  第三方
+        /// </summary>
+        [Column("auditor_time", TypeName = "timestamp without time zone")]
+        public DateTime? AuditorTime { get; set; }
+
+        /// <summary>
+        /// 送检时间  第三方
+        /// </summary>
+        [Column("submission_time", TypeName = "timestamp without time zone")]
+        public DateTime? SubmissionTime { get; set; }
+
         /// <summary>
         /// lis标本号
         /// </summary>