diff --git a/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/ImportLisResults/Dian/GetDetailByHospCodeNormalOut.cs b/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/ImportLisResults/Dian/GetDetailByHospCodeNormalOut.cs index 6a848b76..7a7f3101 100644 --- a/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/ImportLisResults/Dian/GetDetailByHospCodeNormalOut.cs +++ b/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/ImportLisResults/Dian/GetDetailByHospCodeNormalOut.cs @@ -29,9 +29,15 @@ namespace Shentun.Peis.PlugIns.Extensions.ImportLisResults.Dian [XmlElement("SAMPLETYPE")] public string SampleType { get; set; } + /// + /// 采样时间 + /// [XmlElement("COLLECTDDATE")] public DateTime CollectDate { get; set; } + /// + /// 提交时间 + /// [XmlElement("SUBMITDATE")] public DateTime SubmitDate { get; set; } @@ -41,6 +47,9 @@ namespace Shentun.Peis.PlugIns.Extensions.ImportLisResults.Dian [XmlElement("ANALYTE_ORIGREC")] public string AnalyteOrigRec { get; set; } + /// + /// 发布时间 + /// [XmlElement("APPRDATE")] public DateTime ApproveDate { get; set; } diff --git a/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/ImportLisResults/Dian/GetDetailByHospCodePathologyOut.cs b/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/ImportLisResults/Dian/GetDetailByHospCodePathologyOut.cs index d8b7c278..0eebb6fe 100644 --- a/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/ImportLisResults/Dian/GetDetailByHospCodePathologyOut.cs +++ b/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/ImportLisResults/Dian/GetDetailByHospCodePathologyOut.cs @@ -27,12 +27,21 @@ namespace Shentun.Peis.PlugIns.Extensions.ImportLisResults.Dian [XmlElement("SEX")] public string Sex { get; set; } + /// + /// 送检时间 + /// [XmlElement("SENDDATE")] public DateTime SendDate { get; set; } + /// + /// 采样日期 + /// [XmlElement("COLLECTDDATE")] public DateTime CollectDate { get; set; } + /// + /// 报告日期 + /// [XmlElement("REPORTDATE")] public DateTime ReportDate { get; set; } diff --git a/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/ImportLisResults/Dian/ImportLisResultPlugInsDian.cs b/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/ImportLisResults/Dian/ImportLisResultPlugInsDian.cs index c3c34238..f93135f5 100644 --- a/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/ImportLisResults/Dian/ImportLisResultPlugInsDian.cs +++ b/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/ImportLisResults/Dian/ImportLisResultPlugInsDian.cs @@ -164,7 +164,8 @@ namespace Shentun.Peis.PlugIns.Extensions.ImportLisResults.Dian // ResultStatusId = lisResult.ResultStatusId, // ReportPrompt = lisResult.ReportPrompt, CheckDoctorName = defaultCheckDoctorName, - CheckDate = dianResult.ApproveDate, + //CheckDate = dianResult.ApproveDate, + CheckDate = dianResult.CollectDate, ExecOrganizationUnitId = Guid.Parse(execOrganizationUnitIdStr) }; createImportLisResultDtos.Add(createImportLisResultDto); @@ -188,7 +189,8 @@ namespace Shentun.Peis.PlugIns.Extensions.ImportLisResults.Dian // ResultStatusId = lisResult.ResultStatusId, // ReportPrompt = lisResult.ReportPrompt, CheckDoctorName = defaultCheckDoctorName, - CheckDate = dianResult.ReportDate, + // CheckDate = dianResult.ReportDate, + CheckDate = dianResult.CollectDate, ExecOrganizationUnitId = Guid.Parse(execOrganizationUnitIdStr) }; createImportLisResultDtos.Add(createImportLisResultDto);