Merge remote-tracking branch 'origin/develop' into develop

performance/Performance.Services/ComputeService.cs

@@ -966,7 +966,7 @@ private List<ComputeResponse> GetAllotPerformance(int allotId, int hospitalId, i
 
             return allot?.Select(t =>
             {
-                var comp = new ComputeResponse("一次绩效", t.AccountingUnit, t.EmployeeName, t.JobNumber, t.JobTitle);
+                var comp = new ComputeResponse("一次绩效", t.AccountingUnit, t.EmployeeName, t.JobNumber, t.JobTitle??"");
                 comp.UnitType = t.AccountType;
                 comp.Adjust = t.Adjust;
                 comp.AdjustLaterOtherFee = t.AdjustLaterOtherFee;
@@ -1029,7 +1029,7 @@ private List<ComputeResponse> GetSecondPerformance(int allotId)
                 .GroupBy(t => new { t.UnitType, t.Department, t.WorkPost, t.JobNumber, t.PersonName })
                 .Select(t =>
                 {
-                    var comp = new ComputeResponse("二次绩效", t.Key.Department, t.Key.PersonName, t.Key.JobNumber, t.Key.WorkPost);
+                    var comp = new ComputeResponse("二次绩效", t.Key.Department, t.Key.PersonName, t.Key.JobNumber, t.Key.WorkPost??"");
                     comp.UnitType = t.Key.UnitType;
                     comp.PerforSumFee = t.Sum(g => g.PerforSumFee);
                     comp.NightWorkPerfor = t.Sum(g => g.NightWorkPerfor);