科室详情，医技组工作量取值条件更改为“医生组，医技组”

performance/Performance.Services/ComputeService.cs

@@ -7,6 +7,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Expressions;
 using System.Text;
 using System.Text.RegularExpressions;
 
@@ -893,15 +894,20 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
 
         private List<DetailModule> CommonDetailItems(List<im_data> basicData, List<im_header> headers, per_sheet sheet, UnitType type)
         {
-            var items = basicData
-                .Where(t => t.SheetID == sheet.ID && t.UnitType == (int)type && t.IsTotal != 1)
-                ?.Select(t => new DetailModule
-                {
-                    ItemName = t.TypeName,
-                    CellValue = t.CellValue,
-                    Factor = sheet.SheetType == (int)SheetType.Workload ? t.FactorValue : t.FactorValue * 100,
-                    ItemValue = t.IsFactor == 1 ? (t.CellValue * (t.FactorValue ?? 0)) : t.CellValue,
-                }).ToList();
+            Expression<Func<im_data, bool>> exp = (t) => t.SheetID == sheet.ID && t.IsTotal != 1;
+
+            if (sheet.SheetType == (int)SheetType.Workload && new int[] { (int)UnitType.医技组, (int)UnitType.其他医技组 }.Contains((int)type))
+                exp = exp.And(t => new int[] { (int)UnitType.医生组, (int)UnitType.医技组, (int)UnitType.其他医技组 }.Contains(t.UnitType.Value));
+            else
+                exp = exp.And(t => t.UnitType == (int)type);
+
+            var items = basicData.Where(exp.Compile())?.Select(t => new DetailModule
+            {
+                ItemName = t.TypeName,
+                CellValue = t.CellValue,
+                Factor = sheet.SheetType == (int)SheetType.Workload ? t.FactorValue : t.FactorValue * 100,
+                ItemValue = t.IsFactor == 1 ? (t.CellValue * (t.FactorValue ?? 0)) : t.CellValue,
+            }).ToList();
 
             if (items != null && items.Any())
             {