东方细节调整

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

@@ -373,6 +373,11 @@
             核算基数
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.ComputeEmployee.OtherManagePerfor">
+            <summary>
+            其他管理绩效
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.ComputeEmployee.DoctorName">
             <summary>
             医生姓名
@@ -538,6 +543,11 @@
             医院奖罚 来自5.2
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.ComputeResult.OtherManagePerfor">
+            <summary>
+            医院奖罚 来自5.2
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.ComputeResult.OtherPerfor">
             <summary>
             其他绩效(来自人员名单)
@@ -965,7 +975,7 @@
             出勤率
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.PerDataClinicEmployee.OtheManagementPerfor">
+        <member name="P:Performance.DtoModels.PerDataClinicEmployee.OtherManagePerfor">
             <summary>
             其他管理绩效
             </summary>
@@ -2809,6 +2819,11 @@
             规模绩效(需计算)
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.ResComputeResponse.OtherManagePerfor">
+            <summary>
+            其他管理绩效
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.ResComputeResponse.PostCoefficient">
             <summary>
             岗位系数

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

@@ -2367,6 +2367,11 @@
             管理绩效发放系数
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.im_employee_clinic.OtherManagePerfor">
+            <summary>
+            其他管理绩效
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.im_employee_clinic.ScoreAverageRate">
             <summary>
             考核得分率

performance/Performance.DtoModels/PerExcel/ComputeEmployee.cs

@@ -42,6 +42,11 @@ public class ComputeEmployee
         public Nullable<decimal> BasicNorm { get; set; }
 
         /// <summary>
+        /// 其他管理绩效
+        /// </summary>
+        public Nullable<decimal> OtherManagePerfor { get; set; }
+
+        /// <summary>
         /// 医生姓名
         /// </summary>
         public string DoctorName { get; set; }

performance/Performance.DtoModels/PerExcel/ComputeResult.cs

@@ -96,6 +96,11 @@ public class ComputeResult
         public Nullable<decimal> Punishment { get; set; }
 
         /// <summary>
+        /// 医院奖罚 来自5.2
+        /// </summary>
+        public Nullable<decimal> OtherManagePerfor { get; set; }
+
+        /// <summary>
         /// 其他绩效(来自人员名单)
         /// </summary>
         public Nullable<decimal> OtherPerfor { get; set; }

performance/Performance.DtoModels/PerExcel/PerDataClinicEmployee.cs

@@ -89,7 +89,7 @@ public class PerDataClinicEmployee : IPerData
         /// <summary>
         /// 其他管理绩效
         /// </summary>
-        public Nullable<decimal> OtheManagementPerfor { get; set; }
+        public Nullable<decimal> OtherManagePerfor { get; set; }
 
         /// <summary>
         /// 其他绩效

performance/Performance.DtoModels/Response/ResComputeResponse.cs

@@ -74,6 +74,11 @@ public class ResComputeResponse
         public Nullable<decimal> Scale { get; set; }
 
         /// <summary>
+        /// 其他管理绩效
+        /// </summary>
+        public Nullable<decimal> OtherManagePerfor { get; set; }
+
+        /// <summary>
         /// 岗位系数
         /// </summary>
         public Nullable<decimal> PostCoefficient { get; set; }

performance/Performance.EntityModels/Entity/im_employee_clinic.cs

@@ -102,6 +102,11 @@ public class im_employee_clinic
         public Nullable<decimal> Management { get; set; }
 
         /// <summary>
+        /// 其他管理绩效
+        /// </summary>
+        public Nullable<decimal> OtherManagePerfor { get; set; }
+
+        /// <summary>
         /// 考核得分率
         /// </summary>
         public Nullable<decimal> ScoreAverageRate { get; set; }

performance/Performance.Services/AllotCompute/ResultComputeService.cs

@@ -194,7 +194,7 @@ public class ResultComputeService : IAutoInjection
                         QuantitativeFee = item.Quantity * item.QuantitativeIndicatorsValue * headcount,
                         //ScoringAverage = scoreAverage.HasValue ? scoreAverage : dept?.ScoringAverage, 
                         ScoringAverage = dept?.ScoringAverage,
-                        //OtherPerfor = dept?.OtherPerfor,
+                        OtherPerfor = dept?.OtherPerfor1,
                         Punishment = (extra ?? 0),
                         MedicineExtra = (drugExtra ?? 0),
                         MaterialsExtra = (materialsExtra ?? 0),

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

@@ -381,7 +381,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<PerS
 
                         ScoreAverageRate = empolyee.ScoreAverageRate,
                         OtherPerfor = empolyee.OtherPerfor,
-
+                        OtherManagePerfor = empolyee.OtherManagePerfor ?? 0,
                         Number = resAccount.ManagerNumber + resAccount.Number,
                         PerforTotal = resAccount.PerforTotal,
                         Avg = avg,
@@ -403,7 +403,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<PerS
 
                     compute.Punishment = extra ?? 0;
                     //应发管理绩效
-                    compute.ShouldGiveFee = Math.Round((compute.Efficiency + compute.Scale) * (compute.Grant ?? 0) ?? 0);
+                    compute.ShouldGiveFee = Math.Round((compute.Efficiency + compute.Scale + compute.OtherManagePerfor) * (compute.Grant ?? 0) ?? 0);
                     //绩效合计
                     compute.PerforSumFee = Math.Round((compute.Avg * (empolyee.Basics ?? 0)) + compute.ShouldGiveFee ?? 0);
                     //应发绩效

performance/Performance.Services/PerExcelService/ExcelReadConfig.cs

@@ -42,7 +42,7 @@ public class ExcelReadConfig
             new ColumnInfo(nameof(PerDataClinicEmployee.Management), "管理绩效发放系数", true),
             new ColumnInfo(nameof(PerDataClinicEmployee.ScoreAverageRate), "考核得分率", true),
             new ColumnInfo(nameof(PerDataClinicEmployee.Attendance), "出勤率", true),
-            new ColumnInfo(nameof(PerDataClinicEmployee.OtheManagementPerfor), "其他管理绩效"),
+            new ColumnInfo(nameof(PerDataClinicEmployee.OtherManagePerfor), "其他管理绩效"),
             new ColumnInfo(nameof(PerDataClinicEmployee.OthePerfor), "其他绩效"),
             //new ColumnInfo(nameof(PerDataClinicEmployee.NightWorkPerfor), "夜班费"),
             new ColumnInfo(nameof(PerDataClinicEmployee.Adjust), "调节系数", true),