Merge branch 'release/v22.4.18-Beta-wuzhou' into develop

# Conflicts:
#	performance/Performance.Services/AllotCompute/ProcessComputService.cs
#	performance/Performance.Services/AllotCompute/ResultComputeService.cs
#	performance/Performance.Services/ExtractExcelService/ExtractHelper/ExtractHelper.cs

performance/Performance.Api/wwwroot/Performance.DtoModels.xml

@@ -4013,6 +4013,11 @@
             科室单项奖励
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.SecPrintResponse.PreDeptReward">
+            <summary>
+            科室考核前奖励
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.SecPrintResponse.DistPerformance">
             <summary>
             可分配绩效

performance/Performance.DtoModels/Response/SecPrintResponse.cs

@@ -35,6 +35,10 @@ public class SecPrintResponse
         /// </summary>
         public decimal? DeptReward { get; set; }
         /// <summary>
+        /// 科室考核前奖励
+        /// </summary>
+        public decimal? PreDeptReward { get; set; }
+        /// <summary>
         /// 可分配绩效
         /// </summary>
         public decimal? DistPerformance { get; set; }

performance/Performance.Services/ExtractExcelService/ExtractHelper/ExtractHelper.cs

@@ -88,7 +88,6 @@ public static void CreateNotExistSheet(List<ex_module> modulesList, IWorkbook wo
                         ExcelStyle style = new ExcelStyle(workbook);
                         var cellStyle = style.SetBgkColorAndFormat(style.GetCellStyle(), StyleType.列头, CellFormat.默认);
 
-                        var item = pairs.Where(t => t.Key.ToString().NoBlank().StartsWith("1.0.")).OrderByDescending(t => t.Key).First();
                         var newSheet = workbook.CreateSheet(module.ModuleName);
                         newSheet.GetOrCreate(1).GetOrCreate(6).SetCellValue("护理组分割比例：");
                         newSheet.GetOrCreate(1).GetOrCreate(6).CellStyle = cellStyle;
@@ -121,10 +120,11 @@ public static void CreateNotExistSheet(List<ex_module> modulesList, IWorkbook wo
                     var sheet = workbook.GetSheet(name) ?? workbook.GetSheet(module.ModuleName);
                     if (sheet == null)
                     {
-                        var item = pairs.Where(t => t.Key.ToString().NoBlank().StartsWith("3.")).OrderByDescending(t => t.Key).First();
-                        var copysheet = workbook.GetSheet(item.Key);
-                        if (copysheet == null) continue;
-                        var newSheet = copysheet.CopySheet(name, true);
+                        var item = pairs.Where(t => t.Key.ToString().NoBlank().StartsWith("3.")).OrderByDescending(t => t.Key).FirstOrDefault();
+                        var copysheet = workbook.GetSheet(item.Key ?? "");
+                        if (copysheet == null) break;
+
+                        var newSheet = copysheet.CopySheet(module.ModuleName, true);
                         workbook.SetSheetOrder(newSheet.SheetName, workbook.NumberOfSheets - 1);
 
                         var point = PerSheetDataFactory.GetDataRead(SheetType.Workload)?.Point;
@@ -154,7 +154,7 @@ public static void ClearSheetPartialData(ISheet sheet, PerSheetPoint point, Shee
                     {
                         var cell = row.GetCell(j);
                         if (cell == null) continue;
-                        
+
                         if (cell.CellType != CellType.Formula || sheetType == SheetType.Income)
                         {
                             cell.RemoveCellComment();

performance/Performance.Services/SecondAllotService.cs

@@ -2239,6 +2239,7 @@ public dynamic Print(int secondId)
                     TitlePerfor = w.TitlePerformance,
                     WorkPerformance = bodyDynamic?.Where(b => b.BodyId == w.Id && b.ItemId.StartsWith("WorkPerformance_")).Sum(b => b.Value) ?? 0,
                     DeptReward = w.DeptReward,
+                    PreDeptReward = w.PreDeptReward,
                     DistPerformance = w.DistPerformance,
                     OtherPerformance = w.OtherPerformance,
                     NightWorkPerformance = w.NightWorkPerformance,
@@ -2312,6 +2313,7 @@ public dynamic Print(int secondId)
                     TitlePerfor = w.TitlePerformance,
                     WorkPerformance = w.WorkPerformance,
                     DeptReward = w.DeptReward,
+                    PreDeptReward = w.PreDeptReward,
                     DistPerformance = w.DistPerformance,
                     OtherPerformance = w.OtherPerformance,
                     NightWorkPerformance = w.NightWorkPerformance,