专家

performance/Performance.DtoModels/PerExcel/ExcelEnum.cs

@@ -21,6 +21,8 @@ public enum UnitType
         护理组 = 2,
         [Description("医技组")]
         医技组 = 3,
+        [Description("专家组")]
+        专家组 = 4,
     }
 
     public enum SheetType

performance/Performance.Services/AllotCompute/ProcessComputService.cs

@@ -243,8 +243,9 @@ private List<PerSheet> MergeCompute(PerExcel excel, int allotid)
         {
             var pairs = new[]
             {
-                new { Name = "医生组临床科室单元核算表", Data = doctorWorkloadData, SheetType = SheetType.ComputeDoctorAccount, UnitTypes = new List<UnitType> { UnitType.医生组, UnitType.医技组 } },
+                new { Name = "医生组临床科室单元核算表", Data = doctorWorkloadData, SheetType = SheetType.ComputeDoctorAccount, UnitTypes = new List<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.专家组 } },
             };
             List<PerSheet> result = new List<PerSheet>();
             foreach (var info in pairs)
@@ -253,13 +254,19 @@ private List<PerSheet> MergeCompute(PerExcel excel, int allotid)
                 foreach (var unitType in info.UnitTypes)
                 {
                     var atDataList = dataList.Where(t => t.UnitType == unitType.ToString());
+                    if (atDataList == null || !atDataList.Any())
+                        continue;
                     foreach (var dept in dataList.Where(t => t.UnitType == unitType.ToString()))
                     {
                         if (string.IsNullOrEmpty(dept.AccountingUnit))
                             continue;
-
                         var econDoctor = economicData.FirstOrDefault(t => t.UnitType == unitType.ToString() && t.AccountingUnit == dept.Department);
                         var workDoctor = info.Data.FirstOrDefault(t => t.UnitType == unitType.ToString() && t.AccountingUnit == dept.Department);
+                        if (UnitType.专家组 == unitType)
+                        {
+                            econDoctor = economicData.FirstOrDefault(t => t.AccountingUnit == dept.Department);
+                            workDoctor = info.Data.FirstOrDefault(t => t.AccountingUnit == dept.Department);
+                        }
                         //保底绩效
                         var minimum = baiscnormList.FirstOrDefault(t => t.PositionName == dept.MinimumReference);
                         if (!string.IsNullOrEmpty(dept.MinimumReference) && minimum != null)
@@ -299,9 +306,11 @@ private List<PerSheet> MergeCompute(PerExcel excel, int allotid)
                             }
                         }
                     }
-
                     sheet.PerData.AddRange(atDataList);
                 }
+
+                if ("专家核算表" == info.Name && (sheet.PerData == null || sheet.PerData.Any()))
+                    continue;
                 result.Add(sheet);
             }
             return result;