修改一半

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

@@ -550,11 +550,6 @@
             工号
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.ComputeResult.IncludeAvgCalculate">
-            <summary>
-            是否带入平均计算 是 否
-            </summary>
-        </member>
         <member name="T:Performance.DtoModels.UnitType">
             <summary> 核算单元类型 </summary>
         </member>
@@ -729,11 +724,6 @@
             科室名称
             </summary>
         </member>
-        <member name="P:Performance.DtoModels.PerDataAccountBaisc.IncludeAvgCalculate">
-            <summary>
-            是否带入平均计算 是 否
-            </summary>
-        </member>
         <member name="P:Performance.DtoModels.PerDataAccountBaisc.PermanentStaff">
             <summary>
             定科人数

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

@@ -1393,11 +1393,6 @@
             科室
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.im_accountbasic.IncludeAvgCalculate">
-            <summary>
-            是否带入平均计算 是 否
-            </summary>
-        </member>
         <member name="P:Performance.EntityModels.im_accountbasic.PermanentStaff">
             <summary>
             定科人数
@@ -2518,11 +2513,6 @@
             科室
             </summary>
         </member>
-        <member name="P:Performance.EntityModels.res_account.IncludeAvgCalculate">
-            <summary>
-            是否带入平均计算 是 否
-            </summary>
-        </member>
         <member name="P:Performance.EntityModels.res_account.PermanentStaff">
             <summary>
             定科人数

performance/Performance.DtoModels/PerExcel/ComputeEmployee.cs

@@ -52,6 +52,11 @@ public class ComputeEmployee
         public string JobNumber { get; set; }
 
         /// <summary>
+        /// 基础绩效系数
+        /// </summary>
+        public Nullable<decimal> Basics { get; set; }
+
+        /// <summary>
         /// 岗位系数
         /// </summary>
         public Nullable<decimal> PostCoefficient { get; set; }

performance/Performance.DtoModels/PerExcel/PerDataClinicEmployee.cs

@@ -37,6 +37,11 @@ public class PerDataClinicEmployee : IPerData
         public string JobTitle { get; set; }
 
         /// <summary>
+        /// 基础绩效系数
+        /// </summary>
+        public Nullable<decimal> Basics { get; set; }
+
+        /// <summary>
         /// 岗位系数
         /// </summary>
         public Nullable<decimal> PostCoefficient { get; set; }

performance/Performance.EntityModels/Entity/im_employee_clinic.cs

@@ -65,7 +65,12 @@ public class im_employee_clinic
         /// 职称
         /// </summary>
         public string JobTitle { get; set; }
-    
+
+        /// <summary>
+        /// 基础绩效系数
+        /// </summary>
+        public Nullable<decimal> Basics { get; set; }
+
         /// <summary>
         /// 岗位系数
         /// </summary>

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

@@ -297,7 +297,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<im_a
             {
                 var empolyees = empolyeeList.Where(w => w.DoctorName == emp.DoctorName && w.JobNumber == emp.JobNumber);
                 foreach (var empolyee in empolyees)
-                { 
+                {
                     var resAccount = dataList.FirstOrDefault(t => ((UnitType)t.UnitType).ToString() == empolyee.UnitType && t.AccountingUnit == empolyee.AccountingUnit);
                     if (resAccount == null) continue;
 
@@ -336,7 +336,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<im_a
                     //应发管理绩效
                     compute.ShouldGiveFee = (compute.Efficiency + compute.Scale) * (empolyee.Management ?? 0);
                     //绩效合计
-                    compute.PerforSumFee = compute.Avg + compute.ShouldGiveFee;
+                    compute.PerforSumFee = (compute.Avg * (empolyee.Basics ?? 0)) + compute.ShouldGiveFee;
                     //应发绩效
                     compute.GiveFee = compute.PerforSumFee;
                     //实发绩效
@@ -349,7 +349,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<im_a
             }
             return computeList;
         }
-        
+
         /// <summary>
         /// 院领导、业务中层、工勤人员 计算
         /// </summary>

performance/Performance.Services/PerExcelService/SheetDataRead/PerSheetDataReadClinicEmployee.cs

-using System;
+using NPOI.SS.UserModel;
+using Performance.DtoModels;
+using Performance.Infrastructure;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using NPOI.SS.UserModel;
-using Performance.DtoModels;
-using Performance.Infrastructure;
 
 namespace Performance.Services
 {
@@ -36,6 +36,7 @@ public List<IPerData> ReadData(ISheet sheet, List<PerHeader> perHeader)
                     PersonnelNumber = row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "人员工号").PointCell)?.StringCellValue,
                     DoctorName = row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "医生姓名").PointCell)?.StringCellValue,
                     JobTitle = row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "职称").PointCell)?.StringCellValue,
+                    Basics = ConvertHelper.To<decimal?>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "岗位系数").PointCell)?.NumericCellValue),
                     PostCoefficient = ConvertHelper.To<decimal?>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "岗位系数").PointCell)?.NumericCellValue),
                     Efficiency = ConvertHelper.To<decimal?>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "效率绩效系数").PointCell)?.NumericCellValue),
                     Scale = ConvertHelper.To<decimal?>(row.GetCell(perHeader.FirstOrDefault(p => p.CellValue == "规模绩效系数").PointCell)?.NumericCellValue),