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

performance/Performance.DtoModels/Request/DeptDetailRequest.cs

@@ -29,6 +29,11 @@ public class DeptDetailRequest
         /// 汇总ID
         /// </summary>
         public int AccountID { get; set; }
+
+        /// <summary>
+        /// 核算单元类型
+        /// </summary>
+        public int UnitType { get; set; }
     }
     public class DetailRequestValidator : AbstractValidator<DeptDetailRequest>
     {

performance/Performance.Services/ComputeService.cs

@@ -798,15 +798,15 @@ public DeptDataDetails SpecialDeptDetail(ag_secondallot second)
                     UnitType = second.UnitType,
                     AccountingUnit = second.Department,
                     //Department = second.Department,
-                    ScoringAverage = special.First().ScoringAverage.Value,
-                    OtherPerfor1 = special.First().OtherPerfor.Value,
-                    AdjustFactor = special.First().Adjust.Value,
-                    Avg = special.First().Avg,
-                    RealGiveFee = special.First().RealGiveFee,
-                    Number = special.First().Number.Value,
-                    PerforFee = special.First().GiveFee,
-                    PerforTotal = special.First().ResultsTotalFee,
-                    Income = special.First().ResultsTotalFee,
+                    ScoringAverage = special.FirstOrDefault()?.ScoringAverage ?? 0,
+                    OtherPerfor1 = special.FirstOrDefault()?.OtherPerfor ?? 0,
+                    AdjustFactor = special.FirstOrDefault()?.Adjust ?? 0,
+                    Avg = special.FirstOrDefault()?.Avg,
+                    RealGiveFee = special.FirstOrDefault()?.RealGiveFee,
+                    Number = special.FirstOrDefault()?.Number ?? 0,
+                    PerforFee = special.FirstOrDefault()?.GiveFee,
+                    PerforTotal = special.FirstOrDefault()?.ResultsTotalFee,
+                    Income = special.FirstOrDefault()?.ResultsTotalFee,
                     //Extra = special.First().Punishment.Value,
                 },
                 Detail = new List<DetailDtos>(),
@@ -849,6 +849,19 @@ public ag_secondallot GetAccountId(int secondId, out int accountId)
             return second;
         }
 
+        public ag_secondallot GetSecondByAccountId(int accountId)
+        {
+            var special = _perforResspecialunitRepository.GetEntity(t => t.ID == accountId);
+            if (special == null)
+                throw new PerformanceException("科室信息错误");
+            return new ag_secondallot
+            {
+                AllotId = special.AllotID,
+                Department = special.AccountingUnit,
+                UnitType = UnitType.特殊核算组.ToString()
+            };
+        }
+
         /// <summary>
         /// 添加额外绩效金额(基础绩效、其他绩效等)
         /// </summary>