新增参考基数值

performance/Performance.Api/Controllers/AllotController.cs

@@ -345,15 +345,15 @@ public ApiResponse Reserved([FromBody]ReservedRequest request)
                 DecReseFee = w.DecFee * w.DecRatio,
                 DecGiveFee = w.DecFee * (1 - w.DecRatio),
 
-                TotalReseFee = w.JanFee * w.JanRatio + w.FebFee * w.FebRatio + w.MarFee * w.MarRatio
-                           + w.AprFee * w.AprRatio + w.MayFee * w.MayRatio + w.JunFee * w.JunRatio
-                           + w.JulFee * w.JulRatio + w.AugFee * w.AugRatio + w.SepFee * w.SepRatio
-                           + w.OctFee * w.OctRatio + w.NovFee * w.NovRatio + w.DecFee * w.DecRatio,
-
-                TotalGiveFee = w.JanFee * (1 - w.JanRatio) + w.FebFee * (1 - w.FebRatio) + w.MarFee * (1 - w.MarRatio)
-                           + w.AprFee * (1 - w.AprRatio) + w.MayFee * (1 - w.MayRatio) + w.JunFee * (1 - w.JunRatio)
-                           + w.JulFee * (1 - w.JulRatio) + w.AugFee * (1 - w.AugRatio) + w.SepFee * (1 - w.SepRatio)
-                           + w.OctFee * (1 - w.OctRatio) + w.NovFee * (1 - w.NovRatio) + w.DecFee * (1 - w.DecRatio),
+                TotalReseFee = (w.JanFee * w.JanRatio ?? 0) + (w.FebFee * w.FebRatio ?? 0) + (w.MarFee * w.MarRatio ?? 0)
+                             + (w.AprFee * w.AprRatio ?? 0) + (w.MayFee * w.MayRatio ?? 0) + (w.JunFee * w.JunRatio ?? 0)
+                             + (w.JulFee * w.JulRatio ?? 0) + (w.AugFee * w.AugRatio ?? 0) + (w.SepFee * w.SepRatio ?? 0)
+                             + (w.OctFee * w.OctRatio ?? 0) + (w.NovFee * w.NovRatio ?? 0) + (w.DecFee * w.DecRatio ?? 0),
+
+                TotalGiveFee = (w.JanFee * (1 - w.JanRatio) ?? 0) + (w.FebFee * (1 - w.FebRatio) ?? 0) + (w.MarFee * (1 - w.MarRatio) ?? 0)
+                             + (w.AprFee * (1 - w.AprRatio) ?? 0) + (w.MayFee * (1 - w.MayRatio) ?? 0) + (w.JunFee * (1 - w.JunRatio) ?? 0)
+                             + (w.JulFee * (1 - w.JulRatio) ?? 0) + (w.AugFee * (1 - w.AugRatio) ?? 0) + (w.SepFee * (1 - w.SepRatio) ?? 0)
+                             + (w.OctFee * (1 - w.OctRatio) ?? 0) + (w.NovFee * (1 - w.NovRatio) ?? 0) + (w.DecFee * (1 - w.DecRatio) ?? 0),
             });
             #endregion
 

performance/Performance.DtoModels/Response/ResComputeResponse.cs

@@ -30,6 +30,8 @@ public class ResComputeResponse
         /// 绩效基数核算参考对象
         /// </summary>
         public string FitPeople { get; set; }
+        public string FitPeopleValue { get; set; }
+        public string FitPeopleRatio { get; set; }
 
         /// <summary>
         /// 人员姓名

performance/Performance.EntityModels/Entity/res_compute.cs

@@ -50,7 +50,9 @@ public class res_compute
         /// 绩效基数核算参考对象
         /// </summary>
         public string FitPeople { get; set; }
-    
+        public string FitPeopleValue { get; set; }
+        public string FitPeopleRatio { get; set; }
+
         /// <summary>
         /// 人员姓名
         /// </summary>

performance/Performance.Services/AllotService.cs

@@ -539,13 +539,16 @@ public List<res_reserved> GetReserved(int hospitalId, int year, int userid)
 
             var reserveds = perforresreservedRepository.GetEntities(w => w.HospitalId == hospitalId && w.Year == year);
 
-            if (role.Value == options.Value.NurseRole)
-                reserveds = reserveds.Where(w => w.UnitType.Contains(UnitType.护理组.ToString()) && w.AccountingUnit == user.Department)?.ToList();
-            else if (role.Value == options.Value.DirectorRole)
-                reserveds = reserveds.Where(w => (w.UnitType.Contains(UnitType.医生组.ToString()) || w.UnitType.Contains(UnitType.医技组.ToString())) && w.AccountingUnit == user.Department)?.ToList();
-            else if (role.Value == options.Value.SpecialRole)
-                reserveds = reserveds.Where(w => w.UnitType.Contains(UnitType.特殊核算组.ToString()) && w.AccountingUnit == user.Department)?.ToList();
+            if (reserveds != null && reserveds.Any())
+            {
+                if (role.Value == options.Value.NurseRole)
+                    reserveds = reserveds.Where(w => w.UnitType.Contains(UnitType.护理组.ToString()) && w.AccountingUnit == user.Department)?.ToList();
+                else if (role.Value == options.Value.DirectorRole)
+                    reserveds = reserveds.Where(w => (w.UnitType.Contains(UnitType.医生组.ToString()) || w.UnitType.Contains(UnitType.医技组.ToString())) && w.AccountingUnit == user.Department)?.ToList();
+                else if (role.Value == options.Value.SpecialRole)
+                    reserveds = reserveds.Where(w => w.UnitType.Contains(UnitType.特殊核算组.ToString()) && w.AccountingUnit == user.Department)?.ToList();
 
+            }
 
             return reserveds;
         }