From c69dcea77b819eb00e91c71e17a23854c3b60ce7 Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Wed, 4 Dec 2024 12:44:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=81=E6=A3=80=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../CreateImportLisResultDto.cs | 10 +++++++++
.../ImportResultByLisRequestNoInputDto.cs | 11 ++++++++++
.../PrintReports/MedicalReportDto.cs | 10 +++++++++
.../RegisterChecks/UpdateCheckResultDto.cs | 11 ++++++++++
.../ImportLisResultAppService.cs | 22 +++++++++++++------
.../PrintReports/PrintReportAppService.cs | 3 +++
.../RegisterChecks/RegisterCheckAppService.cs | 4 ++++
.../RegisterChecks/RegisterCheck.cs | 14 +++++++++++-
8 files changed, 77 insertions(+), 8 deletions(-)
diff --git a/src/Shentun.Peis.Application.Contracts/ImportLisResults/CreateImportLisResultDto.cs b/src/Shentun.Peis.Application.Contracts/ImportLisResults/CreateImportLisResultDto.cs
index 916a4aa..ccfb802 100644
--- a/src/Shentun.Peis.Application.Contracts/ImportLisResults/CreateImportLisResultDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/ImportLisResults/CreateImportLisResultDto.cs
@@ -70,5 +70,15 @@ namespace Shentun.Peis.ImportLisResults
/// lis标本号
///
public string LisSampleNo { get; set; }
+
+ ///
+ /// 审核时间 第三方
+ ///
+ public DateTime? AuditorTime { get; set; }
+
+ ///
+ /// 送检时间 第三方
+ ///
+ public DateTime? SubmissionTime { get; set; }
}
}
diff --git a/src/Shentun.Peis.Application.Contracts/ImportLisResults/ImportResultByLisRequestNoInputDto.cs b/src/Shentun.Peis.Application.Contracts/ImportLisResults/ImportResultByLisRequestNoInputDto.cs
index fa9e8cf..046ed6a 100644
--- a/src/Shentun.Peis.Application.Contracts/ImportLisResults/ImportResultByLisRequestNoInputDto.cs
+++ b/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
///
public string LisSampleNo { get; set; }
+ ///
+ /// 审核时间 第三方
+ ///
+ public DateTime? AuditorTime { get; set; }
+
+ ///
+ /// 送检时间 第三方
+ ///
+ public DateTime? SubmissionTime { get; set; }
+
}
}
diff --git a/src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs b/src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs
index d40a003..0eabce8 100644
--- a/src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs
+++ b/src/Shentun.Peis.Application.Contracts/PrintReports/MedicalReportDto.cs
@@ -336,6 +336,16 @@ namespace Shentun.Peis.PrintReports
///
public string SamplingTime { get; set; }
+ ///
+ /// 审核时间 第三方
+ ///
+ public string AuditorTime { get; set; }
+
+ ///
+ /// 送检时间 第三方
+ ///
+ public string SubmissionTime { get; set; }
+
///
/// 项目类别下的组合项目列表
///
diff --git a/src/Shentun.Peis.Application.Contracts/RegisterChecks/UpdateCheckResultDto.cs b/src/Shentun.Peis.Application.Contracts/RegisterChecks/UpdateCheckResultDto.cs
index 26400fb..27aaff5 100644
--- a/src/Shentun.Peis.Application.Contracts/RegisterChecks/UpdateCheckResultDto.cs
+++ b/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
///
public string LisSampleNo { get; set; }
+ ///
+ /// 审核时间 第三方
+ ///
+ public DateTime? AuditorTime { get; set; }
+
+ ///
+ /// 送检时间 第三方
+ ///
+ public DateTime? SubmissionTime { get; set; }
+
}
public class UpdateRegisterCheckItemDetail
diff --git a/src/Shentun.Peis.Application/ImportLisResults/ImportLisResultAppService.cs b/src/Shentun.Peis.Application/ImportLisResults/ImportLisResultAppService.cs
index 8888e42..8d0ed79 100644
--- a/src/Shentun.Peis.Application/ImportLisResults/ImportLisResultAppService.cs
+++ b/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()
@@ -471,7 +474,7 @@ namespace Shentun.Peis.ImportLisResults
var config = configurationBuilder.Build();
Guid execOrganizationUnitId = Guid.Parse(config.GetSection("Interface").GetSection("ExecOrganizationUnitId").Value);
Guid columnReferenId = Guid.Parse(config.GetSection("Interface").GetSection("ColumnReferenId").Value);
- Guid userColumnReferenId= Guid.Parse(config.GetSection("Interface").GetSection("UserColumnReferenId").Value);
+ Guid userColumnReferenId = Guid.Parse(config.GetSection("Interface").GetSection("UserColumnReferenId").Value);
List inputDtoList = new List();
@@ -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);
}
@@ -598,7 +603,7 @@ namespace Shentun.Peis.ImportLisResults
//};
//修改参考范围
await UpdateItemReferenceRangeValueAsync(inputItem.ItemId, lisRequestItem.patientRegister.SexId,
- lisRequestItem.patientRegister.Age, inputItem.ReferenceRangeValue,inputItem.CriticalRangeValue);
+ lisRequestItem.patientRegister.Age, inputItem.ReferenceRangeValue, inputItem.CriticalRangeValue);
//修改单位
await UpdateItemUnitAsync(inputItem.ItemId, inputItem.Unit);
@@ -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()
diff --git a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs b/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs
index fb3d859..929c240 100644
--- a/src/Shentun.Peis.Application/PrintReports/PrintReportAppService.cs
+++ b/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审核医生
diff --git a/src/Shentun.Peis.Application/RegisterChecks/RegisterCheckAppService.cs b/src/Shentun.Peis.Application/RegisterChecks/RegisterCheckAppService.cs
index d5d6bd6..c5f8963 100644
--- a/src/Shentun.Peis.Application/RegisterChecks/RegisterCheckAppService.cs
+++ b/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);
diff --git a/src/Shentun.Peis.Domain/RegisterChecks/RegisterCheck.cs b/src/Shentun.Peis.Domain/RegisterChecks/RegisterCheck.cs
index c3cf9e7..9f1f6b1 100644
--- a/src/Shentun.Peis.Domain/RegisterChecks/RegisterCheck.cs
+++ b/src/Shentun.Peis.Domain/RegisterChecks/RegisterCheck.cs
@@ -280,11 +280,23 @@ namespace Shentun.Peis.Models
public DateTime? PacsUploadDate { get; set; }
///
- /// 审核医生 原有lis_auditor_doctor_name 改名
+ /// 审核医生 原有lis_auditor_doctor_name 改名 第三方
///
[Column("auditor_name")]
public string AuditorName { get; set; }
+ ///
+ /// 审核时间 第三方
+ ///
+ [Column("auditor_time", TypeName = "timestamp without time zone")]
+ public DateTime? AuditorTime { get; set; }
+
+ ///
+ /// 送检时间 第三方
+ ///
+ [Column("submission_time", TypeName = "timestamp without time zone")]
+ public DateTime? SubmissionTime { get; set; }
+
///
/// lis标本号
///