Merge branch 'master' of http://140.143.162.39:3000/shentun/peis

src/Shentun.Peis.Application/TransToWebPeis/TransToWebPeisAppService.cs

@@ -99,81 +99,11 @@ namespace Shentun.Peis.TransToWebPeis
             _patientRegisterExterRepository = patientRegisterExterRepository;
             _unitOfWorkManager = unitOfWorkManager;
         }
-        /// <summary>
-        /// 上传基础资料
-        /// </summary>
-        /// <returns></returns>
-
-        [HttpPost("api/app/TransToWebPeis/TransBaseData")]
-        public async Task TransBaseDataAsync()
-        {
-            var thirdInterfaces = await _thirdInterfaceRepository.GetListAsync(o => o.ThirdInterfaceType ==
-            ThirdInterfaceTypeFlag.TranToWebPeis);
-            foreach (var thirdInterface in thirdInterfaces)
-            {
-                var connectString = GetConnectionStrings(thirdInterface.ParmValue);
-
-                SqlSugarClient WebDb = new SqlSugarClient(new ConnectionConfig()
-                {
-                    ConnectionString = connectString,
-                    DbType = SqlSugar.DbType.PostgreSQL,
-                    IsAutoCloseConnection = true
-                });
-
     
-                #region 清理基础数据
-                //删除
-
-                await WebDb.Ado.ExecuteCommandAsync("delete from medical_package_detail;");
-                await WebDb.Ado.ExecuteCommandAsync("delete from medical_package;");
-
-                await WebDb.Ado.ExecuteCommandAsync("delete from customer_org_group_detail;");
-                await WebDb.Ado.ExecuteCommandAsync("delete from customer_org_group;");
-                await WebDb.Ado.ExecuteCommandAsync("delete from customer_org_register;");
-                await WebDb.Ado.ExecuteCommandAsync("delete from customer_org;");
-
-                await WebDb.Ado.ExecuteCommandAsync("delete from diagnosis;");
-                await WebDb.Ado.ExecuteCommandAsync("delete from diagnosis_level;");
-
-                await WebDb.Ado.ExecuteCommandAsync("delete from asbitem_detail;");
-                await WebDb.Ado.ExecuteCommandAsync("delete from asbitem;");
-
-                await WebDb.Ado.ExecuteCommandAsync("delete from item");
-
-                await WebDb.Ado.ExecuteCommandAsync("delete from item_type");
-                #endregion
-
-
-                await TransItemType(WebDb);
-                await TransItem(WebDb);
-                await TransAsbitem(WebDb);
-                await TransMedicalPackage(WebDb);
-                await TransDiagnosis(WebDb);
-
-                await TransCustomerOrgAsync(WebDb);
-                await TransCustomerOrgRegisterAsync(WebDb);
-                await TransCustomerOrgGroupAsync(WebDb);
-                await TransCustomerOrgGroupDetailAsync(WebDb);
-            }
-
-
-
-
-            //var connectString = "Host=10.1.12.140;Port=5432;Database=WebPeis;User ID=postgres;Password=st123;";
-
-            //SqlSugarClient WebDb = new SqlSugarClient(new ConnectionConfig()
-            //{
-            //    ConnectionString = connectString,
-            //    DbType = SqlSugar.DbType.PostgreSQL,
-            //    IsAutoCloseConnection = true
-            //});
-
-
-        }
 
 
         /// <summary>
-        /// 上传体检报告
+        /// 上传体检报告 并同步业务数据
         /// </summary>
         /// <returns></returns>
         [HttpPost("api/app/TransToWebPeis/UploadPeisReport")]
@@ -210,9 +140,8 @@ namespace Shentun.Peis.TransToWebPeis
             await _patientRegisterRepository.UpdateAsync(patientRegisterEnt);
         }
 
-
         /// <summary>
-        /// 根据人员登记ID上传人员体检信息  1
+        /// 根据人员登记ID上传人员体检信息
         /// </summary>
         /// <param name="input"></param>
         /// <returns></returns>
@@ -270,6 +199,82 @@ namespace Shentun.Peis.TransToWebPeis
             }
         }
 
+
+        #region MyRegion
+
+
+        /// <summary>
+        /// 上传基础资料
+        /// </summary>
+        /// <returns></returns>
+
+        [HttpPost("api/app/TransToWebPeis/TransBaseData")]
+        private async Task TransBaseDataAsync()
+        {
+            var thirdInterfaces = await _thirdInterfaceRepository.GetListAsync(o => o.ThirdInterfaceType ==
+            ThirdInterfaceTypeFlag.TranToWebPeis);
+            foreach (var thirdInterface in thirdInterfaces)
+            {
+                var connectString = GetConnectionStrings(thirdInterface.ParmValue);
+
+                SqlSugarClient WebDb = new SqlSugarClient(new ConnectionConfig()
+                {
+                    ConnectionString = connectString,
+                    DbType = SqlSugar.DbType.PostgreSQL,
+                    IsAutoCloseConnection = true
+                });
+
+
+                #region 清理基础数据
+                //删除
+
+                await WebDb.Ado.ExecuteCommandAsync("delete from medical_package_detail;");
+                await WebDb.Ado.ExecuteCommandAsync("delete from medical_package;");
+
+                await WebDb.Ado.ExecuteCommandAsync("delete from customer_org_group_detail;");
+                await WebDb.Ado.ExecuteCommandAsync("delete from customer_org_group;");
+                await WebDb.Ado.ExecuteCommandAsync("delete from customer_org_register;");
+                await WebDb.Ado.ExecuteCommandAsync("delete from customer_org;");
+
+                await WebDb.Ado.ExecuteCommandAsync("delete from diagnosis;");
+                await WebDb.Ado.ExecuteCommandAsync("delete from diagnosis_level;");
+
+                await WebDb.Ado.ExecuteCommandAsync("delete from asbitem_detail;");
+                await WebDb.Ado.ExecuteCommandAsync("delete from asbitem;");
+
+                await WebDb.Ado.ExecuteCommandAsync("delete from item");
+
+                await WebDb.Ado.ExecuteCommandAsync("delete from item_type");
+                #endregion
+
+
+                await TransItemType(WebDb);
+                await TransItem(WebDb);
+                await TransAsbitem(WebDb);
+                await TransMedicalPackage(WebDb);
+                await TransDiagnosis(WebDb);
+
+                await TransCustomerOrgAsync(WebDb);
+                await TransCustomerOrgRegisterAsync(WebDb);
+                await TransCustomerOrgGroupAsync(WebDb);
+                await TransCustomerOrgGroupDetailAsync(WebDb);
+            }
+
+
+
+
+            //var connectString = "Host=10.1.12.140;Port=5432;Database=WebPeis;User ID=postgres;Password=st123;";
+
+            //SqlSugarClient WebDb = new SqlSugarClient(new ConnectionConfig()
+            //{
+            //    ConnectionString = connectString,
+            //    DbType = SqlSugar.DbType.PostgreSQL,
+            //    IsAutoCloseConnection = true
+            //});
+
+
+        }
+
         /// <summary>
         /// 获取数据库连接地址
         /// </summary>
@@ -287,16 +292,7 @@ namespace Shentun.Peis.TransToWebPeis
             return interfaceConnctionStr;
         }
 
-        private string GetUrl(string parmValue)
-        {
-            var configurationBuilder = new ConfigurationBuilder()
-          .AddJsonStream(new MemoryStream(System.Text.Encoding.UTF8.GetBytes(parmValue)));
-            var interfaceConfig = configurationBuilder.Build();
-            var url = interfaceConfig.GetSection("Interface").GetSection("Url").Value;
-
-            return url;
-        }
-        public async Task<TOut> CallAppServiceAsync<TInput, TOut>(string appBaseAddress, string url, TInput data)
+        private async Task<TOut> CallAppServiceAsync<TInput, TOut>(string appBaseAddress, string url, TInput data)
         {
             string baseAddress = appBaseAddress;
 
@@ -341,8 +337,7 @@ namespace Shentun.Peis.TransToWebPeis
                 }
             }
         } 
-
-
+        #endregion
 
         #region 基础数据
 
@@ -774,7 +769,7 @@ namespace Shentun.Peis.TransToWebPeis
 
         #region 人员导入
         /// <summary>
-        /// 人员导入   22
+        /// 人员导入   
         /// </summary>
         /// <param name="WebDb"></param>
         /// <param name="PatientRegisterId"></param>
@@ -1255,6 +1250,7 @@ namespace Shentun.Peis.TransToWebPeis
 
         #endregion
 
+        #region 临时导数据
         int sumCount = 0;
         int handCount = 0;
 
@@ -1262,6 +1258,7 @@ namespace Shentun.Peis.TransToWebPeis
         /// 导入体检数据到web 全部导入 2024-06-06
         /// </summary>
         /// <returns></returns>
+        [RemoteService(false)]
         public async Task ExportPatientRegisterWithDetailData()
         {
             var connectString = @"Host=10.1.12.138;Port=5432;Database=WebPeis0520;User ID=postgres;Password=st123;";
@@ -1303,6 +1300,7 @@ namespace Shentun.Peis.TransToWebPeis
 
             _logger.LogInformation($"当前查询数据:{sumCount},新增数据:{handCount}");
 
+            if (patientRegisterIds.Any())
                 await ExportPatientRegisterWithDetailData();
         }
 
@@ -1313,6 +1311,7 @@ namespace Shentun.Peis.TransToWebPeis
         /// 反向导入 导入体检数据到web 全部导入 2024-06-07  
         /// </summary>
         /// <returns></returns>
+        [RemoteService(false)]
         public async Task ExportPatientRegisterWithDetailReverseData()
         {
             //var connectString = @"Host=10.1.12.138;Port=5432;Database=WebPeis0520;User ID=postgres;Password=st123;";
@@ -1354,8 +1353,10 @@ namespace Shentun.Peis.TransToWebPeis
 
             _logger.LogInformation($"当前降序查询数据:{sumCount},新增数据:{handCount}");
 
+            if (patientRegisterIds.Any())
                 await ExportPatientRegisterWithDetailReverseData();
         } 
+        #endregion
 
     }
 }