显示组

performance/Performance.Services/AllotCompute/ProcessComputService.cs

@@ -87,9 +87,6 @@ private void SaveComputeAccount(PerSheet sheet, int allotId)
             perforPerSheetRepository.Add(imsheet);
 
             var dataList = sheet.PerData.Select(t => (PerDataAccountBaisc)t);
-            if (sheet.ModuleName == "医生组临床科室单元核算表")
-                dataList = dataList.Where(t => t.UnitType == UnitType.医生组.ToString()).ToList();
-
             List<res_account> addList = new List<res_account>();
             foreach (var data in dataList)
             {

performance/Performance.Services/ComputeService.cs

@@ -95,7 +95,8 @@ public List<res_specialunit> GetSpecial(int allotId)
         /// <returns></returns>
         public List<DeptResponse> GetDoctorPerformance(int allotId)
         {
-            var list = perforResaccountRepository.GetEntities(t => t.UnitType == (int)UnitType.医生组 && t.AllotID == allotId)?.OrderByDescending(t => t.AccountingUnit);
+            List<int> types = new List<int> { (int)UnitType.医生组, (int)UnitType.医技组 };
+            var list = perforResaccountRepository.GetEntities(t => types.Contains(t.UnitType.Value) && t.AllotID == allotId)?.OrderByDescending(t => t.AccountingUnit);
             List<DeptResponse> doctor = Mapper.Map<List<DeptResponse>>(list);
             doctor?.ForEach(t => t.UnitName = ((UnitType)t.UnitType).ToString());
             return doctor;