医技科室详情奖罚BUG修复

performance/Performance.Services/AllotCompute/ProcessComputService.cs

@@ -403,7 +403,6 @@ public IEnumerable<AccountUnitTotal> GetAccountExtra(PerExcel excel, SheetType s
             assessList = (isTotal)
                 ? assessList?.Where(w => w.IsTotal == 1)
                 : assessList?.Where(w => w.IsTotal != 1);
-
             return assessList?.Select(t => new EmpolyeeTotal
             {
                 UnitType = t.UnitType,

performance/Performance.Services/AllotService.cs

@@ -352,7 +352,7 @@ public void Generate(per_allot allot, string mail)
 
                 // 科室奖罚汇总
                 logManageService.WriteMsg("正在生成绩效", "科室奖罚汇总", 1, allot.ID, "ReceiveMessage", true);
-                var accountExtras = processComputService.GetAccountExtra(excel, SheetType.AccountExtra);
+                var accountExtras = processComputService.GetAccountExtra(excel, SheetType.AccountExtra, true);
                 // 科室药占比考核
                 logManageService.WriteMsg("正在生成绩效", "科室药占比考核", 1, allot.ID, "ReceiveMessage", true);
                 var drugExtras = processComputService.GetAccountExtra(excel, SheetType.AccountDrugAssess, true);

performance/Performance.Services/ComputeService.cs

@@ -714,7 +714,7 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
             };
             foreach (var stype in sheetType)
             {
-                if (type == 3 && stype == (int)SheetType.Workload) type = 1;
+                //if (type == 3 && stype == (int)SheetType.Workload) type = 1;
                 foreach (var sheet in persheet.Where(t => t.SheetType == stype))
                 {
                     if (single != "" && sheet.SheetName.Substring(0, 3) != single)
@@ -722,6 +722,7 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
                     single = sheet.SheetName.Substring(0, 3);
 
                     var sheetName = reg.Replace(sheet.SheetName, "", 5).Replace(".", "").Replace(" ", "");
+                    //var nType = (stype == (int)SheetType.Workload) ? 1 : type; 
                     var sheetData = basicData.Where(t => t.SheetID == sheet.ID && t.UnitType == type && t.IsTotal != 1).ToList();
                     if (sheetData == null || !sheetData.Any()) continue;