插件

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

@@ -3,6 +3,7 @@ using log4net.Repository.Hierarchy;
 using Npgsql;
 using ServiceReferenceHzcyHis;
 using Shentun.Peis.Enums;
+using Shentun.Peis.PlugIns.ChargeRequests;
 using System;
 using System.Collections.Generic;
 using System.Data.Common;

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

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Shentun.Peis.PlugIns.ImportLisResults;
 
 namespace Shentun.Peis.PlugIns.Gem
 {

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

@@ -10,6 +10,7 @@ using Shentun.Peis.ImportPacsResults;
 using NPOI.SS.Formula.Functions;
 using Shentun.Peis.ImportLisResults;
 using System.Security.Policy;
+using Shentun.Peis.PlugIns.ImportPacsResults;
 
 namespace Shentun.Peis.PlugIns.Gem
 {

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

@@ -1,6 +1,7 @@
 using Dapper;
 using Npgsql;
 using NPOI.SS.Formula.Functions;
+using Shentun.Peis.PlugIns.LisRequests;
 using System;
 using System.Collections.Generic;
 using System.Data.Common;

src/Shentun.ColumnReferencePlugIns/ChargeRequestAsbitemForPlugIns.cs → src/Shentun.ColumnReferencePlugIns/ChargeRequests/ChargeRequestAsbitemForPlugIns.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Shentun.Peis.PlugIns
+namespace Shentun.Peis.PlugIns.ChargeRequests
 {
     public class ChargeRequestAsbitemForPlugIns
     {

src/Shentun.ColumnReferencePlugIns/ChargeRequestForPlugIns.cs → src/Shentun.ColumnReferencePlugIns/ChargeRequests/ChargeRequestForPlugIns.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Shentun.Peis.PlugIns
+namespace Shentun.Peis.PlugIns.ChargeRequests
 {
     public class ChargeRequestForPlugIns
     {
@@ -29,6 +29,6 @@ namespace Shentun.Peis.PlugIns
 
         public string ConcurrencyStamp { get; set; }
 
-        public List<ChargeRequestAsbitemForPlugIns> Asbitems = new List<ChargeRequestAsbitemForPlugIns> ();
+        public List<ChargeRequestAsbitemForPlugIns> Asbitems = new List<ChargeRequestAsbitemForPlugIns>();
     }
 }

src/Shentun.ColumnReferencePlugIns/ChargeRequestPlugInsBase.cs → src/Shentun.ColumnReferencePlugIns/ChargeRequests/ChargeRequestPlugInsBase.cs

@@ -8,7 +8,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Shentun.Peis.PlugIns
+namespace Shentun.Peis.PlugIns.ChargeRequests
 {
     public class ChargeRequestPlugInsBase : ThirdPlugInsBase
     {
@@ -171,11 +171,13 @@ where patient.id = patient_register.patient_id and
                         @" where  id = @ChargeRequestId and concurrency_stamp = @ConcurrencyStamp		
                       ";
                 await conn.ExecuteAsync(sql,
-                  new { ChargeRequestId = chargeRequestForPlugIns.ChargeRequestId,
-                        ConcurrencyStamp = chargeRequestForPlugIns.ConcurrencyStamp
+                  new
+                  {
+                      chargeRequestForPlugIns.ChargeRequestId,
+                      chargeRequestForPlugIns.ConcurrencyStamp
                   });
 
-                foreach(var chargeRequestAsbitem in chargeRequestForPlugIns.Asbitems)
+                foreach (var chargeRequestAsbitem in chargeRequestForPlugIns.Asbitems)
                 {
                     if (chargeRequestFlag == ChargeRequestFlag.AlreadyCharge)
                     {
@@ -183,8 +185,10 @@ where patient.id = patient_register.patient_id and
                           where  charge_request_id = @ChargeRequestId and concurrency_stamp = @ConcurrencyStamp	
                       ";
                         await conn.ExecuteAsync(sql,
-                           new { ChargeRequestId = chargeRequestForPlugIns.ChargeRequestId,
-                               ConcurrencyStamp = chargeRequestAsbitem.ConcurrencyStamp
+                           new
+                           {
+                               chargeRequestForPlugIns.ChargeRequestId,
+                               chargeRequestAsbitem.ConcurrencyStamp
                            });
                     }
                     else if (chargeRequestFlag == ChargeRequestFlag.AlreadyRefund)
@@ -195,12 +199,12 @@ where patient.id = patient_register.patient_id and
                         await conn.ExecuteAsync(sql,
                            new
                            {
-                               ChargeRequestId = chargeRequestForPlugIns.ChargeRequestId,
-                               ConcurrencyStamp = chargeRequestAsbitem.ConcurrencyStamp
+                               chargeRequestForPlugIns.ChargeRequestId,
+                               chargeRequestAsbitem.ConcurrencyStamp
                            });
                     }
                 }
-               
+
 
 
 

src/Shentun.ColumnReferencePlugIns/ColumnReferencePlugIns.cs → src/Shentun.ColumnReferencePlugIns/ColumnReferences/ColumnReferencePlugIns.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Shentun.Peis.PlugIns
+namespace Shentun.Peis.PlugIns.ColumnReferences
 {
     interface IColumnReferencePlugIns
     {
@@ -29,7 +29,7 @@ namespace Shentun.Peis.PlugIns
         public string FilterCodeValue { get; set; }
         public int DisplayOrder { get; set; }
     }
-    
+
     public class ColumnReferenceFilterCodeValue
     {
         public string CodeValue { get; set; }
@@ -46,7 +46,7 @@ namespace Shentun.Peis.PlugIns
         public string Exter3 { get; set; }
         public string Exter4 { get; set; }
         public string Exter5 { get; set; }
-       
+
     }
     public class ColumnReferenceColumn
     {

src/Shentun.ColumnReferencePlugIns/ColumnReferencePlugInsBase.cs → src/Shentun.ColumnReferencePlugIns/ColumnReferences/ColumnReferencePlugInsBase.cs

@@ -10,19 +10,19 @@ using Dapper;
 using Microsoft.Extensions.Configuration;
 using Npgsql;
 using Shentun.Utilities;
-namespace Shentun.Peis.PlugIns
+namespace Shentun.Peis.PlugIns.ColumnReferences
 {
 
-    public class ColumnReferencePlugInsBase : PlugInsBase,IColumnReferencePlugIns
+    public class ColumnReferencePlugInsBase : PlugInsBase, IColumnReferencePlugIns
     {
-        
+
         protected string AppSql;
         private List<ColumnReferenceColumn> _columns;
         private List<ColumnReferenceColumn> _interfaceColumns;
 
-        public ColumnReferencePlugInsBase(string parmValue):base(parmValue)
+        public ColumnReferencePlugInsBase(string parmValue) : base(parmValue)
         {
-       
+
             AppSql = InterfaceConfig.GetSection("App").GetSection("Sql").Value;
             var columns = InterfaceConfig.GetSection("App").GetSection("Columns").Value;
             string[]? columnArry;
@@ -44,10 +44,10 @@ namespace Shentun.Peis.PlugIns
                     }
                 }
             }
-            
+
 
             columns = InterfaceConfig.GetSection("Interface").GetSection("Columns").Value;
-            if(columns != null)
+            if (columns != null)
             {
                 columns = columns.Replace("，", ",");
                 columnArry = columns.Split(',');
@@ -65,7 +65,7 @@ namespace Shentun.Peis.PlugIns
                     }
                 }
             }
-            
+
         }
         public virtual List<ColumnReferenceColumn> GetAppColumns()
         {
@@ -83,7 +83,7 @@ namespace Shentun.Peis.PlugIns
                         Column = "DisplayName",
                         Name = "名称"
                     }
-                
+
                 };
             }
             return _columns;

src/Shentun.ColumnReferencePlugIns/ColumnReferencePlugInsDbBase.cs → src/Shentun.ColumnReferencePlugIns/ColumnReferences/ColumnReferencePlugInsDbBase.cs

@@ -10,22 +10,22 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Shentun.Peis.PlugIns
+namespace Shentun.Peis.PlugIns.ColumnReferences
 {
-    public class ColumnReferencePlugInsDbBase: ColumnReferencePlugInsBase
+    public class ColumnReferencePlugInsDbBase : ColumnReferencePlugInsBase
     {
-       
-        public ColumnReferencePlugInsDbBase(string parmValue):base(parmValue)
+
+        public ColumnReferencePlugInsDbBase(string parmValue) : base(parmValue)
         {
             InterfaceSql = InterfaceConfig.GetSection("Interface").GetSection("Sql").Value;
             InterfaceDbType = InterfaceConfig.GetSection("Interface").GetSection("DbType").Value;
             InterfaceConnctionStr = InterfaceConfig.GetSection("Interface").GetSection("ConnectionStrings").Value;
         }
-       
+
 
         public override async Task<List<ColumnReferenceCodeValue>> GetInterfaceCodeValuesAsync()
         {
-            using (DbConnection conn =  CreateInterfaceDbConnect())
+            using (DbConnection conn = CreateInterfaceDbConnect())
             {
                 var list = (await conn.QueryAsync<ColumnReferenceCodeValue>(InterfaceSql)).ToList();
                 foreach (var item in list)

src/Shentun.ColumnReferencePlugIns/ImportLisResultPlugInsBase.cs → src/Shentun.ColumnReferencePlugIns/ImportLisResults/ImportLisResultPlugInsBase.cs

@@ -1,5 +1,6 @@
 using Dapper;
 using Npgsql;
+using Shentun.Peis.PlugIns.LisRequests;
 using System;
 using System.Collections.Generic;
 using System.Data.Common;
@@ -7,20 +8,20 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Shentun.Peis.PlugIns
+namespace Shentun.Peis.PlugIns.ImportLisResults
 {
     public class ImportLisResultPlugInsBase : ThirdPlugInsBase
     {
         public ImportLisResultPlugInsBase(Guid thirdInterfaceId) : base(thirdInterfaceId)
         {
-            
+
         }
 
         //protected string AppLisUser;
         //protected string AppLisPassword;
         public ImportLisResultPlugInsBase(string parmValue) : base(parmValue)
         {
-           
+
             //AppLisUser = AppConfig.GetSection("App")
             //   .GetSection("LisUser").Value;
             //AppLisPassword = AppConfig.GetSection("App")
@@ -47,7 +48,7 @@ namespace Shentun.Peis.PlugIns
  where patient_register.id = @PatientRegisterId
                       ";
                 var lisRequestForImportResultPlugInss = (await conn.QueryAsync<LisRequestForImportResultPlugIns>(sql,
-                    new { PatientRegisterId  = patientRegisterId })).ToList();
+                    new { PatientRegisterId = patientRegisterId })).ToList();
                 return lisRequestForImportResultPlugInss;
             }
         }
@@ -71,14 +72,14 @@ lis_request.creation_time > @StartDate
 ORDER BY register_check.patient_register_id
                       ";
                 var patientRegisterForLisRequests = (await conn.QueryAsync<PatientRegisterForLisRequest>(sql,
-                    new { MedicalCenterId = _thirdInterfaceDto.MedicalCenterId, StartDate = startDate })).ToList();
+                    new { _thirdInterfaceDto.MedicalCenterId, StartDate = startDate })).ToList();
 
                 return patientRegisterForLisRequests;
             }
 
         }
 
-        public override  Task DoWork()
+        public override Task DoWork()
         {
             //var loginResult =  LoginAsync().Result;
             var queryDaysStr = InterfaceConfig.GetSection("Interface").GetSection("Scheduler").GetSection("QueryDays").Value;
@@ -96,15 +97,15 @@ ORDER BY register_check.patient_register_id
             {
                 try
                 {
-                  var result =  ImportResultByPatientRegisterIdAsync(patientRegister.PatientRegisterId).Result;
+                    var result = ImportResultByPatientRegisterIdAsync(patientRegister.PatientRegisterId).Result;
                 }
                 catch (Exception ex)
                 {
 
                 }
-              
+
             }
-            return Task.CompletedTask ;
+            return Task.CompletedTask;
         }
 
         //protected async override Task<LoginOutDto> LoginAsync() 

src/Shentun.ColumnReferencePlugIns/ImportLisResultPlugInsDbBase.cs → src/Shentun.ColumnReferencePlugIns/ImportLisResults/ImportLisResultPlugInsDbBase.cs

@@ -17,7 +17,7 @@ using System.Security.Policy;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Shentun.Peis.PlugIns
+namespace Shentun.Peis.PlugIns.ImportLisResults
 {
     public class ImportLisResultPlugInsDbBase : ImportLisResultPlugInsBase
     {
@@ -68,7 +68,7 @@ namespace Shentun.Peis.PlugIns
                     {
                         foreach (var lisResult in lisResultFromInterfaces)
                         {
-                            if(string.IsNullOrWhiteSpace(lisResult.Result))
+                            if (string.IsNullOrWhiteSpace(lisResult.Result))
                             {
                                 continue;
                             }
@@ -85,7 +85,7 @@ namespace Shentun.Peis.PlugIns
                             {
                                 throw new Exception("检验医生不能为空");
                             }
-                           
+
                             //if(lisResult.ItemId == "435")
                             //{
                             //    ;
@@ -95,7 +95,7 @@ namespace Shentun.Peis.PlugIns
                             {
                                 //throw new Exception($"LIS系统中项目名：{lisResult.ItemName} 编码:{lisResult.ItemId}没有与体检系统对照编码");
                                 continue;
-                                
+
                             }
                             foreach (var columnReferenceCode in columnReferenceCodes)
                             {
@@ -133,7 +133,7 @@ namespace Shentun.Peis.PlugIns
                             continue;
                         }
 
-                       var callResult = await CallAppServiceAsync<List<CreateImportLisResultDto>, object>("api/app/ImportLisResult/ImportResult", createImportLisResultDtos);
+                        var callResult = await CallAppServiceAsync<List<CreateImportLisResultDto>, object>("api/app/ImportLisResult/ImportResult", createImportLisResultDtos);
                     }
                     catch (Exception ex)
                     {

src/Shentun.ColumnReferencePlugIns/ImportLisResultPlugInsInput.cs → src/Shentun.ColumnReferencePlugIns/ImportLisResults/ImportLisResultPlugInsInput.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Shentun.Peis.PlugIns
+namespace Shentun.Peis.PlugIns.ImportLisResults
 {
     public class ImportLisResultPlugInsInput
     {

src/Shentun.ColumnReferencePlugIns/ImportLisResultPlugInsOut.cs → src/Shentun.ColumnReferencePlugIns/ImportLisResults/ImportLisResultPlugInsOut.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Shentun.Peis.PlugIns
+namespace Shentun.Peis.PlugIns.ImportLisResults
 {
     public class ImportLisResultPlugInsOut
     {

src/Shentun.ColumnReferencePlugIns/LisResultFromImportInterface.cs → src/Shentun.ColumnReferencePlugIns/ImportLisResults/LisResultFromImportInterface.cs

@@ -6,11 +6,11 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Shentun.Peis.PlugIns
+namespace Shentun.Peis.PlugIns.ImportLisResults
 {
     public class LisResultFromImportInterface
     {
-        public string LisRequestNo {  get; set; }
+        public string LisRequestNo { get; set; }
         /// 项目编号
         /// </summary>
         public string ItemId { get; set; }
@@ -26,27 +26,27 @@ namespace Shentun.Peis.PlugIns
         /// <summary>
         /// 单位
         /// </summary>
-      
+
         public string? Unit { get; set; }
         /// <summary>
         /// 参考范围
         /// </summary>
-        
+
         public string? ReferenceRangeValue { get; set; }
         /// <summary>
         /// 危急值范围
         /// </summary>
-       
+
         public string? CriticalRangeValue { get; set; }
         /// <summary>
         /// 危急值
         /// </summary>
-       
+
         public string? CriticalValue { get; set; }
         /// <summary>
         /// 报告单状态
         /// </summary>
-       
+
         public string? ResultStatusId { get; set; } = "01";//01-正常
         /// <summary>
         /// 报告单提示
@@ -60,7 +60,7 @@ namespace Shentun.Peis.PlugIns
         /// <summary>
         /// 检查日期
         /// </summary>
-       
+
         public DateTime? CheckDate { get; set; }
 
         public Guid ExecOrganizationUnitId { get; set; }

src/Shentun.ColumnReferencePlugIns/ImportPacsResultPlugIns.cs → src/Shentun.ColumnReferencePlugIns/ImportPacsResults/ImportPacsResultPlugIns.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Shentun.Peis.PlugIns
+namespace Shentun.Peis.PlugIns.ImportPacsResults
 {
     internal class ImportPacsResultPlugIns
     {

src/Shentun.ColumnReferencePlugIns/ImportPacsResultPlugInsBase.cs → src/Shentun.ColumnReferencePlugIns/ImportPacsResults/ImportPacsResultPlugInsBase.cs

@@ -1,5 +1,6 @@
 using Dapper;
 using Npgsql;
+using Shentun.Peis.PlugIns.LisRequests;
 using Shentun.Peis.ThirdInterfaces;
 using System;
 using System.Collections.Generic;
@@ -8,12 +9,12 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Shentun.Peis.PlugIns
+namespace Shentun.Peis.PlugIns.ImportPacsResults
 {
     public class ImportPacsResultPlugInsBase : ThirdPlugInsBase
     {
-        public ImportPacsResultPlugInsBase(Guid thirdInterfaceId) : base(thirdInterfaceId) 
-        { 
+        public ImportPacsResultPlugInsBase(Guid thirdInterfaceId) : base(thirdInterfaceId)
+        {
         }
         public ImportPacsResultPlugInsBase(string parmValue) : base(parmValue)
         {
@@ -75,7 +76,7 @@ where
 ORDER BY register_check.patient_register_id
                       ";
                 var patientRegisterForLisRequests = (await conn.QueryAsync<PatientRegisterForLisRequest>(sql,
-                    new { MedicalCenterId = _thirdInterfaceDto.MedicalCenterId, StartDate = startDate })).ToList();
+                    new { _thirdInterfaceDto.MedicalCenterId, StartDate = startDate })).ToList();
 
                 return patientRegisterForLisRequests;
             }

src/Shentun.ColumnReferencePlugIns/ImportPacsResultPlugInsInput.cs → src/Shentun.ColumnReferencePlugIns/ImportPacsResults/ImportPacsResultPlugInsInput.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Shentun.Peis.PlugIns
+namespace Shentun.Peis.PlugIns.ImportPacsResults
 {
     public class ImportPacsResultPlugInsInput
     {

src/Shentun.ColumnReferencePlugIns/ImportPacsResultPlugInsOut.cs → src/Shentun.ColumnReferencePlugIns/ImportPacsResults/ImportPacsResultPlugInsOut.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Shentun.Peis.PlugIns
+namespace Shentun.Peis.PlugIns.ImportPacsResults
 {
     public class ImportPacsResultPlugInsOut
     {

src/Shentun.ColumnReferencePlugIns/PacsRequestForImportResultPlugIns.cs → src/Shentun.ColumnReferencePlugIns/ImportPacsResults/PacsRequestForImportResultPlugIns.cs

@@ -4,13 +4,13 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Shentun.Peis.PlugIns
+namespace Shentun.Peis.PlugIns.ImportPacsResults
 {
     public class PacsRequestForImportResultPlugIns
     {
         public string PatientRegisterNo { get; set; }
         public string PatientName { get; set; }
         public Guid RegisterCheckId { get; set; }
-        public string CheckRequestNo { get; set;}
+        public string CheckRequestNo { get; set; }
     }
 }

src/Shentun.ColumnReferencePlugIns/LisRequestAsbitemForPlugIns.cs → src/Shentun.ColumnReferencePlugIns/LisRequests/LisRequestAsbitemForPlugIns.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Shentun.Peis.PlugIns
+namespace Shentun.Peis.PlugIns.LisRequests
 {
     public class LisRequestAsbitemForPlugIns
     {

src/Shentun.ColumnReferencePlugIns/LisRequestForImportResultPlugIns.cs → src/Shentun.ColumnReferencePlugIns/LisRequests/LisRequestForImportResultPlugIns.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Shentun.Peis.PlugIns
+namespace Shentun.Peis.PlugIns.LisRequests
 {
     public class LisRequestForImportResultPlugIns
     {

src/Shentun.ColumnReferencePlugIns/LisRequestForPlugIns.cs → src/Shentun.ColumnReferencePlugIns/LisRequests/LisRequestForPlugIns.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Shentun.Peis.PlugIns
+namespace Shentun.Peis.PlugIns.LisRequests
 {
     public class LisRequestForPlugIns
     {
@@ -12,13 +12,13 @@ namespace Shentun.Peis.PlugIns
         /// LisRequest的ID
         /// </summary>
         public Guid LisRequestId { get; set; }
-    
+
 
         /// <summary>
         /// 检验申请单号
         /// </summary>
         public string LisRequestNo { get; set; }
-      
+
         /// <summary>
         /// 是否已打印
         /// </summary>
@@ -64,7 +64,7 @@ namespace Shentun.Peis.PlugIns
         /// </summary>
         public string AsbitemNames { get; set; }
 
-       
+
         public List<LisRequestAsbitemForPlugIns> Asbitems { get; set; } = new List<LisRequestAsbitemForPlugIns>();
     }
 }

src/Shentun.ColumnReferencePlugIns/LisRequestPlugInsBase.cs → src/Shentun.ColumnReferencePlugIns/LisRequests/LisRequestPlugInsBase.cs

@@ -9,14 +9,14 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Shentun.Peis.PlugIns
+namespace Shentun.Peis.PlugIns.LisRequests
 {
     public class LisRequestPlugInsBase : ThirdPlugInsBase
     {
         protected Guid AsbitemColumnReferenceId;
         protected Guid SampleTypeColumnReferenceId;
 
-        public LisRequestPlugInsBase(Guid thirdInterfaceId):base(thirdInterfaceId)
+        public LisRequestPlugInsBase(Guid thirdInterfaceId) : base(thirdInterfaceId)
         {
             var asbitemColumnReferenceIdStr = InterfaceConfig.GetSection("Interface").GetSection("AsbitemColumnReferenceId").Value;
             if (!string.IsNullOrWhiteSpace(asbitemColumnReferenceIdStr))
@@ -32,10 +32,10 @@ namespace Shentun.Peis.PlugIns
 
         public LisRequestPlugInsBase(string parmValue) : base(parmValue)
         {
-           
+
 
             var asbitemColumnReferenceIdStr = InterfaceConfig.GetSection("Interface").GetSection("AsbitemColumnReferenceId").Value;
-            if(!string.IsNullOrWhiteSpace(asbitemColumnReferenceIdStr))
+            if (!string.IsNullOrWhiteSpace(asbitemColumnReferenceIdStr))
             {
                 AsbitemColumnReferenceId = new Guid(asbitemColumnReferenceIdStr);
             }
@@ -46,7 +46,7 @@ namespace Shentun.Peis.PlugIns
             }
 
         }
-        
+
         public virtual async Task<LisRequestPlugInsOut> SendRequestAsync(LisRequestPlugInsInput input)
         {
             var result = new LisRequestPlugInsOut();
@@ -134,7 +134,7 @@ where patient.id = patient_register.patient_id and
                where 
                 lis_request.id=@LisRequestId 
                 ";
-               
+
                 lisRequestForPlugIns.Asbitems = (await conn.QueryAsync<LisRequestAsbitemForPlugIns>(sql,
                    new { LisRequestId = lisRequestId })).ToList();
 

src/Shentun.ColumnReferencePlugIns/PatientRegisterForLisRequest.cs → src/Shentun.ColumnReferencePlugIns/LisRequests/PatientRegisterForLisRequest.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Shentun.Peis.PlugIns
+namespace Shentun.Peis.PlugIns.LisRequests
 {
     public class PatientRegisterForLisRequest
     {

src/Shentun.ColumnReferencePlugIns/ThirdPlugInsBase.cs

@@ -1,6 +1,7 @@
 using Dapper;
 using Microsoft.Extensions.Configuration;
 using Npgsql;
+using Shentun.Peis.PlugIns.ColumnReferences;
 using Shentun.Peis.ThirdInterfaces;
 using Shentun.Utilities;
 using System;

src/Shentun.ColumnReferencePlugIns/WebAppointPatientRegisterIdInput.cs → src/Shentun.ColumnReferencePlugIns/WebAppoints/WebAppointPatientRegisterIdInput.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Shentun.Peis.PlugIns
+namespace Shentun.Peis.PlugIns.WebAppoints
 {
     public class WebAppointPatientRegisterIdInput
     {

src/Shentun.ColumnReferencePlugIns/WebAppointPatientRegisterInput.cs → src/Shentun.ColumnReferencePlugIns/WebAppoints/WebAppointPatientRegisterInput.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Shentun.Peis.PlugIns
+namespace Shentun.Peis.PlugIns.WebAppoints
 {
     public class WebAppointPatientRegisterInput
     {

src/Shentun.ColumnReferencePlugIns/WebAppointPlugInsBase.cs → src/Shentun.ColumnReferencePlugIns/WebAppoints/WebAppointPlugInsBase.cs

@@ -9,7 +9,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Shentun.Peis.PlugIns
+namespace Shentun.Peis.PlugIns.WebAppoints
 {
     public class WebAppointPlugInsBase : ThirdPlugInsBase
     {

src/Shentun.ColumnReferencePlugIns/WebAppointWebPeisPlugIns.cs → src/Shentun.ColumnReferencePlugIns/WebAppoints/WebAppointWebPeisPlugIns.cs

@@ -13,7 +13,7 @@ using System.Net.Http.Headers;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace Shentun.Peis.PlugIns
+namespace Shentun.Peis.PlugIns.WebAppoints
 {
     public class WebAppointWebPeisPlugIns : WebAppointPlugInsBase
     {
@@ -27,7 +27,7 @@ namespace Shentun.Peis.PlugIns
         public WebAppointWebPeisPlugIns(Guid thirdInterfaceId) : base(thirdInterfaceId)
         {
             var configurationBuilder = new ConfigurationBuilder()
-          .AddJsonStream(new MemoryStream(System.Text.Encoding.UTF8.GetBytes(_thirdInterfaceDto.ParmValue)));
+          .AddJsonStream(new MemoryStream(Encoding.UTF8.GetBytes(_thirdInterfaceDto.ParmValue)));
             InterfaceConfig = configurationBuilder.Build();
 
             var medicalCenterIdStr = InterfaceConfig.GetSection("Interface").GetSection("MedicalCenterId").Value;
@@ -165,7 +165,7 @@ namespace Shentun.Peis.PlugIns
                     httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", _webPeisToken);
                     IsoDateTimeConverter timeFormat = new IsoDateTimeConverter();
                     timeFormat.DateTimeFormat = "yyyy-MM-dd HH:mm:ss";
-                    var sendData = JsonConvert.SerializeObject(data, Newtonsoft.Json.Formatting.Indented, timeFormat);
+                    var sendData = JsonConvert.SerializeObject(data, Formatting.Indented, timeFormat);
                     using (HttpContent httpContent = new StringContent(sendData))
                     {
                         httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");

src/Shentun.Peis.Application/ColumnReferences/ColumnReferenceAppService.cs

@@ -23,12 +23,12 @@ using Volo.Abp.ObjectMapping;
 using Microsoft.Extensions.Configuration;
 using System.IO;
 using Shentun.Peis.HelperDto;
-using Shentun.Peis.PlugIns;
 using Volo.Abp.Threading;
 using Shentun.Peis.ColumnReferenceCodes;
 using Shentun.Peis.ColumnReferenceInterfaces;
 using Volo.Abp.Domain.Entities;
 using Shentun.Utilities;
+using Shentun.Peis.PlugIns.ColumnReferences;
 
 namespace Shentun.Peis.ColumnReferences
 {

src/Shentun.Peis.Application/ImportLisResults/ImportLisResultAppService.cs

@@ -8,7 +8,7 @@ using Shentun.Peis.Enums;
 using Shentun.Peis.Items;
 using Shentun.Peis.Models;
 using Shentun.Peis.PatientRegisters;
-using Shentun.Peis.PlugIns;
+using Shentun.Peis.PlugIns.ImportLisResults;
 using Shentun.Peis.ReferenceRanges;
 using Shentun.Peis.RegisterCheckItems;
 using Shentun.Peis.RegisterChecks;

src/Shentun.Peis.Application/ImportPacsResults/ImportPacsResultAppService.cs

@@ -9,7 +9,7 @@ using Shentun.Peis.ImportLisResults;
 using Shentun.Peis.Items;
 using Shentun.Peis.Models;
 using Shentun.Peis.PatientRegisters;
-using Shentun.Peis.PlugIns;
+using Shentun.Peis.PlugIns.ImportPacsResults;
 using Shentun.Peis.ReferenceRanges;
 using Shentun.Peis.RegisterCheckItems;
 using Shentun.Peis.RegisterChecks;

src/Shentun.Peis.Domain/ChargeRequests/ChargeRequestManager.cs

@@ -2,7 +2,7 @@
 using Microsoft.Extensions.Configuration;
 using Shentun.Peis.Enums;
 using Shentun.Peis.Models;
-using Shentun.Peis.PlugIns;
+using Shentun.Peis.PlugIns.ChargeRequests;
 using Shentun.Peis.SysParmValues;
 using Shentun.Utilities;
 using System;

src/Shentun.Peis.Domain/LisRequests/LisRequestManager.cs

@@ -4,7 +4,7 @@ using Microsoft.Extensions.Configuration;
 using Org.BouncyCastle.Asn1.Ocsp;
 using Shentun.Peis.Enums;
 using Shentun.Peis.Models;
-using Shentun.Peis.PlugIns;
+using Shentun.Peis.PlugIns.LisRequests;
 using Shentun.Peis.PrintReports;
 using Shentun.Peis.SysParmValues;
 using Shentun.Utilities;