原始数据修改列、系数、值

performance/Performance.Api/Controllers/OriginalController.cs

@@ -4,6 +4,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Performance.DtoModels;
+using Performance.Services;
 
 namespace Performance.Api.Controllers
 {
@@ -14,6 +15,29 @@ namespace Performance.Api.Controllers
     [ApiController]
     public class OriginalController : Controller
     {
+        private readonly ClaimService claim;
+        private readonly OriginalService originalService;
+
+        public OriginalController(ClaimService claim,
+            OriginalService originalService)
+        {
+            this.claim = claim;
+            this.originalService = originalService;
+        }
+
+        /// <summary>
+        /// 修改factor数据
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("factor")]
+        [HttpPost]
+        public ApiResponse FactorEdit([FromBody] OriginalRequest request)
+        {
+            var result = originalService.EditFactorData(claim.GetUserId(), request);
+            return result ? new ApiResponse(ResponseType.OK, "修改成功") : new ApiResponse(ResponseType.Fail, "修改失败");
+        }
+
         /// <summary>
         /// 修改header数据
         /// </summary>
@@ -23,7 +47,8 @@ public class OriginalController : Controller
         [HttpPost]
         public ApiResponse HeaderEdit([FromBody] OriginalRequest request)
         {
-            return new ApiResponse(ResponseType.OK);
+            var result = originalService.EditHeaderData(claim.GetUserId(), request);
+            return result ? new ApiResponse(ResponseType.OK, "修改成功") : new ApiResponse(ResponseType.Fail, "修改失败");
         }
 
         /// <summary>
@@ -34,7 +59,8 @@ public ApiResponse HeaderEdit([FromBody] OriginalRequest request)
         [HttpPost]
         public ApiResponse SheetEdit([FromBody] OriginalRequest request)
         {
-            return new ApiResponse(ResponseType.OK);
+            var result = originalService.EditSheetData(claim.GetUserId(), request);
+            return result ? new ApiResponse(ResponseType.OK, "修改成功") : new ApiResponse(ResponseType.Fail, "修改失败");
         }
     }
 }

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

@@ -200,6 +200,13 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.AllotController.UpdateAllotShowFormula(Performance.DtoModels.AllotRequest)">
+            <summary>
+            绩效详情计算公式显示/隐藏
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.BudgetController.Query(Performance.DtoModels.Request.BudgetRequest)">
             <summary>
             预算管理查询（包含金额、占比）
@@ -509,6 +516,13 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.EmployeeController.Audit(System.Int32)">
+            <summary>
+            人事科修改参数后提交
+            </summary>
+            <param name="allotid"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.GuaranteeController.Guarantee(Performance.DtoModels.GuaranteeRequest)">
             <summary>
             保底绩效配置列表
@@ -694,6 +708,24 @@
             </summary>
             <returns></returns>
         </member>
+        <member name="T:Performance.Api.Controllers.OriginalController">
+            <summary>
+            原始数据修改
+            </summary>
+        </member>
+        <member name="M:Performance.Api.Controllers.OriginalController.HeaderEdit(Performance.DtoModels.OriginalRequest)">
+            <summary>
+            修改header数据
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.OriginalController.SheetEdit(Performance.DtoModels.OriginalRequest)">
+            <summary>
+            修改sheet数据
+            </summary>
+            <returns></returns>
+        </member>
         <member name="T:Performance.Api.Controllers.ReportController">
             <summary>
             报表

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

@@ -1715,6 +1715,11 @@
             是否开启药占比系数 1 启用 2 禁用
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.HospitalRequest.IsShowManage">
+            <summary>
+            是否显示绩效合计 1 显示绩效合计 2 显示管理绩效
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.IncomeRequest.SheetNameKeyword">
             <summary>
             关键字匹配
@@ -2081,6 +2086,16 @@
             3 提取数据
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.AllotResponse.Generate">
+            <summary>
+            1、人事科提交重新生成
+            </summary>
+        </member>
+        <member name="P:Performance.DtoModels.AllotResponse.ShowFormula">
+            <summary>
+            0 不显示 1 显示
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.AssessDataResponse.AssessID">
             <summary>
             考核类别ID
@@ -2307,6 +2322,9 @@
         <member name="P:Performance.DtoModels.DeptDataDetails.Detail">
             <summary> 收入明细 </summary>
         </member>
+        <member name="P:Performance.DtoModels.DeptDataDetails.ShowFormula">
+            <summary> 0 不显示 1 显示 </summary>
+        </member>
         <member name="P:Performance.DtoModels.DetailDtos.ItemName">
             <summary> 收入项名称 </summary>
         </member>
@@ -2820,6 +2838,11 @@
             单元格注释
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.Cell.FieldName">
+            <summary>
+            数据库字段名称
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.SheetResponse.SheetID">
             <summary>
             SheetID

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

@@ -2497,7 +2497,12 @@
         </member>
         <member name="P:Performance.EntityModels.per_allot.Generate">
             <summary>
-            1、人事科提交重新生成 2、生成成功
+            1、人事科提交重新生成
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.per_allot.ShowFormula">
+            <summary>
+            0 不显示 1 显示
             </summary>
         </member>
         <member name="T:Performance.EntityModels.per_budget_amount">
@@ -4015,6 +4020,11 @@
             是否开启规模/效率绩效 1 启用 2 禁用
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.sys_hospital.IsShowManage">
+            <summary>
+            是否显示绩效合计 1 显示绩效合计 2 显示管理绩效
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.sys_hospitalconfig">
             <summary>
             

performance/Performance.DtoModels/PerExcel/PerSheetHeader.cs

@@ -8,25 +8,63 @@ namespace Performance.DtoModels
     public class PerSheetHeader
     {
         // Tuple Items: 列明, 字段名, mergeRow, mergeCell, isTotal, isNumValue, 是否含有%
-        public static List<(string, Func<im_employee, object>, int, int, bool, bool, bool)> employeeHeaders =
-                    new List<(string, Func<im_employee, object>, int, int, bool, bool, bool)>
+        public static List<(string, Func<im_employee, object>, int, int, bool, bool, bool, string)> employeeHeaders =
+            new List<(string, Func<im_employee, object>, int, int, bool, bool, bool, string)>
             {
-                        ("核算单元类型", (t) => t.AccountType, 1, 1, false, false, false),
-                        ("核算单元", (t) => t.AccountingUnit, 1, 1, false, false, false),
-                        ("人员工号", (t) => t.PersonnelNumber, 1, 1, false, false, false),
-                        ("医生姓名", (t) => t.DoctorName, 1, 1, false, false, false),
-                        ("职称", (t) => t.JobTitle, 1, 1, false, true, false),
-                        ("绩效基数核算参考对象", (t) => t.FitPeople, 1, 1, false, false, false),
-                        ("岗位系数", (t) => t.PostCoefficient, 1, 1, false, true, false),
-                        ("参加工作时间", (t) => t.WorkTime, 1, 1, false, false, false),
-                        ("考核得分率", (t) => Math.Round(t.ScoreAverageRate.Value * 100, 2) , 1, 1, false, true, true),
-                        ("出勤率", (t) =>  Math.Round(t.Attendance.Value * 100, 2), 1, 1, false, true, true),
-                        ("核算单元医生数", (t) => t.PeopleNumber, 1, 1, false, true, false),
-                        ("工作量绩效", (t) =>t.Workload, 1, 1, false, true, false),
-                        ("其他绩效", (t) => t.OtherPerfor, 1, 1, false, true, false),
-                        ("医院奖罚", (t) => t.Punishment, 1, 1, false, true, false),
-                        ("调节系数", (t) => Math.Round(t.Adjust.Value * 100, 2), 1, 1, false, true, true),
-                        ("发放系数", (t) => t.Grant, 1, 1, false, true, false),
+                ("核算单元类型", (t) => t.AccountType, 1, 1, false, false, false,"AccountType"),
+                ("核算单元", (t) => t.AccountingUnit, 1, 1, false, false, false,"AccountingUnit"),
+                ("人员工号", (t) => t.PersonnelNumber, 1, 1, false, false, false,"PersonnelNumber"),
+                ("医生姓名", (t) => t.DoctorName, 1, 1, false, false, false,"DoctorName"),
+                ("职称", (t) => t.JobTitle, 1, 1, false, true, false,"JobTitle"),
+                ("绩效基数核算参考对象", (t) => t.FitPeople, 1, 1, false, false, false, "FitPeople"),
+                ("岗位系数", (t) => t.PostCoefficient, 1, 1, false, true, false, "PostCoefficient"),
+                ("参加工作时间", (t) => t.WorkTime, 1, 1, false, false, false, "WorkTime"),
+                ("考核得分率", (t) => Math.Round(t.ScoreAverageRate.Value * 100, 2) , 1, 1, false, true, true, "ScoreAverageRate"),
+                ("出勤率", (t) =>  Math.Round(t.Attendance.Value * 100, 2), 1, 1, false, true, true, "Attendance"),
+                ("核算单元医生数", (t) => t.PeopleNumber, 1, 1, false, true, false, "PeopleNumber"),
+                ("工作量绩效", (t) =>t.Workload, 1, 1, false, true, false, "Workload"),
+                ("其他绩效", (t) => t.OtherPerfor, 1, 1, false, true, false, "OtherPerfor"),
+                ("医院奖罚", (t) => t.Punishment, 1, 1, false, true, false, "Punishment"),
+                ("调节系数", (t) => Math.Round(t.Adjust.Value * 100, 2), 1, 1, false, true, true, "Adjust"),
+                ("发放系数", (t) => t.Grant, 1, 1, false, true, false, "Grant"),
+            };
+
+
+        // Tuple Items: 列明, 字段名, mergeRow, mergeCell, isTotal, isNumValue, 是否含有%
+        public static List<(string, Func<im_employee_clinic, object>, int, int, bool, bool, bool, string)> employeeClinicHeaders =
+            new List<(string, Func<im_employee_clinic, object>, int, int, bool, bool, bool, string)>
+            {
+                ("核算单元分类", (t) => t.UnitType, 1, 1, false, false, false, "UnitType"),
+                ("核算单元", (t) => t.AccountingUnit, 1, 1, false, false, false, "AccountingUnit"),
+                ("人员工号", (t) => t.PersonnelNumber, 1, 1, false, false, false, "PersonnelNumber"),
+                ("医生姓名", (t) => t.DoctorName, 1, 1, false, false, false, "DoctorName"),
+                ("职称", (t) => t.JobTitle, 1, 1, false, true, false, "JobTitle"),
+                ("岗位系数", (t) => t.PostCoefficient, 1, 1, false, true, false, "PostCoefficient"),
+                ("效率绩效系数", (t) => Math.Round(t.Efficiency.Value * 100, 2), 1, 1, false, true, true, "Efficiency"),
+                ("规模绩效系数", (t) => Math.Round(t.Scale.Value * 100, 2), 1, 1, false, true, true, "Scale"),
+                ("管理绩效发放系数", (t) => Math.Round(t.Management.Value * 100, 2), 1, 1, false, true, true, "Management"),
+                ("考核得分率", (t) => Math.Round(t.ScoreAverageRate.Value * 100, 2), 1, 1, false, true, true, "ScoreAverageRate"),
+                ("出勤率", (t) => Math.Round(t.Attendance.Value * 100, 2), 1, 1, false, true, true, "Attendance"),
+                ("其他绩效", (t) => t.OtherPerfor, 1, 1, false, true, false, "OtherPerfor"),
+                ("医院奖罚", (t) => t.Punishment, 1, 1, false, true, false, "Punishment"),
+                ("调节系数", (t) => Math.Round(t.Adjust.Value * 100, 2), 1, 1, false, true, true, "Adjust"),
+            };
+
+
+        // Tuple Items: 列明, 字段名, mergeRow, mergeCell, isTotal, isNumValue, 是否含有%
+        public static List<(string, Func<im_specialunit, object>, int, int, bool, bool, bool, string)> specialUnitHeaders =
+             new List<(string, Func<im_specialunit, object>, int, int, bool, bool, bool, string)>
+         {
+                    ("核算单元", (t) => t.AccountingUnit, 1, 1, false, false, false, "AccountingUnit"),
+                    ("科室", (t) => t.Department, 1, 1, false, false, false, "Department"),
+                    ("人数", (t) => t.Number, 1, 1, false, true, false, "Number"),
+                    ("量化指标", (t) => t.QuantitativeIndicators, 1, 1, false, true, false, "QuantitativeIndicators"),
+                    ("数量", (t) => t.Quantity, 1, 1, false, true, false, "Quantity"),
+                    ("量化指标绩效分值", (t) => t.QuantitativeIndicatorsValue, 1, 1, false, true, false, "QuantitativeIndicatorsValue"),
+                    ("考核得分率", (t) => Math.Round(t.ScoringAverage.Value * 100, 2), 1, 1, false, true, true, "ScoringAverage"),
+                    ("其他绩效", (t) => t.OtherPerfor, 1, 1, false, true, false, "OtherPerfor"),
+                    ("医院奖罚", (t) => t.Punishment, 1, 1, false, true, false, "Punishment"),
+                    ("调节系数", (t) => Math.Round(t.Adjust.Value * 100, 2), 1, 1, false, true, true, "Adjust"),
          };
     }
 }

performance/Performance.DtoModels/Request/OriginalRequest.cs

@@ -8,6 +8,8 @@ public class OriginalRequest
     {
         public int SheetId { get; set; }
 
+        public int RowNumber { get; set; }
+
         public List<Cell> Cells { get; set; }
     }
 }

performance/Performance.DtoModels/Response/SheetExportResponse.cs

@@ -94,9 +94,13 @@ public object CellValue
         public string Annotation { get; set; }
 
         public int Id { get; set; }
+        /// <summary>
+        /// 数据库字段名称
+        /// </summary>
+        public string FieldName { get; set; }
 
         public Cell() { }
-        public Cell(int pointCell, object cellValue, int mergeRow, int mergeCell, bool isTotal, bool isNumValue, string annotation = "", int id = 0)
+        public Cell(int pointCell, object cellValue, int mergeRow, int mergeCell, bool isTotal, bool isNumValue, string annotation = "", int id = 0, string fieldName = "")
         {
             PointCell = pointCell;
             CellValue = cellValue;
@@ -106,6 +110,7 @@ public Cell(int pointCell, object cellValue, int mergeRow, int mergeCell, bool i
             IsNumValue = isNumValue;
             Annotation = annotation;
             Id = id;
+            FieldName = fieldName;
         }
     }
 }

performance/Performance.EntityModels/Entity/im_data.cs

@@ -95,5 +95,9 @@ public class im_data
         /// 
         /// </summary>
         public string SignID { get; set; }
+
+        public Nullable<DateTime> UpdateDate { get; set; }
+
+        public Nullable<int> UpdateUser { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/im_employee.cs

@@ -125,5 +125,9 @@ public class im_employee
         /// 发放系数
         /// </summary>
         public Nullable<decimal> Grant { get; set; }
+
+        public Nullable<DateTime> UpdateDate { get; set; }
+
+        public Nullable<int> UpdateUser { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/im_employee_clinic.cs

@@ -130,5 +130,9 @@ public class im_employee_clinic
         /// 发放系数
         /// </summary>
         public Nullable<decimal> Grant { get; set; }
+
+        public Nullable<DateTime> UpdateDate { get; set; }
+
+        public Nullable<int> UpdateUser { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/im_header.cs

@@ -75,5 +75,9 @@ public class im_header
         /// 1 汇总  2原始数据
         /// </summary>
         public Nullable<int> IsTotal { get; set; }
+
+        public Nullable<DateTime> UpdateDate { get; set; }
+
+        public Nullable<int> UpdateUser { get; set; }
     }
 }

performance/Performance.EntityModels/Entity/im_specialunit.cs

@@ -80,5 +80,9 @@ public class im_specialunit
         /// 调节系数
         /// </summary>
         public Nullable<decimal> Adjust { get; set; }
+
+        public Nullable<DateTime> UpdateDate { get; set; }
+
+        public Nullable<int> UpdateUser { get; set; }
     }
 }