From d1ac36e74bba2f7c97e173632af025b6d078be4e Mon Sep 17 00:00:00 2001 From: wxd <123@qq.com> Date: Sat, 15 Jun 2024 17:14:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WebAppoints/WebAppointWebPeisPlugIns.cs | 2 +- .../TransToWebPeis/TransToWebPeisAppService.cs | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Shentun.ColumnReferencePlugIns/WebAppoints/WebAppointWebPeisPlugIns.cs b/src/Shentun.ColumnReferencePlugIns/WebAppoints/WebAppointWebPeisPlugIns.cs index 0b73554..8fd5b0c 100644 --- a/src/Shentun.ColumnReferencePlugIns/WebAppoints/WebAppointWebPeisPlugIns.cs +++ b/src/Shentun.ColumnReferencePlugIns/WebAppoints/WebAppointWebPeisPlugIns.cs @@ -99,7 +99,7 @@ namespace Shentun.Peis.PlugIns.WebAppoints SELECT id from patient_register - where summary_date > @HandDate and + where summary_date >= @HandDate and complete_flag = @CompleteFlag "; var patientRegisterIds = (await conn.QueryAsync(sql, diff --git a/src/Shentun.Peis.Application/TransToWebPeis/TransToWebPeisAppService.cs b/src/Shentun.Peis.Application/TransToWebPeis/TransToWebPeisAppService.cs index 5d2eee5..f297dbd 100644 --- a/src/Shentun.Peis.Application/TransToWebPeis/TransToWebPeisAppService.cs +++ b/src/Shentun.Peis.Application/TransToWebPeis/TransToWebPeisAppService.cs @@ -228,10 +228,10 @@ namespace Shentun.Peis.TransToWebPeis { var thirdInterface = await _thirdInterfaceRepository.FirstOrDefaultAsync(f => f.ThirdInterfaceType == ThirdInterfaceTypeFlag.TranToWebPeis); - //if (thirdInterface.IsActive != 'Y') - //{ - // throw new UserFriendlyException("该接口已禁用"); - //} + if (thirdInterface.IsActive != 'Y') + { + throw new UserFriendlyException("该接口已禁用"); + } var parmValue = thirdInterface.ParmValue; var configurationBuilder = new ConfigurationBuilder() @@ -1470,6 +1470,7 @@ namespace Shentun.Peis.TransToWebPeis /// 临时导入2024年报告 /// /// + [RemoteService(false)] public async Task TempExportReportAsync() { @@ -1483,7 +1484,7 @@ namespace Shentun.Peis.TransToWebPeis { using (var uow = _unitOfWorkManager.Begin(requiresNew: true, isTransactional: true)) { - var isUploadReport = WebDb0520.Ado.GetDataTable($"select patient_register_id from patient_register where patient_register_id='{item}' and report_file is null ").Rows.Count; + var isUploadReport = WebDb0520.Ado.GetDataTable($"select patient_register_id,report_file from patient_register where patient_register_id='{item}' and report_file is null ").Rows.Count; if (isUploadReport == 1) { await SyncPatientRegisterReportByPatientRegisterIdAsync(new PatientRegisterIdInputDto