其他组 核算人均绩效、特殊科室带入 护士人均绩效等的计算值进行计算

performance/Performance.Services/AllotCompute/ResultComputeService.cs

@@ -126,11 +126,11 @@ public void SpecialUnitCompute(PerExcel excel, per_allot allot, List<res_baiscno
                     }
                     else
                     {
-                        var radio = perforImEmployeeRepository.GetEntities(p => p.FitPeople == EnumHelper.GetDescription((PerforType)type.Value) && p.AllotID == allot.ID)
-                            ?.FirstOrDefault().FitPeopleRatio ?? 1;
+                        //var radio = perforImEmployeeRepository.GetEntities(p => p.FitPeople == EnumHelper.GetDescription((PerforType)type.Value) && p.AllotID == allot.ID)
+                        //    ?.FirstOrDefault().FitPeopleRatio ?? 1;
                         var basic = baiscNormService.GetBaiscNorm(baiscnormList, (PerforType)type.Value);
                         // 添加参数计算
-                        item.Quantity = basic != null ? basic * radio : null;
+                        item.Quantity = basic != null ? basic : null;
                     }
                 }
             }

performance/Performance.Services/ComputeService.cs

@@ -395,8 +395,10 @@ public DeptDataDetails DeptDetail(int accountId)
                 Detail = new List<DetailDtos>()
             };
             int type = doctor.UnitType.Value;
-            if (type == (int)UnitType.专家组 || type == (int)UnitType.其他医技组 || type == (int)UnitType.其他医生组 || type == (int)UnitType.其他护理组)
+            if (type == (int)UnitType.专家组 || type == (int)UnitType.其他医技组 || type == (int)UnitType.其他医生组)
                 type = 1;
+            else if (type == (int)UnitType.其他护理组)
+                type = 2;
             var basicData = _perforImDataRepository.GetEntities(t => t.AllotID == doctor.AllotID && t.UnitType == type && t.AccountingUnit == doctor.AccountingUnit);
             var persheet = _perforPerSheetRepository.GetEntities(t => t.AllotID == doctor.AllotID);
 

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

@@ -321,7 +321,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<im_a
                         unitType = unit.FirstOrDefault(t => t.UnitType.ToString() == empolyee.UnitType)?.NewUnitType;
                     }
 
-                    var resAccount = dataList.FirstOrDefault(t => ((UnitType)t.UnitType).ToString() == unitType && t.AccountingUnit == empolyee.AccountingUnit);
+                    var resAccount = dataList.FirstOrDefault(t => ((UnitType)t.UnitType).ToString() == empolyee.UnitType && t.AccountingUnit == empolyee.AccountingUnit) ?? dataList.FirstOrDefault(t => ((UnitType)t.UnitType).ToString() == unitType && t.AccountingUnit == empolyee.AccountingUnit);
                     if (resAccount == null && empolyees.Count() > 1)
                     {
                         // 如果没有找到科室，则找相同用户的其他核算单元类型