人员、科室标签配置排序表头修改

performance/Performance.Services/ConfigService.cs

@@ -1160,7 +1160,7 @@ public HandsonTable GetSecondaryAlias()
                     {
                         column.Type = "autocomplete";
                         column.Source = new[] {"可用", "禁用"};
-                        column.Strict = true;
+                        column.Strict = false;
                     }
                 }
             }

performance/Performance.Services/ExConfigService.cs

@@ -300,9 +300,9 @@ public HandsonTable GetQueryItemHands(ModModuleRequest request)
             var module = exmoduleRepository.GetEntity(t => t.Id == request.ModuleId);
             if (request.SheetType == (int)SheetType.Workload)
                 DicType = WorkLoadDic;
-            else if (request.SheetType==(int)SheetType.Income)
-            //else if (moduleList.Where(t=>t.SheetType == (int)SheetType.Income).Select(t=>t.ModuleName).Contains(module.ModuleName) )
-                DicType =OutDic;
+            else if (request.SheetType == (int)SheetType.Income)
+                //else if (moduleList.Where(t=>t.SheetType == (int)SheetType.Income).Select(t=>t.ModuleName).Contains(module.ModuleName) )
+                DicType = OutDic;
             else
                 DicType = CostDic;
 
@@ -318,19 +318,19 @@ public HandsonTable GetQueryItemHands(ModModuleRequest request)
             {
                 foreach (var column in handson.Columns)
                 {
-                    if (new[]{"医生系数","护理系数","医技系数"}.Contains(column.Data))
+                    if (new[] { "医生系数", "护理系数", "医技系数" }.Contains(column.Data))
                     {
                         column.Type = "numeric";
-                        column.NumericFormat=new NumericFormat(){Pattern = "%"};
+                        column.NumericFormat = new NumericFormat() { Pattern = "%" };
                         column.Strict = false;
                     }
 
-                    if (column.Data=="单元工作量绩效标准")
+                    if (column.Data == "单元工作量绩效标准")
                     {
                         column.Type = "numeric";
                         column.Strict = false;
                     }
-                    
+
                     if (column.Data == "自动提取规则(无法提取的考核项请勿填写)")
                     {
                         column.Type = "autocomplete";
@@ -340,7 +340,7 @@ public HandsonTable GetQueryItemHands(ModModuleRequest request)
                 }
             }
 
-            var list = exitemRepository.GetEntities(t => t.ModuleId == request.ModuleId)?.OrderBy(c=>c.ItemName);
+            var list = exitemRepository.GetEntities(t => t.ModuleId == request.ModuleId)?.OrderBy(c => c.ItemName);
             if (list == null) return handson;
 
             List<HandsonRowData> rowDatas = new List<HandsonRowData>();
@@ -354,7 +354,7 @@ public HandsonTable GetQueryItemHands(ModModuleRequest request)
                     firstDic["typeid"] = typeId.First().Title;
                 else
                     firstDic["typeid"] = "";
-                
+
                 var cells = (from conf in DicType
                              join fst in firstDic on conf.Key.ToUpper() equals fst.Key.ToUpper()
                              select new HandsonCellData(conf.Value, fst.Value)).ToList();
@@ -383,7 +383,7 @@ public void SaveItemHands(int ModuleId, SaveItemData request)
                         .Where(t => t.Title == item["TypeId"]);
                 if (dicValue.Any())
                     item["TypeId"] = dicValue.First().Value;
-                
+
                 var json = JsonHelper.Serialize(item);
                 var data = JsonHelper.Deserialize<ex_item>(json);
                 if (!string.IsNullOrEmpty(data.ItemName))
@@ -600,12 +600,13 @@ private bool QueryAndAddItem(List<sys_hospitalconfig> hospitalconfigs, string sq
             List<string> itemNames = new List<string>();
             foreach (var hospitalConfig in hospitalconfigs)
             {
-                var connection = ConnectionBuilder.Create((DatabaseType)hospitalConfig.DataBaseType, hospitalConfig.DbSource, hospitalConfig.DbName, hospitalConfig.DbUser, hospitalConfig.DbPassword);
-                logger.LogInformation($"执行sql：{sql}");
                 try
                 {
+                    var connection = ConnectionBuilder.Create((DatabaseType)hospitalConfig.DataBaseType, hospitalConfig.DbSource, hospitalConfig.DbName, hospitalConfig.DbUser, hospitalConfig.DbPassword, 5);
                     logger.LogInformation($"ConnectionString: {connection?.ConnectionString}");
-                    var dataList = extractRepository.ExecuteScript(connection, sql, null);
+
+                    logger.LogInformation($"执行sql：{sql}");
+                    var dataList = extractRepository.ExecuteScript(connection, sql, null, 5000);
                     logger.LogInformation($"获取数据{dataList?.Count ?? 0}条");
                     if (dataList != null && dataList.Any())
                         itemNames.AddRange(dataList.Select(t => t.Value.ToString()));

performance/Performance.Services/ReportGlobalService.cs

@@ -531,7 +531,7 @@ public HandsonTable GetReportPersonTag(int hospitalId)
                 Visible = 1
             }).ToList());
 
-            var data = reportperformancepersontagsRepository.GetEntities(t => t.HospitalId == hospitalId)?.OrderBy(t=>Convert.ToInt32(t.PersonnelNumber));
+            var data = reportperformancepersontagsRepository.GetEntities(t => t.HospitalId == hospitalId)?.OrderBy(t=>t.UnitType).ThenBy(t=>t.AccountingUnit).ThenBy(t=>Convert.ToInt32(t.PersonnelNumber));
             if (data == null) return result;
 
             List<HandsonRowData> rowDatas = new List<HandsonRowData>();
@@ -578,7 +578,7 @@ public HandsonTable GetReportTag(int hospitalId)
                 Visible = 1
             }).ToList());
 
-            var data = reportperformancetagsRepository.GetEntities(t => t.HospitalId == hospitalId)?.OrderBy(t=>t.UnitType);
+            var data = reportperformancetagsRepository.GetEntities(t => t.HospitalId == hospitalId)?.OrderBy(t=>t.UnitType).ThenBy(t=>t.AccountingUnit);
             if (data == null) return result;
 
             List<HandsonRowData> rowDatas = new List<HandsonRowData>();
@@ -623,22 +623,22 @@ public void SaveReportTag(int hospitalId, SaveCollectData request)
             {nameof(report_performance_person_tags.AccountingUnit), "科室"},
             {nameof(report_performance_person_tags.PersonnelNumber), "工号"},
             {nameof(report_performance_person_tags.PersonnelName), "姓名"},
-            {nameof(report_performance_person_tags.Tag1), "绩效发放情况"},
-            {nameof(report_performance_person_tags.Tag2), "当月绩效权重"},
-            {nameof(report_performance_person_tags.Tag3), "重点群体对比1"},
-            {nameof(report_performance_person_tags.Tag4), "重点群体对比2"},
-            {nameof(report_performance_person_tags.Tag5), "重点群体对比5"},
+            {nameof(report_performance_person_tags.Tag1), "Tag1"},
+            {nameof(report_performance_person_tags.Tag2), "Tag2"},
+            {nameof(report_performance_person_tags.Tag3), "Tag3"},
+            {nameof(report_performance_person_tags.Tag4), "Tag4"},
+            {nameof(report_performance_person_tags.Tag5), "Tag5"},
         };
 
         public static Dictionary<string, string> ReportTag { get; } = new Dictionary<string, string>
         {
             {nameof(report_performance_tags.UnitType), "核算单元类型"},
             {nameof(report_performance_tags.AccountingUnit), "科室"},
-            {nameof(report_performance_tags.Tag1), "绩效发放情况"},
-            {nameof(report_performance_tags.Tag2), "当月绩效权重"},
-            {nameof(report_performance_tags.Tag3), "重点群体对比1"},
-            {nameof(report_performance_tags.Tag4), "重点群体对比2"},
-            {nameof(report_performance_tags.Tag5), "重点群体对比5"},
+            {nameof(report_performance_tags.Tag1), "Tag1"},
+            {nameof(report_performance_tags.Tag2), "Tag2"},
+            {nameof(report_performance_tags.Tag3), "Tag3"},
+            {nameof(report_performance_tags.Tag4), "Tag4"},
+            {nameof(report_performance_tags.Tag5), "Tag5"},
         };
 
         private List<Dictionary<string, string>> CreateDataRow(int hospitalId, SaveCollectData request, Dictionary<string, string> config)