科主任/护士长绩效详情添加其他管理绩效、医院奖罚

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

@@ -929,7 +929,7 @@
         </member>
         <member name="P:Performance.DtoModels.PerDataAccountBaisc.AccountingUnit">
             <summary>
-            核算单元 
+            核算单元
             </summary>
         </member>
         <member name="P:Performance.DtoModels.PerDataAccountBaisc.EmployeeName">
@@ -1037,6 +1037,11 @@
             应发管理绩效
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.PerDataAccountBaisc.OtherManagePerfor">
+            <summary>
+            其他管理绩效
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.PerDataAccountBaisc.MedicineFactor">
             <summary>
             药占比系数

performance/Performance.DtoModels/PerExcel/PerDataAccountBaisc.cs

@@ -24,7 +24,7 @@ public class PerDataAccountBaisc : IPerData
         public string UnitType { get; set; }
 
         /// <summary>
-        /// 核算单元 
+        /// 核算单元
         /// </summary>
         public string AccountingUnit { get; set; }
 
@@ -158,6 +158,11 @@ public class PerDataAccountBaisc : IPerData
         /// </summary>
         public decimal ShouldGiveFee { get; set; }
 
+        /// <summary>
+        /// 其他管理绩效
+        /// </summary>
+        public decimal OtherManagePerfor { get; set; }
+
         ///// <summary>
         ///// 保底绩效参考标准
         ///// </summary>
@@ -172,8 +177,8 @@ public class PerDataAccountBaisc : IPerData
         ///// 工作量倾斜系数
         ///// </summary>
         //public Nullable<decimal> WorkSlopeFactor { get; set; }
-        #endregion
 
+        #endregion EXCEL读取
 
         #region 由计算得出
 
@@ -227,6 +232,6 @@ public class PerDataAccountBaisc : IPerData
         /// </summary>
         public Nullable<decimal> RealGiveFee { get; set; }
 
-        #endregion
+        #endregion 由计算得出
     }
 }

performance/Performance.Services/ComputeService.cs

@@ -1262,6 +1262,8 @@ public DeptDataDetails GetDoctorDetail(int computeId)
                     EfficPerfor = resCompute.Efficiency ?? 0,   //效率绩效
                     Scale = employee.Scale ?? 0,    //规模绩效系数
                     ScalePerfor = resCompute.Scale ?? 0,    //规模绩效
+                    Extra = resCompute.Punishment ?? 0,     //医院奖罚
+                    OtherManagePerfor = resCompute.OtherManagePerfor ?? 0, //其他管理绩效
                     Management = employee.Management,//管理绩效发放系数
                     ShouldGiveFee = resCompute.ShouldGiveFee ?? 0,  //考核前管理绩效
                     ScoringAverage = resCompute.ScoreAverageRate ?? 1,  //考核得分率
@@ -1303,4 +1305,4 @@ public DeptDataDetails GetDoctorDetail(int computeId)
             return doctorDetails;
         }
     }
-}
\ No newline at end of file
+}