From a7ff237f78e4037aa8cfe31f2e8825b8d7f465cc Mon Sep 17 00:00:00 2001
From: wxd <123@qq.com>
Date: Wed, 29 May 2024 19:59:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=83=E7=94=B5=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ImportPacsResultPlugInsGem.cs                    | 12 +++++++-----
 .../PeisHttpApiHostModule.cs                         | 12 ++++++------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/ImportPacsResultPlugInsGem.cs b/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/ImportPacsResultPlugInsGem.cs
index caf3bb0..3da3858 100644
--- a/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/ImportPacsResultPlugInsGem.cs
+++ b/ThirdPlugIns/Shentun.Peis.PlugIns.Gem/ImportPacsResultPlugInsGem.cs
@@ -15,8 +15,8 @@ namespace Shentun.Peis.PlugIns.Gem
 {
     public class ImportPacsResultPlugInsGem : ImportPacsResultPlugInsBase
     {
-        public ImportPacsResultPlugInsGem(Guid thirdInterfaceId):base(thirdInterfaceId) 
-        { 
+        public ImportPacsResultPlugInsGem(Guid thirdInterfaceId) : base(thirdInterfaceId)
+        {
         }
         public ImportPacsResultPlugInsGem(string parmValue) : base(parmValue)
         {
@@ -42,8 +42,9 @@ namespace Shentun.Peis.PlugIns.Gem
                     tjNum = pacsRequest.CheckRequestNo,
                     organizeCode = "1",
                     patientType = "3",
-                    //requestId = pacsRequest.CheckRequestNo,
-                    beginTime = beginTime.ToString("yyyy-MM-dd HH:mm:ss"),
+                    ////requestId = pacsRequest.CheckRequestNo,
+                    //beginTime = beginTime.ToString("yyyy-MM-dd HH:mm:ss"),
+                    //endTime=DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
                     pageNo = 1,
                     pageSize = 20
                 };
@@ -66,7 +67,7 @@ namespace Shentun.Peis.PlugIns.Gem
                 {
                     CheckRequestNo = pacsRequest.CheckRequestNo,
                     PatientName = pacsRequest.PatientName,
-                    Result = firstData.examDescript,
+                    Result = string.IsNullOrEmpty(firstData.examDescript) ? firstData.examDiagnosis : "",
                     Summary = firstData.examDiagnosis,
                     Suggestion = firstData.suggestion,
                     CheckDate = checkDate,
@@ -86,6 +87,7 @@ namespace Shentun.Peis.PlugIns.Gem
                     }
                 };
 
+
                 var callResult = await CallAppServiceAsync<CreateImportPacsResultDto, object>("api/app/ImportPacsResult/ImportResult", createImportPacsResultDto);
 
             }
diff --git a/src/Shentun.Peis.HttpApi.Host/PeisHttpApiHostModule.cs b/src/Shentun.Peis.HttpApi.Host/PeisHttpApiHostModule.cs
index 7c8f86e..a928ca1 100644
--- a/src/Shentun.Peis.HttpApi.Host/PeisHttpApiHostModule.cs
+++ b/src/Shentun.Peis.HttpApi.Host/PeisHttpApiHostModule.cs
@@ -118,7 +118,7 @@ public class PeisHttpApiHostModule : AbpModule
         ConfigureSwaggerServices(context, configuration);
 
         ConfigureJsonOptions();  //全局配置api返回值中的日期默认格式
-       
+
         //context.Services.AddControllers().AddJsonOptions(configure =>
         //{
         //    configure.JsonSerializerOptions.Converters.Add(new DateTimeJsonConverter());
@@ -227,7 +227,7 @@ public class PeisHttpApiHostModule : AbpModule
     /// </summary>
     private void ConfigureJsonOptions()
     {
-       
+
         //context.Services.AddControllers().AddJsonOptions(options =>
         //{
         //    options.JsonSerializerOptions.Encoder = JavaScriptEncoder.Create(UnicodeRanges.All);
@@ -627,19 +627,19 @@ public class PeisHttpApiHostModule : AbpModule
                     {
                         if (thirdInterfaceDto.ThirdInterfaceType == "02")
                         {
-                            RecurringJob.AddOrUpdate<IChargeRequestInterfaceQueryWorker>("收费接口", o => o.DoWork(thirdInterfaceDto.Id), corn, TimeZoneInfo.Local);
+                            RecurringJob.AddOrUpdate<IChargeRequestInterfaceQueryWorker>(thirdInterfaceDto.DisplayName, o => o.DoWork(thirdInterfaceDto.Id), corn, TimeZoneInfo.Local);
                         }
                         else if (thirdInterfaceDto.ThirdInterfaceType == "03")
                         {
-                            RecurringJob.AddOrUpdate<IImportLisResultInterfaceWorker>("导入检验结果接口", o => o.DoWork(thirdInterfaceDto.Id), corn, TimeZoneInfo.Local);
+                            RecurringJob.AddOrUpdate<IImportLisResultInterfaceWorker>(thirdInterfaceDto.DisplayName, o => o.DoWork(thirdInterfaceDto.Id), corn, TimeZoneInfo.Local);
                         }
                         else if (thirdInterfaceDto.ThirdInterfaceType == "04")
                         {
-                            RecurringJob.AddOrUpdate<IImportPacsResultInterfaceWorker>("导入Pacs结果接口", o => o.DoWork(thirdInterfaceDto.Id), corn, TimeZoneInfo.Local);
+                            RecurringJob.AddOrUpdate<IImportPacsResultInterfaceWorker>(thirdInterfaceDto.DisplayName, o => o.DoWork(thirdInterfaceDto.Id), corn, TimeZoneInfo.Local);
                         }
                         else if (thirdInterfaceDto.ThirdInterfaceType == "05")
                         {
-                            RecurringJob.AddOrUpdate<IImportPatientRegisterInterfaceWorker>("导入人员登记信息结果接口", o => o.DoWork(thirdInterfaceDto.Id), corn, TimeZoneInfo.Local);
+                            RecurringJob.AddOrUpdate<IImportPatientRegisterInterfaceWorker>(thirdInterfaceDto.DisplayName, o => o.DoWork(thirdInterfaceDto.Id), corn, TimeZoneInfo.Local);
                         }
                     }
                 }