新增参考值显示

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

@@ -453,6 +453,16 @@
             绩效基数核算参考对象
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.ComputeResult.FitPeopleValue">
+            <summary>
+            绩效基础核算参考值
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.ComputeResult.FitPeopleRatio">
+            <summary>
+            绩效基数核算参考对象取值比例（如临床科室护士*95%）
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.ComputeResult.EmployeeName">
             <summary>
             人员姓名

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

@@ -757,6 +757,16 @@
             实发绩效工资金额
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.ag_othersource.ReservedRatio">
+            <summary>
+            预留比例
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.ag_othersource.ReservedAmount">
+            <summary>
+            预留金额
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.ag_secondallot">
             <summary>
             二次绩效列表
@@ -4337,6 +4347,16 @@
             绩效基数核算参考对象
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.res_compute.FitPeopleValue">
+            <summary>
+            绩效基础核算参考值
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.res_compute.FitPeopleRatio">
+            <summary>
+            绩效基数核算参考对象取值比例（如临床科室护士*95%）
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.res_compute.EmployeeName">
             <summary>
             人员姓名

performance/Performance.DtoModels/PerExcel/ComputeResult.cs

@@ -21,6 +21,16 @@ public class ComputeResult
         public string FitPeople { get; set; }
 
         /// <summary>
+        /// 绩效基础核算参考值
+        /// </summary>
+        public Nullable<decimal> FitPeopleValue { get; set; }
+
+        /// <summary>
+        /// 绩效基数核算参考对象取值比例（如临床科室护士*95%）
+        /// </summary>
+        public Nullable<decimal> FitPeopleRatio { get; set; }
+
+        /// <summary>
         /// 人员姓名
         /// </summary>
         public string EmployeeName { get; set; }

performance/Performance.EntityModels/Entity/res_compute.cs

@@ -50,8 +50,16 @@ public class res_compute
         /// 绩效基数核算参考对象
         /// </summary>
         public string FitPeople { get; set; }
-        public string FitPeopleValue { get; set; }
-        public string FitPeopleRatio { get; set; }
+
+        /// <summary>
+        /// 绩效基础核算参考值
+        /// </summary>
+        public Nullable<decimal> FitPeopleValue { get; set; }
+
+        /// <summary>
+        /// 绩效基数核算参考对象取值比例（如临床科室护士*95%）
+        /// </summary>
+        public Nullable<decimal> FitPeopleRatio { get; set; }
 
         /// <summary>
         /// 人员姓名

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

@@ -371,6 +371,8 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<PerS
                         AccountType = basicRule.AccountUnitType.ToString(),
                         EmployeeName = empolyee.DoctorName,
                         FitPeople = empolyee.FitPeople,
+                        FitPeopleRatio = empolyee.FitPeopleRatio,
+                        FitPeopleValue = empolyee.FitPeopleValue,
                         JobTitle = empolyee.JobTitle,
                         JobNumber = empolyee.JobNumber,
 
@@ -457,6 +459,8 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, per_allot
                         AccountingUnit = item.AccountingUnit,
                         EmployeeName = item.DoctorName,
                         FitPeople = item.FitPeople,
+                        FitPeopleRatio = item.FitPeopleRatio,
+                        FitPeopleValue = item.FitPeopleValue,
                         Grant = isBudget ? grant : (item.Management ?? 1),
                         //WorkTime = item.WorkTime,
                         PostCoefficient = item.PostCoefficient,