二次分配详情

performance/Performance.Services/ComputeService.cs

@@ -766,7 +766,7 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
                     }
                     else if (sheet.SheetType == (int)SheetType.AccountAdjustLaterOtherFee)
                     {
-                        sheettype = 9;
+                        sheettype = 5;
                         amount = Math.Round(basicData.Where(t => t.SheetID == sheet.ID && t.UnitType == type && t.IsTotal == 1)?.FirstOrDefault()?.CellValue ?? 0, 0);
                     }
 

performance/Performance.Services/SecondAllotService.cs

@@ -1462,8 +1462,7 @@ public List<ag_othersource> OtherList(int secondId, int userId)
             if (second == null) throw new PerformanceException("二次绩效信息无效！");
 
             var employees = personService.GetPersons(second.AllotId.Value, userId);
-            if (employees == null || !employees.Any(t => t.UnitType == second.UnitType)) return new List<ag_othersource>();
-            employees = employees.Where(t => t.UnitType == second.UnitType).ToList();
+            employees = employees?.Where(t => t.UnitType == second.UnitType).ToList();
 
             List<ag_othersource> result = null;
             var otherSecondList = perforAgothersourceRepository.GetEntities(t => t.SecondId == secondId);
@@ -1473,6 +1472,7 @@ public List<ag_othersource> OtherList(int secondId, int userId)
             }
             else
             {
+                if (employees == null || !employees.Any(t => t.UnitType == second.UnitType)) return new List<ag_othersource>();
                 result = employees.Select(t => new ag_othersource
                 {
                     SecondId = secondId,
@@ -1545,6 +1545,8 @@ public List<ag_othersource> OtherAutoComplete(SecondEmpRequest request, int user
         /// <param name="isTitlePerformance">是否补全职称绩效</param>
         private void SupplementSecondDetail(ag_secondallot second, List<per_employee> employees, List<ag_othersource> result, bool isTitlePerformance = true)
         {
+            if (employees == null || !employees.Any(t => t.UnitType == second.UnitType)) return;
+
             // 补充医院其他绩效  及  预留比例
             var perapramounts = perapramountRepository.GetEntities(t => t.AllotId == second.AllotId);
             Func<per_employee, decimal?> getAprAmount = (t) => perapramounts