夜班绩效补充

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

@@ -208,7 +208,7 @@
             <summary>
             上传文件
             </summary>
-            <param name="form"></param>
+            <param name="allotId"></param>
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.AllotController.Generate(Performance.DtoModels.AllotRequest)">
@@ -218,6 +218,13 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.AllotController.GenerateReport(Performance.DtoModels.AllotRequest)">
+            <summary>
+            绩效生成报表
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.AllotController.Recalculation(Performance.DtoModels.RecalculationRequest)">
             <summary>
             重新计算院领导绩效

performance/Performance.Services/AllotCompute/ProcessComputService.cs

@@ -349,6 +349,7 @@ public void ComputeOffice(per_allot allot, PerExcel excel)
         {
             //取出科室
             var accountList = excel.PerSheet.FirstOrDefault(t => t.SheetType == SheetType.AccountBasic)?.PerData?.Select(t => (PerDataAccountBaisc)t);
+            var accountExtraData = excel.PerSheet.FirstOrDefault(t => t.SheetType == SheetType.AccountExtra)?.PerData?.Select(t => (PerData)t);
 
             List<string> involves = new List<string>
             {
@@ -382,7 +383,11 @@ public void ComputeOffice(per_allot allot, PerExcel excel)
                 dept.NeedSecondAllot = empolyees.Any(w => w.NeedSecondAllot == "是") ? "是" : "否";
 
                 if (UnitTypeUtil.IsOffice(resAccount?.UnitType) && dept.NeedSecondAllot == "是")
-                {
+                { 
+                    // 夜班绩效 从医院奖罚的明细项中获取
+                    var nightShift = accountExtraData?.FirstOrDefault(w => w.UnitType == resAccount?.UnitType && w.AccountingUnit == dept.AccountingUnit && w.TypeName?.Trim() == "夜班绩效")?.CellValue ?? 0;
+
+                    dept.NightShiftWorkPerforFee = 0;
                     dept.ScoringAverage = resAccount?.ScoringAverage == null ? 0 : resAccount.ScoringAverage;
                     dept.AdjustFactor = (isBudget ? adjust : resAccount?.AdjustFactor) ?? 1;
                     dept.Extra = resAccount?.Extra ?? 0;