BUG修复

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

@@ -5172,6 +5172,11 @@
             是否开启护理部审核 1 启用 2 禁用
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.sys_hospital.IsShowSecondDirector">
+            <summary>
+            是否显示二次绩效科主任1 启用 2 禁用
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.sys_hospitalconfig">
             <summary>
             

performance/Performance.Services/AllotCompute/ProcessComputService.cs

@@ -302,7 +302,7 @@ public void Save(List<PerSheet> perSheets, int allotId)
                         dept.MedicineFactor = workDoctor?.MedicineFactor;
                         //dept.ScoringAverage = scoreAverage.HasValue ? scoreAverage ?? 0 : dept.ScoringAverage;
                         dept.ScoringAverage = dept.ScoringAverage;
-                        dept.AdjustFactor = dept.AdjustFactor == 0m ? 1 : dept.AdjustFactor;
+                        dept.AdjustFactor = dept.AdjustFactor == 0m ? 0 : dept.AdjustFactor;
                         dept.Income = econDoctor?.CellValue ?? 0;
                         dept.WorkloadFee = workDoctor?.CellValue ?? 0;
                         dept.AssessBeforeOtherFee = dept?.AssessBeforeOtherFee ?? 0;
@@ -365,7 +365,7 @@ public void ComputeOffice(per_allot allot, PerExcel excel, IEnumerable<AccountUn
                 dept.AccountingUnit = account.AccountingUnit;
                 dept.UnitType = account.AccountType;
                 dept.ScoringAverage = resAccount?.ScoringAverage == null ? 0 : resAccount.ScoringAverage;
-                dept.AdjustFactor = resAccount?.AdjustFactor == null ? 1 : resAccount.AdjustFactor;
+                dept.AdjustFactor = resAccount?.AdjustFactor == null ? 0 : resAccount.AdjustFactor;
                 dept.Income = empolyees.Sum(w => w.PerforTotal ?? 0);
                 dept.Extra = (extra ?? 0);
                 dept.MedicineExtra = 0;// (drugExtra ?? 0);

performance/Performance.Services/AllotCompute/ResultComputeService.cs

@@ -200,7 +200,7 @@ public class ResultComputeService : IAutoInjection
                         Punishment = (extra ?? 0),
                         MedicineExtra = (drugExtra ?? 0),
                         MaterialsExtra = (materialsExtra ?? 0),
-                        Adjust = isBudget ? adjust : (dept?.AdjustFactor ?? 1),
+                        Adjust = isBudget ? adjust : (dept?.AdjustFactor ?? 0),
 
                         AssessBeforeOtherFee = dept?.AssessBeforeOtherFee ?? 0,
                         AssessLaterOtherFee = dept?.AssessLaterOtherFee ?? 0,

performance/Performance.Services/ComputeService.cs

@@ -969,7 +969,7 @@ public DeptDataDetails SpecialDeptDetail(ag_secondallot second)
                     AccountingUnit = second.Department,
                     //Department = second.Department,
                     ScoringAverage = special.FirstOrDefault()?.ScoringAverage ?? 0,
-                    OtherPerfor1 = special.FirstOrDefault()?.OtherPerfor ?? 0,
+                    //OtherPerfor1 = special.FirstOrDefault()?.OtherPerfor ?? 0,
                     AdjustFactor = special.FirstOrDefault()?.Adjust ?? 0,
                     Avg = special.FirstOrDefault()?.Avg,
                     RealGiveFee = special.FirstOrDefault()?.RealGiveFee,
@@ -980,6 +980,9 @@ public DeptDataDetails SpecialDeptDetail(ag_secondallot second)
                     Extra = special.FirstOrDefault()?.Punishment ?? 0,
                     MedicineExtra = special.FirstOrDefault()?.MedicineExtra ?? 0,
                     MaterialsExtra = special.FirstOrDefault()?.MaterialsExtra ?? 0,
+                    AssessBeforeOtherFee = special.FirstOrDefault()?.AssessBeforeOtherFee ?? 0,
+                    AssessLaterOtherFee = special.FirstOrDefault()?.AssessLaterOtherFee ?? 0,
+                    AdjustLaterOtherFee = special.FirstOrDefault()?.AdjustLaterOtherFee ?? 0,
                 },
                 Detail = new List<DetailDtos>(),
             };

performance/Performance.Services/PerExcelService/ComputeEmpolyee/ComputeDirector.cs

@@ -508,7 +508,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, per_allot
                         compute.PerforTotal = compute.PerforTotal + compute.AssessBeforeOtherFee;
 
                     //应发绩效
-                    compute.GiveFee = compute.BaiscNormValue * compute.PostCoefficient * compute.Attendance + compute.Punishment;
+                    compute.GiveFee = compute.PerforTotal + compute.Punishment;
 
                     // 行政中高层 不需要其他绩效 行政工勤 不需要考核得分率 区分开计算
                     if (AccountUnitType.行政工勤.ToString() == involve)