可空允许

performance/Performance.Api/wwwroot/Performance.Api.xml

@@ -701,14 +701,14 @@
         </member>
         <member name="M:Performance.Api.Controllers.EmployeeController.GetAprGroupList(Performance.EntityModels.per_apr_amount)">
             <summary>
-            获取人员补充绩效列表
+            医院其他绩效审核
             </summary>
             <param name="request"></param>
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.EmployeeController.GetAprDetail(Performance.EntityModels.per_apr_amount)">
             <summary>
-            获取人员补充绩效列表
+            医院其他绩效审核详情
             </summary>
             <param name="request"></param>
             <returns></returns>

performance/Performance.Services/AllotCompute/BaiscNormService.cs

@@ -31,7 +31,7 @@ public List<res_baiscnorm> ComputeAvg(List<res_baiscnorm> baiscnormList, List<Co
             foreach (var item in keyList)
             {
                 var count = computeEmployees?.Where(t => t.UnitType == item.UnitType.ToString()).Sum(t => t.Basics) ?? 0;
-                var dataList = computes.Where(t => t.UnitType == item.UnitType.ToString());
+                var dataList = computes?.Where(t => t.UnitType == item.UnitType.ToString());
                 var baiscnorm = new res_baiscnorm
                 {
                     PositionName = EnumHelper.GetDescription(item.Reference),
@@ -59,16 +59,16 @@ public List<res_baiscnorm> ComputeOtherAvg(List<res_baiscnorm> baiscnormList, Li
 
             foreach (var item in keyList)
             {
-                var count = empolyeeList.Count(t => t.AccountType == item.type.ToString());
+                var count = empolyeeList?.Count(t => t.AccountType == item.type.ToString())??0;
                 if (count > 0)
                 {
-                    var dataList = computes.Where(t => t.AccountType == item.type.ToString());
+                    var dataList = computes?.Where(t => t.AccountType == item.type.ToString());
                     var baiscnorm = new res_baiscnorm
                     {
                         PositionName = EnumHelper.GetDescription(item.reference),
                         TotelNumber = count,
-                        TotelValue = count == 0 ? 0 : dataList.Sum(t => t.GiveFee),
-                        AvgValue = Math.Round((dataList.Sum(t => t.GiveFee) / count) ?? 0)
+                        TotelValue = count == 0 ? 0 : dataList?.Sum(t => t.GiveFee),
+                        AvgValue = Math.Round((dataList?.Sum(t => t.GiveFee) / count) ?? 0)
                     };
                     baiscnormList.Add(baiscnorm);
                 }
@@ -92,16 +92,16 @@ public List<res_baiscnorm> ComputeOtherAvg(List<res_baiscnorm> baiscnormList, Li
 
             foreach (var item in keyList)
             {
-                var count = empolyeeList.Count(t => t.AccountType == item.type.ToString());
+                var count = empolyeeList?.Count(t => t.AccountType == item.type.ToString()) ?? 0;
                 if (count > 0)
                 {
-                    var dataList = computes.Where(t => t.AccountType == item.type.ToString());
+                    var dataList = computes?.Where(t => t.AccountType == item.type.ToString());
                     var baiscnorm = new res_baiscnorm
                     {
                         PositionName = EnumHelper.GetDescription(item.reference),
                         TotelNumber = count,
-                        TotelValue = dataList.Sum(t => t.GiveFee),
-                        AvgValue = count == 0 ? 0 : Math.Round((dataList.Sum(t => t.GiveFee) / count) ?? 0)
+                        TotelValue = dataList?.Sum(t => t.GiveFee),
+                        AvgValue = count == 0 ? 0 : Math.Round((dataList?.Sum(t => t.GiveFee) / count) ?? 0)
                     };
                     baiscnormList.Add(baiscnorm);
                 }

performance/Performance.Services/PerExcelService/ComputeEmpolyee/ComputeDirector.cs

@@ -448,6 +448,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, per_allot
             //var workyearList = perforCofworkyearRepository.GetEntities(t => t.AllotID == allot.ID);
 
             List<ComputeResult> computeList = new List<ComputeResult>();
+            if (empolyeeList == null) return computeList;
 
             List<string> involves = new List<string>
             {