核算单元类型新增 其他组； 医技工作量计算bug

performance/Performance.DtoModels/PerExcel/ExcelEnum.cs

@@ -23,6 +23,8 @@ public enum UnitType
         医技组 = 3,
         [Description("专家组")]
         专家组 = 4,
+        [Description("其他组")]
+        其他组 = 5,
     }
 
     public enum SheetType

performance/Performance.Services/AllotCompute/ProcessComputService.cs

@@ -247,7 +247,7 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet, List<res_
 
             var pairs = new[]
             {
-                new { Name = "医生组临床科室单元核算表", Data = doctorWorkloadData, SheetType = SheetType.ComputeDoctorAccount, UnitTypes = new List<UnitType> { UnitType.医生组, UnitType.医技组, UnitType.专家组 } },
+                new { Name = "医生组临床科室单元核算表", Data = doctorWorkloadData, SheetType = SheetType.ComputeDoctorAccount, UnitTypes = new List<UnitType> { UnitType.医生组, UnitType.医技组, UnitType.专家组, UnitType.其他组 } },
                 new { Name = "护理组临床科室单元核算表", Data = nurseWorkloadData, SheetType = SheetType.ComputeNurseAccount, UnitTypes = new List<UnitType> { UnitType.护理组 } },
                 new { Name = "专家核算表", Data = doctorWorkloadData, SheetType = SheetType.ComputeDoctorAccount, UnitTypes = new List<UnitType> { UnitType.专家组 } },
             };
@@ -271,6 +271,10 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet, List<res_
                             econDoctor = economicData.FirstOrDefault(t => t.AccountingUnit == dept.Department);
                             workDoctor = info.Data.FirstOrDefault(t => t.AccountingUnit == dept.Department);
                         }
+                        else if (UnitType.医技组 == unitType && workDoctor == null)
+                        {
+                            workDoctor = info.Data.FirstOrDefault(t => t.AccountingUnit == dept.Department && t.UnitType == UnitType.医生组.ToString());
+                        }
                         //保底绩效
                         var minimum = baiscnormList.FirstOrDefault(t => t.PositionName == dept.MinimumReference);
                         if (!string.IsNullOrEmpty(dept.MinimumReference) && minimum != null)

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

@@ -165,6 +165,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<im_a
                 var avg = resAccount.Max(t => t.Avg);
 
                 var basicRule = basicRuleList.FirstOrDefault(t => t.UnitType == (UnitType)accountbasic.UnitType);
+                if (basicRule == null) continue;
                 var empolyee = empolyeeList.FirstOrDefault(t => t.AccountType == basicRule.AccountUnitType.ToString() && t.AccountingUnit == accountbasic.DoctorAccountingUnit);
 
                 if (empolyee == null)