代码调整顺序

performance/Performance.Services/RedistributionService.cs

@@ -91,8 +91,8 @@ public SecondDetailDto Load(int secondId, ComputeMode computeMode, EmployeeSourc
 
             var allot = _perallotRepository.GetEntity(t => t.ID == second.AllotId);
             if (allot == null) throw new PerformanceException("绩效记录不存在！");
-            // 填报模板带出 行政工勤 绩效
-            var computes = _rescomputeRepository.GetEntities(w => w.AllotID == allot.ID && (w.AccountType == "行政后勤" || w.AccountType == "行政工勤"));
+            // 填报模板带出 行政工勤 绩效 
+            var computes = _rescomputeRepository.GetEntities(w => w.AllotID == allot.ID && UnitTypeUtil.Office.Contains(w.AccountType));
 
             var loads = GetWorkLoads(allot.HospitalId, second.UnitType, second.Department);
             var employees = _peremployeeRepository.GetEntities(w => w.AllotId == second.AllotId);

performance/Performance.Services/UnitTypeUtil.cs

@@ -8,6 +8,8 @@ namespace Performance.Services
 {
     public class UnitTypeUtil
     {
+        public static string[] Office = new string[] { "行政后勤", "行政工勤" };
+
         /// <summary>
         /// 是否是行政后勤/工勤
         /// </summary>
@@ -17,6 +19,7 @@ public static bool IsOffice(int? unit)
         {
             return unit == (int)UnitType.行政后勤;
         }
+
         /// <summary>
         /// 是否是行政后勤/工勤
         /// </summary>
@@ -24,7 +27,7 @@ public static bool IsOffice(int? unit)
         /// <returns></returns>
         public static bool IsOffice(string unit)
         {
-            return !string.IsNullOrEmpty(unit) && (unit == "行政后勤" || unit == "行政工勤");
+            return !string.IsNullOrEmpty(unit) && Office.Contains(unit);
         }
 
         /// <summary>
@@ -47,7 +50,7 @@ public static bool Is(string unit, params UnitType[] types)
     public class AccountTypeUnit
     {
         private static string[] dic = new string[] { "科主任", "护士长" };
-        
+
         /// <summary>
         /// 自动识别职称文本
         /// </summary>