科室详情工作量修改

performance/Performance.Services/ComputeService.cs

@@ -751,20 +751,22 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
 
                     if (sheet.SheetType == (int)SheetType.Workload)
                     {
+                        if ((sheetName.Contains("医生") && account.UnitType == (int)UnitType.护理组) || (sheetName.Contains("护理") && account.UnitType != (int)UnitType.护理组)) continue;
+
+
+
                         var workitems = cofworkitemRepository.GetEntities(t => t.AllotID == account.AllotID);
                         var allotCmi = cofcmiRepository.GetEntity(t => t.AllotId == account.AllotID && t.UnitType == account.UnitType && t.AccountingUnit == account.AccountingUnit);
 
                         foreach (var dto in items)
                         {
-                            foreach (var name in items.GroupBy(t => t.ItemName))
-                            {
-                                if (workitems != null && workitems.Any(a => a.Type == 1 && a.Item == name.Key))
+                            if (workitems != null && workitems.Any(a => a.Type == 1 && a.Item == dto.ItemName))
                                 dto.MediFactor = account.MedicineFactor;
-                                if (workitems != null && workitems.Any(a => a.Type == 2 && a.Item == name.Key) && allotCmi != null)
+                            if (workitems != null && workitems.Any(a => a.Type == 2 && a.Item == dto.ItemName) && allotCmi != null)
+                                dto.CMIFactor = allotCmi.Value;
                             dto.ItemValue = dto.ItemValue * (dto.MediFactor ?? 1) * (dto.CMIFactor ?? 1);
                         }
                     }
-                    }
 
                     if (sheet.SheetType == (int)SheetType.OtherIncome)
                         items = items.Where(t => (t.ItemValue ?? 0) != 0).ToList();