考核得分率变更

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

@@ -1712,6 +1712,11 @@
             ExTypeId
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.ex_script.ConfigId">
+            <summary>
+            配置Id
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.ex_script.IsEnable">
             <summary>
             是否可用 1 可用 2 不可用

performance/Performance.Services/AllotCompute/ProcessComputService.cs

@@ -289,7 +289,8 @@ public void Save(List<PerSheet> perSheets, int allotId)
                             workDoctor = info.Data.FirstOrDefault(t => t.UnitType == UnitType.医生组.ToString() && t.AccountingUnit == dept.AccountingUnit);
 
                         dept.MedicineFactor = workDoctor?.MedicineFactor;
-                        dept.ScoringAverage = scoreAverage.HasValue ? scoreAverage ?? 0 : dept.ScoringAverage;
+                        //dept.ScoringAverage = scoreAverage.HasValue ? scoreAverage ?? 0 : dept.ScoringAverage;
+                        dept.ScoringAverage = dept.ScoringAverage;
                         dept.AdjustFactor = dept.AdjustFactor == 0m ? 1 : dept.AdjustFactor;
                         dept.Income = econDoctor?.CellValue ?? 0;
                         dept.WorkloadFee = workDoctor?.CellValue ?? 0;

performance/Performance.Services/AllotCompute/ResultComputeService.cs

@@ -188,7 +188,8 @@ public class ResultComputeService : IAutoInjection
                         Quantity = item.Quantity,
                         QuantitativeIndicatorsValue = item.QuantitativeIndicatorsValue,
                         QuantitativeFee = item.Quantity * item.QuantitativeIndicatorsValue * headcount,
-                        ScoringAverage = scoreAverage.HasValue ? scoreAverage : dept?.ScoringAverage,
+                        //ScoringAverage = scoreAverage.HasValue ? scoreAverage : dept?.ScoringAverage, 
+                        ScoringAverage = dept?.ScoringAverage,
                         //OtherPerfor = dept?.OtherPerfor,
                         Punishment = (extra ?? 0),
                         MedicineExtra = (drugExtra ?? 0),

performance/Performance.Services/ComputeService.cs

@@ -761,7 +761,8 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
                     else if (sheet.SheetType == (int)SheetType.AccountScoreAverage)
                     {
                         sheettype = 8;
-                        amount = Math.Round(doctor?.ScoringAverage ?? 0, 4);
+                        //amount = Math.Round(doctor?.ScoringAverage ?? 0, 4);
+                        amount = Math.Round(basicData.Where(t => t.SheetID == sheet.ID && t.UnitType == type && t.IsTotal == 1)?.FirstOrDefault().CellValue ?? 0, 4);
                     }
 
                     var item = new DetailDtos
@@ -999,7 +1000,8 @@ public DeptDataDetails SpecialDeptDetail(ag_secondallot second)
                     else if (sheet.SheetType == (int)SheetType.AccountScoreAverage)
                     {
                         sheettype = 8;
-                        amount = Math.Round(special.FirstOrDefault()?.ScoringAverage ?? 0, 4);
+                        //amount = Math.Round(special.FirstOrDefault()?.ScoringAverage ?? 0, 4);
+                        amount = Math.Round(basicData.Where(t => t.SheetID == sheet.ID && t.UnitType == (int)UnitType.特殊核算组 && t.IsTotal == 1)?.FirstOrDefault().CellValue ?? 0, 4);
                     }
 
                     var item = new DetailDtos