只合并计算医生医技护士数据

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

@@ -52,7 +52,7 @@ public PerSheet MergeCompute(PerExcel excel, List<EntityModels.cof_income> incom
                         //判断是否创建头部
                         if (!isHasData && dataList != null && dataList.Count() > 0)
                             isHasData = true;
-                        foreach (var item in EnumHelper.GetItems<UnitType>().Where(t => t.Name != "专家组"))
+                        foreach (var item in EnumHelper.GetItems<UnitType>().Where(t => t.Value <= 3))
                         {
                             var group = dataList.Where(t => t.UnitType == item.Name);
 
@@ -161,7 +161,7 @@ public PerSheet OnceCompute(PerSheet sheet)
 
                     var typeClass = dataList.Where(t => header.Children.Select(s => s.CellValue).Contains(t.TypeName));
                     int pointcell = 0;
-                    foreach (var item in EnumHelper.GetItems<UnitType>().Where(t => t.Name != "专家组"))
+                    foreach (var item in EnumHelper.GetItems<UnitType>().Where(t => t.Value <= 3))
                     {
                         pointcell++;
                         var group = typeClass.Where(t => t.UnitType == item.Name);