更改抽取获取config来源

performance/Performance.Api/wwwroot/Performance.EntityModels.xml

@@ -2070,6 +2070,11 @@
             是否可用 1 可用 2 不可用
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.mod_extract.ConfigId">
+            <summary>
+            数据库地址
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.mod_item">
             <summary>
             
@@ -2120,11 +2125,6 @@
             只读 0、否 1、是
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.mod_item.ConfigId">
-            <summary>
-            数据库地址
-            </summary>
-        </member>
         <member name="T:Performance.EntityModels.mod_module">
             <summary>
             
@@ -2170,11 +2170,6 @@
             是否生成Item 0、否 1、是
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.mod_module.ConfigId">
-            <summary>
-            数据库地址
-            </summary>
-        </member>
         <member name="T:Performance.EntityModels.mod_special">
             <summary>
             
@@ -2215,11 +2210,6 @@
             抽取绩效值SQL
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.mod_special.ConfigId">
-            <summary>
-            数据库地址
-            </summary>
-        </member>
         <member name="T:Performance.EntityModels.per_againallot">
             <summary>
             

performance/Performance.EntityModels/Entity/mod_extract.cs

@@ -55,5 +55,10 @@ public class mod_extract
         /// 是否可用 1 可用 2 不可用
         /// </summary>
         public Nullable<int> IsEnable { get; set; }
+    
+        /// <summary>
+        /// 数据库地址
+        /// </summary>
+        public int ConfigId { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/mod_item.cs

@@ -60,10 +60,5 @@ public class mod_item
         /// 只读 0、否 1、是
         /// </summary>
         public Nullable<int> ReadOnly { get; set; }
-    
-        /// <summary>
-        /// 数据库地址
-        /// </summary>
-        public Nullable<int> ConfigId { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/mod_module.cs

@@ -55,10 +55,5 @@ public class mod_module
         /// 是否生成Item 0、否 1、是
         /// </summary>
         public Nullable<int> IsGenerated { get; set; }
-    
-        /// <summary>
-        /// 数据库地址
-        /// </summary>
-        public Nullable<int> ConfigId { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/mod_special.cs

@@ -50,10 +50,5 @@ public class mod_special
         /// 抽取绩效值SQL
         /// </summary>
         public Nullable<int> ExtractId { get; set; }
-    
-        /// <summary>
-        /// 数据库地址
-        /// </summary>
-        public Nullable<int> ConfigId { get; set; }
     }
 }

performance/Performance.Services/NewExtractService.cs

@@ -265,7 +265,7 @@ private void WriteOtherIncome(ISheet sheet, int hospitalId, List<AccountUnitEnti
                 {
                     logManageService.WriteMsg("提取绩效数据", $"执行SQL脚本获取数据 -- {module.ModuleName}", 1, AllotId, "ReceiveMessage");
                     LogHelper.Information($"执行SQL脚本获取数据 -- {module.ModuleName}，", "提取绩效数据");
-                    var result = QueryDatabase(hospitalConfigList, item, allot, moditem.ConfigId ?? 0, moditem.ItemName);
+                    var result = QueryDatabase(hospitalConfigList, item, allot, moditem.ItemName);
                     if (result != null)
                         allExtract.AddRange(result);
                 }
@@ -370,7 +370,7 @@ private void WriteIncome(ISheet sheet, int hospitalId, List<AccountUnitEntity> u
             {
                 logManageService.WriteMsg("提取绩效数据", $"执行SQL脚本获取数据 -- {module.ModuleName}", 1, AllotId, "ReceiveMessage");
                 LogHelper.Information($"执行SQL脚本获取数据 -- {module.ModuleName}", "提取绩效数据");
-                var result = QueryDatabase(hospitalConfigList, item, allot, module.ConfigId ?? 0);
+                var result = QueryDatabase(hospitalConfigList, item, allot);
                 if (result != null)
                     allExtract.AddRange(result);
             }
@@ -493,7 +493,7 @@ private void WriteWorkload(ISheet sheet, int hospitalId, List<AccountUnitEntity>
                 {
                     logManageService.WriteMsg("提取绩效数据", $"执行SQL脚本获取数据 -- {module.ModuleName}", 1, AllotId, "ReceiveMessage");
                     LogHelper.Information($"执行SQL脚本获取数据 -- {module.ModuleName}，", "提取绩效数据");
-                    var result = QueryDatabase(hospitalConfigList, item, allot, moditem.ConfigId ?? 0, moditem.ItemName);
+                    var result = QueryDatabase(hospitalConfigList, item, allot, moditem.ItemName);
                     if (result != null)
                         allExtract.AddRange(result);
                 }
@@ -541,9 +541,9 @@ private void WriteWorkload(ISheet sheet, int hospitalId, List<AccountUnitEntity>
             }
         }
 
-        private List<ExtractDto> QueryDatabase(List<sys_hospitalconfig> hospitalConfigList, mod_extract extract, per_allot allot, int configId, string category = null)
+        private List<ExtractDto> QueryDatabase(List<sys_hospitalconfig> hospitalConfigList, mod_extract extract, per_allot allot, string category = null)
         {
-            var config = hospitalConfigList.FirstOrDefault(t => t.Id == configId);
+            var config = hospitalConfigList.FirstOrDefault(t => t.Id == extract.ConfigId);
             if (config == null) return null;
             string executeScript = extract.ExecuteScript;
             var parameters = GetParameters(allot);
@@ -693,7 +693,7 @@ private void WriteSpecialUnit(ISheet sheet, int hospitalId, per_allot allot, IPe
                 {
                     logManageService.WriteMsg("提取绩效数据", $"执行SQL脚本获取数据 -- 特殊核算单元绩效测算表", 1, AllotId, "ReceiveMessage");
                     LogHelper.Information($"执行SQL脚本获取数据 -- 特殊核算单元绩效测算表，", "提取绩效数据");
-                    var result = QueryDatabase(hospitalConfigList, item, allot, moditem.ConfigId ?? 0, moditem.Target);
+                    var result = QueryDatabase(hospitalConfigList, item, allot, moditem.Target);
                     if (result != null)
                         allExtract.AddRange(result);
                 }