Merge branch 'develop' into feature/绩效汇报表

performance/Performance.Infrastructure/Extensions/Extensions.Dictionary.cs

@@ -54,7 +54,7 @@ public static void AddOrUpdate(this Dictionary<string, object> keyValues, string
             if (default(KeyValuePair<string, object>).Equals(pair))
                 keyValues.Add(key, value);
             else
-                keyValues[key] = value;
+                keyValues[pair.Key] = value;
         }
 
         /// <summary>

performance/Performance.Services/ExtractExcelService/ExtractService.cs

@@ -158,6 +158,7 @@ private void WriteDataToFile(IWorkbook workbook, per_allot allot, Dictionary<ExD
 
             WriteDataFactory factory = new WriteDataFactory();
             var types = new List<SheetType> { SheetType.OtherIncome, SheetType.Income, SheetType.Expend, SheetType.Workload, SheetType.OtherWorkload/*, SheetType.AccountBasic*/ };
+            types.AddRange(OtherConfigSheet);
             decimal ratio = 60m;
 
             //string accountBasicSheetName = "";
@@ -321,5 +322,24 @@ private List<ExtractTransDto> StandDataFormat(int hospitalId, List<ex_result> re
 
             return groupdata.ToList();
         }
+
+        private readonly List<SheetType> OtherConfigSheet = new List<SheetType>
+        {
+            SheetType.AccountExtra,
+            SheetType.PersonExtra,
+            SheetType.AccountDrugAssess,
+            SheetType.AccountMaterialsAssess,
+            SheetType.AccountScoreAverage,
+            SheetType.AccountAdjustLaterOtherFee,
+            SheetType.PersonAdjustLaterOtherFee,
+            SheetType.BudgetRatio,
+            SheetType.AssessBeforeOtherFee,
+            SheetType.PersonOtherManagePerforFee,
+            SheetType.PersonAdjustLaterOtherManagePerforFee,
+            SheetType.PersonPostCoefficient,
+            SheetType.WorkloadMedicineProp,
+            SheetType.WorkloadCMI,
+            SheetType.WorkloadIncline,
+        };
     }
 }

performance/Performance.Services/ExtractExcelService/QueryService.cs

@@ -235,8 +235,9 @@ private List<ex_result> ExtractModuleData(per_allot allot, string groupName, boo
 
                             logService.ReturnTheLog(allot.ID, groupName, 2, "提取数据", $"模块“{string.Join("、", thisModules.Select(t => t.ModuleName))}”的数据已完成提取", 1, isSingle);
                         }
-                        catch (Exception)
+                        catch (Exception ex)
                         {
+                            logger.LogError($"数据库“{config.DbName}”连接失败: {ex}; {Infrastructure.JsonHelper.Serialize(script)}");
                             logService.ReturnTheLog(allot.ID, groupName, 2, "数据库连接", $"数据库“{config.DbName}”连接失败", 3, isSingle);
                         }
                     }

performance/Performance.Services/PerExcelService/SheetDataRead/PerSheetDataReadAccountExtra.cs

@@ -19,6 +19,7 @@ public class PerSheetDataReadAccountExtra : IPerSheetDataRead
             HeaderLastRowNum = 1,
             HeaderFirstCellNum = 0,
             DataFirstRowNum = 2,
+            DataFirstCellNum = 3,
             TotalCellNum = 0,
             AccountingUnit = new List<AccountingUnit>
             {

performance/Performance.Services/PerExcelService/SheetDataRead/PerSheetDataReadPersonExtra.cs

@@ -19,7 +19,7 @@ public class PerSheetDataReadPersonExtra : IPerSheetDataRead
             HeaderLastRowNum = 1,
             HeaderFirstCellNum = 0,
             DataFirstRowNum = 2,
-            DataFirstCellNum = 4,
+            DataFirstCellNum = 3,
             TotalCellNum = 0,
             AccountingUnit = new List<AccountingUnit>
             {