导入结果

ThirdPlugIns/Shentun.Peis.PlugIns.Gem/ImportLisResultPlugInsGem.cs

@@ -11,9 +11,9 @@ namespace Shentun.Peis.PlugIns.Gem
         public ImportLisResultPlugInsGem(string parmValue) : base(parmValue)
         {
         }
-        public override Task<ImportLisResultPlugInsOut> ImportResultAsync(ImportLisResultPlugInsInput input)
+        public override Task<ImportLisResultPlugInsOut> ImportResultByPatientRegisterIdAsync(Guid patientRegisterId)
         {
-            return base.ImportResultAsync(input);
+            return base.ImportResultByPatientRegisterIdAsync(patientRegisterId);
         }
     }
 }

ThirdPlugIns/Shentun.Peis.PlugIns.Gem/ImportPacsResultPlugInsGem.cs

@@ -19,13 +19,13 @@ namespace Shentun.Peis.PlugIns.Gem
         {
         }
 
-        public override async Task<ImportPacsResultPlugInsOut> ImportResultAsync(ImportPacsResultPlugInsInput input)
+        public override async Task<ImportPacsResultPlugInsOut> ImportResultByPatientRegisterIdAsync(Guid patientRegisterId)
         {
             //if (DepartmentColumnReferenceId == null || DepartmentColumnReferenceId == Guid.Empty)
             //{
             //    throw new Exception("没有设置科室编码对照");
             //}
-            var pacsRequests = await GetPacsRequestForImportResultPlugInssAsync(input.PatientRegisterId);
+            var pacsRequests = await GetPacsRequestForImportResultPlugInssAsync(patientRegisterId);
 
             var beginTime = DateTime.Now.Date.AddDays(-30);
             foreach (var pacsRequest in pacsRequests)

ThirdPlugIns/Shentun.Peis.PlugIns.Gem/test/Shentun.Peis.PlugIns.Gem.Test/ImportPacsResultPlugInsGemTest.cs

@@ -1,4 +1,5 @@
-using Shentun.Utilities;
+using Shentun.Peis.ImportPacsResults;
+using Shentun.Utilities;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -26,11 +27,67 @@ namespace Shentun.Peis.PlugIns.Gem.Test
 
             var input = new ImportPacsResultPlugInsGem(configParm);
             var loginResult = input.LoginAsync().Result;
-            var item = await input.ImportResultAsync(
-                new ImportPacsResultPlugInsInput()
-                {
-                    PatientRegisterId = new Guid("3a127c60-cadf-0308-04c7-8f32a50181d8")
-                });
+            var item = await input.ImportResultByPatientRegisterIdAsync(new Guid("3a127c60-cadf-0308-04c7-8f32a50181d8"));
+
+
+        }
+
+        [Fact]
+        public async Task ImportResultCallAppServiceAsync()
+        {
+            string configParm;
+            string filePath = DirectoryHelper.GetAppDirectory() + "/appsettings.json";
+            configParm = File.ReadAllText(filePath);
+
+            var input = new ImportPacsResultPlugInsGem(configParm);
+            var loginResult = input.LoginAsync().Result;
+            var createImportPacsResultDto = new CreateImportPacsResultDto()
+            {
+                CheckRequestNo = "2405140365",
+                PatientName = "李湘",
+                Result = "Pacs检查所见",
+                Summary = "Pacs结论",
+                Suggestion = "Pacs建议",
+                CheckDate = DateTime.Now,
+                CheckDoctorName = "张医生",
+                Files = new List<CreateImportPacsResultPictureDto>()
+                    {
+                        new CreateImportPacsResultPictureDto()
+                        {
+                            IsPrint = 'Y',
+                            FileName = Guid.NewGuid().ToString(),
+                            FileFormat = "0",
+                            FileTransMode = "0",
+                            FileBase64 = Shentun.Utilities.FileHelper.ToBase64("E:\\Whitedolphins\\prog20220722\\pic\\login.png")
+                        },
+                         new CreateImportPacsResultPictureDto()
+                        {
+                            IsPrint = 'Y',
+                            FileFormat = "0",
+                            FileTransMode = "0",
+                            FileName = Guid.NewGuid().ToString(),
+                            FileBase64 = Shentun.Utilities.FileHelper.ToBase64("E:\\Whitedolphins\\prog20220722\\pic\\首页背景图.jpg")
+                        },
+                        //  new CreateImportPacsResultPictureDto()
+                        //{
+                        //    IsPrint = 'Y',
+                        //    FileFormat = "1",
+                        //    FileTransMode = "0",
+
+                        //    FileName = "http://10.1.13.18:8380//image/66389af146ac4b27f4da93ff/risPdf/3135.pdf",
+                        //    FileUrl = "http://10.1.13.18:8380//image/66389af146ac4b27f4da93ff/risPdf/3135.pdf",
+                        //    FileBase64 = Shentun.Utilities.FileHelper.ToBase64("http://10.1.13.18:8380//image/66389af146ac4b27f4da93ff/risPdf/3135.pdf")
+                        //},
+                    }
+            };
+
+            var callResult = await input.CallAppServiceAsync<CreateImportPacsResultDto, object>("api/app/ImportPacsResult/ImportResult", createImportPacsResultDto);
+
+            //var item = await input.ImportResultAsync(
+            //    new ImportPacsResultPlugInsInput()
+            //    {
+            //        PatientRegisterId = new Guid("3a127c60-cadf-0308-04c7-8f32a50181d8")
+            //    });
 
 
         }

src/Shentun.ColumnReferencePlugIns/ImportLisResultPlugInsBase.cs

@@ -22,7 +22,7 @@ namespace Shentun.Peis.PlugIns
             //AppLisPassword = AppConfig.GetSection("App")
             //  .GetSection("LisPassword").Value;
         }
-        public virtual async Task<ImportLisResultPlugInsOut> ImportResultAsync(ImportLisResultPlugInsInput input)
+        public virtual async Task<ImportLisResultPlugInsOut> ImportResultByPatientRegisterIdAsync(Guid patientRegisterId)
         {
             var result = new ImportLisResultPlugInsOut();
             return result;
@@ -91,10 +91,7 @@ ORDER BY register_check.patient_register_id
             {
                 try
                 {
-                  var result =  ImportResultAsync(new ImportLisResultPlugInsInput()
-                    {
-                        PatientRegisterId = patientRegister.PatientRegisterId,
-                    }).Result;
+                  var result =  ImportResultByPatientRegisterIdAsync(patientRegister.PatientRegisterId).Result;
                 }
                 catch (Exception ex)
                 {

src/Shentun.ColumnReferencePlugIns/ImportLisResultPlugInsDbBase.cs

@@ -26,7 +26,7 @@ namespace Shentun.Peis.PlugIns
         {
         }
 
-        public override async Task<ImportLisResultPlugInsOut> ImportResultAsync(ImportLisResultPlugInsInput input)
+        public override async Task<ImportLisResultPlugInsOut> ImportResultByPatientRegisterIdAsync(Guid patientRegisterId)
         {
             if (ItemColumnReferenceId == null || ItemColumnReferenceId == Guid.Empty)
             {
@@ -42,7 +42,7 @@ namespace Shentun.Peis.PlugIns
             {
                 throw new Exception("执行科室配置不是有效的GUID值");
             }
-            var lisRequests = await GetLisRequestForImportResultPlugInssAsync(input.PatientRegisterId);
+            var lisRequests = await GetLisRequestForImportResultPlugInssAsync(patientRegisterId);
             using (DbConnection conn = CreateInterfaceDbConnect())
             {
 

src/Shentun.ColumnReferencePlugIns/ImportPacsResultPlugInsBase.cs

@@ -15,7 +15,7 @@ namespace Shentun.Peis.PlugIns
         {
         }
 
-        public virtual async Task<ImportPacsResultPlugInsOut> ImportResultAsync(ImportPacsResultPlugInsInput input)
+        public virtual async Task<ImportPacsResultPlugInsOut> ImportResultByPatientRegisterIdAsync(Guid patientRegisterId)
         {
             var result = new ImportPacsResultPlugInsOut();
             return result;
@@ -96,10 +96,7 @@ ORDER BY register_check.patient_register_id
             {
                 try
                 {
-                    var result = ImportResultAsync(new ImportPacsResultPlugInsInput()
-                    {
-                        PatientRegisterId = patientRegister.PatientRegisterId,
-                    }).Result;
+                    var result = ImportResultByPatientRegisterIdAsync(patientRegister.PatientRegisterId).Result;
                 }
                 catch (Exception ex)
                 {

test/Shentun.Peis.ColumnReference.Tests/ImportLisResultPlugInsTest.cs

@@ -25,11 +25,7 @@ namespace Shentun.Peis.PlugIns.Tests
             configParm = File.ReadAllText(filePath);
 
             var input = new ImportLisResultPlugInsDbBase(configParm);
-            var item = await input.ImportResultAsync(
-                new ImportLisResultPlugInsInput()
-                {
-                    PatientRegisterId = new Guid("3a126d1d-6974-a1c5-0e98-30241c2e5243")
-                });
+            var item = await input.ImportResultByPatientRegisterIdAsync(new Guid("3a126d1d-6974-a1c5-0e98-30241c2e5243"));
             
 
         }