工作量计算结果包含cmi系数值

performance/Performance.Services/AllotCompute/ProcessComputService.cs

@@ -325,8 +325,8 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet, per_allot
                         dept.PerforFee = dept.Income * dept.BasicFactor;
                         //dept.PerforTotal = Math.Round((dept.PerforFee + dept.WorkloadFee + dept.OtherPerfor1 + dept.AssessBeforeOtherFee) ?? 0);
                         dept.PerforTotal = Math.Round((dept.PerforFee + dept.WorkloadFee + dept.AssessBeforeOtherFee) ?? 0);
-                        dept.AssessLaterPerforTotal = Math.Round((dept.PerforTotal * dept.ScoringAverage + dept.MedicineExtra + dept.MaterialsExtra + dept.Extra + dept.AssessLaterOtherFee) ?? 0);
-                        dept.RealGiveFee = Math.Round((dept.AssessLaterPerforTotal * dept.AdjustFactor + dept.AdjustLaterOtherFee) ?? 0);
+                        dept.AssessLaterPerforTotal = Math.Round((dept.PerforTotal * dept.ScoringAverage + dept.MedicineExtra + dept.MaterialsExtra + dept.Extra + dept.AssessLaterOtherFee) ?? 0, MidpointRounding.AwayFromZero);
+                        dept.RealGiveFee = Math.Round((dept.AssessLaterPerforTotal * dept.AdjustFactor + dept.AdjustLaterOtherFee) ?? 0, MidpointRounding.AwayFromZero);
                         //dept.Avg = dept.ManagerNumber + dept.Number == 0 ? 0 : dept.PerforTotal / (dept.ManagerNumber + dept.Number);
                         dept.Avg = dept.Number == 0 ? 0 : dept.PerforTotal / dept.Number;
 

performance/Performance.Services/ComputeService.cs

@@ -541,7 +541,7 @@ public List<DeptResponse> GetAdminPerformance(int allotId)
                 MedicineExtra = t.Max(w => w.MedicineExtra),
                 MaterialsExtra = t.Max(w => w.MaterialsExtra),
                 AssessLaterOtherFee = t.Max(w => w.AssessLaterOtherFee),
-                AssessLaterPerforTotal = Math.Round((t.Max(w => w.PerforTotal) * t.Max(w => w.ScoringAverage) + t.Max(w => w.MedicineExtra) + t.Max(w => w.MaterialsExtra) + t.Max(w => w.Punishment) + t.Max(w => w.AssessLaterOtherFee)) ?? 0),
+                AssessLaterPerforTotal = Math.Round((t.Max(w => w.PerforTotal) * t.Max(w => w.ScoringAverage) + t.Max(w => w.MedicineExtra) + t.Max(w => w.MaterialsExtra) + t.Max(w => w.Punishment) + t.Max(w => w.AssessLaterOtherFee)) ?? 0, MidpointRounding.AwayFromZero),
                 AdjustFactor = t.Max(w => w.Adjust),
                 AdjustLaterOtherFee = t.Max(w => w.AdjustLaterOtherFee),
                 AssessLaterManagementFee = clinicalComputes?.Where(w => w.AccountingUnit == t.Key.AccountingUnit && w.UnitType == UnitType.特殊核算组.ToString())?.Sum(c => c.RealGiveFee),
@@ -897,11 +897,11 @@ public List<ComputeResponse> AllCompute(int allotId, int hospitalId, int isShowM
                     item.RealGiveFee = Math.Round(item.ShouldGiveFee - (item.ReservedRatioFee ?? 0) ?? 0, 2, MidpointRounding.AwayFromZero);
                     // 姓名始终按人员字典显示
                     //item.EmployeeName = employees?.FirstOrDefault(w => w.PersonnelNumber == item.JobNumber)?.DoctorName ?? "";
-                    
+
                     item.BankCard = emps?.BankCard ?? "";
-                    item.JobCategory=emps?.JobCategory ?? "";
-                    item.Duty=emps?.Duty ?? "";
-                    item.TitlePosition=emps?.JobTitle ?? "";
+                    item.JobCategory = emps?.JobCategory ?? "";
+                    item.Duty = emps?.Duty ?? "";
+                    item.TitlePosition = emps?.JobTitle ?? "";
                     // 人员信息使用人员字典中数据
                     if (isEmpDic)
                     {
@@ -1920,7 +1920,7 @@ private decimal GetDecimal(decimal? value, decimal _ = 0)
 
         public List<cof_alias> CustomColumnHeaders(ComputerAliasRequest request)
         {
-            var result= cofaliasRepository.GetEntities(t => t.HospitalId == request.HospitalId && t.Route == request.Route && t.States==1);
+            var result = cofaliasRepository.GetEntities(t => t.HospitalId == request.HospitalId && t.Route == request.Route && t.States == 1);
             if (result == null || !result.Any()) return new List<cof_alias>();
             return result;
         }

performance/Performance.Services/PerExcelService/SheetDataCompute/PerSheetDataComputeWorkload.cs

@@ -157,6 +157,8 @@ public PerSheet OnceCompute(PerSheet sheet, List<CofDrugProp> confs = null)
 
             var value = group.Sum(s =>
             {
+                if (s.TypeName == "CMI系数") return 0;
+
                 var cellvalue = s.IsFactor ? s.CellValue * s.FactorValue : s.CellValue;
                 if (workitems.Any(w => w.Type == 3 && w.Item == s.TypeName))
                     cellvalue = cellvalue * inclinefactor;