保底行政工勤人均绩效

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

@@ -179,6 +179,13 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.AllotController.AllotLog(Performance.DtoModels.AllotRequest)">
+            <summary>
+            绩效历史日志
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.ComputeController.GetCompute(Performance.DtoModels.ComputerRequest)">
             <summary>
             获取绩效发放列表
@@ -403,6 +410,34 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.ConfigController.GetWorkItems(Performance.DtoModels.WorkItemRequest)">
+            <summary>
+            获取工作量绩效配置列表
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.ConfigController.WorkItemInsert(Performance.DtoModels.WorkItemRequest)">
+            <summary>
+            新增工作量绩效配置
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.ConfigController.WorkItemUpdate(Performance.DtoModels.WorkItemRequest)">
+            <summary>
+            修改工作量绩效配置
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
+        <member name="M:Performance.Api.Controllers.ConfigController.WorkItemDelete(Performance.DtoModels.WorkItemRequest)">
+            <summary>
+            删除工作量绩效配置
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.EmployeeController.GetEmployeeList(Performance.DtoModels.EmployeeRequest)">
             <summary>
             获取人员列表

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

@@ -1476,6 +1476,11 @@
             用户科室
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.WorkItemRequest.Item">
+            <summary>
+            工作量绩效项
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.WorkyearRequest.MaxRange">
             <summary>
             最大工龄范围（小于）

performance/Performance.DtoModels/PerExcel/ExcelEnum.cs

@@ -138,7 +138,8 @@ public enum MinimumType
         保底医技医生 = 2,
         [Description("保底绩效护士人均绩效")]
         保底护士 = 3,
-
+        [Description("保底绩效行政工勤人均绩效")]
+        保底工勤 = 4,
     }
 
     ///// <summary>

performance/Performance.Services/AllotCompute/ResultComputeService.cs

@@ -47,7 +47,7 @@ public class ResultComputeService : IAutoInjection
         /// 计算最终数据
         /// </summary>
         /// <param name="excel"></param>
-        public List<res_baiscnorm> Compute(per_allot allot, PerExcel excel, List<PerSheet> perSheets)
+        public List<res_baiscnorm> Compute(per_allot allot, PerExcel excel, List<PerSheet> accountSheet)
         {
             //取出人员信息           
             var empolyeeList = perforImEmployeeRepository.GetEntities(t => t.AllotID == allot.ID);
@@ -56,11 +56,11 @@ public List<res_baiscnorm> Compute(per_allot allot, PerExcel excel, List<PerShee
             List<ComputeEmployee> computeEmployees = Mapper.Map<List<ComputeEmployee>>(empolyeeList);
 
             logManageService.WriteMsg("正在生成绩效", "临床科室主任、临床科室副主任、临床科室护士长 最终绩效数据计算", 1, allot.ID, "ReceiveMessage");
-            var computResult = computeDirector.Compute(computeEmployees, accountbasicList, allot);
+            var computResult = computeDirector.Compute(computeEmployees, accountbasicList, accountSheet, allot);
             //计算 绩效标准 基数（科主任、副主任、护士长 =>> 平均值）
             List<res_baiscnorm> baiscnormList = new List<res_baiscnorm>();
             baiscNormService.ComputeAvg(baiscnormList, accountbasicList, computResult);
-            baiscNormService.DocterNurseBaiscnorm(baiscnormList, accountbasicList, perSheets);
+            baiscNormService.DocterNurseBaiscnorm(baiscnormList, accountbasicList, accountSheet);
 
             logManageService.WriteMsg("正在生成绩效", "院领导、业务中层、工勤人员 最终绩效数据计算", 1, allot.ID, "ReceiveMessage");
             var computResult2 = computeDirector.Compute(computeEmployees, allot, baiscnormList);
@@ -74,7 +74,6 @@ public List<res_baiscnorm> Compute(per_allot allot, PerExcel excel, List<PerShee
 
             baiscnormList.ForEach(t => t.AllotID = allot.ID);
             logManageService.WriteMsg("正在生成绩效", "保存最终绩效数据", 1, allot.ID, "ReceiveMessage");
-            perforResbaiscnormRepository.AddRange(baiscnormList.ToArray());
 
             return baiscnormList;
         }

performance/Performance.Services/AllotService.cs

@@ -34,6 +34,8 @@ public class AllotService : IAutoInjection
         private PerforPeragainallotRepository _againallotRepository;
         private PerforLogcheckRepository perforLogcheckRepository;
         private readonly PerforHospitalRepository perforHospitalRepository;
+        private readonly PerforResbaiscnormRepository perforResbaiscnormRepository;
+
         //private readonly IHubContext<AllotLogHub> hubContext;
         private readonly LogManageService logManageService;
 
@@ -51,6 +53,7 @@ public class AllotService : IAutoInjection
              PerforPeragainallotRepository againallotRepository,
              PerforLogcheckRepository perforLogcheckRepository,
              PerforHospitalRepository perforHospitalRepository,
+             PerforResbaiscnormRepository perforResbaiscnormRepository,
              //IHubContext<AllotLogHub> hubContext
              LogManageService logManageService)
         {
@@ -69,6 +72,7 @@ public class AllotService : IAutoInjection
             this.logdbug = logdbug;
             this.perforLogcheckRepository = perforLogcheckRepository;
             this.perforHospitalRepository = perforHospitalRepository;
+            this.perforResbaiscnormRepository = perforResbaiscnormRepository;
             //this.hubContext = hubContext;
             this.logManageService = logManageService;
         }
@@ -230,18 +234,61 @@ public void Generate(per_allot allot, string mail)
                 }
 
                 UpdateAllotStates(allot.ID, (int)AllotStates.InGenerate, EnumHelper.GetDescription(AllotStates.InGenerate));
-                // 计算合并数据 
-                logManageService.WriteMsg("正在生成绩效", "计算合并数据", 1, allot.ID, "ReceiveMessage", true);
-                List<PerSheet> list = processComputService.MergeAndSave(excel, allot);
 
-                //var baiscnorm = baiscNormService.NurseBaiscnorm(list);
+                //保底绩效计算需分两次进行；
+                //第一次计算包含（保底绩效临床医生人均绩效、保底绩效医技医生人均绩效、保底绩效护士人均绩效）得出科室业绩绩效；
+                //根据当前业绩绩效核算各人群人均绩效，取工勤人均作为 保底工勤人均绩效
+
+                //第二次计算包含（保底绩效临床医生人均绩效、保底绩效医技医生人均绩效、保底绩效护士人均绩效、保底工勤人均绩效）得出科室业绩绩效；
+                //根据当前业绩绩效核算出最终绩效结果
+
+
+                //科室经济核算汇总、工作量汇总
+                logManageService.WriteMsg("科室业绩汇总", "正在生成科室收入支出汇总、工作量汇总", 1, allot.ID, "ReceiveMessage", true);
+                var (list, mergeSheets) = processComputService.MergeCompute(excel, allot.ID);
+                processComputService.Save(list, allot.ID);
+
+                //计算保底绩效参考标准（保底绩效临床医生人均绩效、保底绩效医技医生人均绩效、保底绩效护士人均绩效） 
+                logManageService.WriteMsg("计算保底绩效参考标准值", "正在保底绩效临床医生人均绩效、保底绩效医技医生人均绩效、保底绩效护士人均绩效", 1, allot.ID, "ReceiveMessage", true);
+                var minimumBaiscnorm = processComputService.ComputeMinimum(excel, mergeSheets, allot.ID);
+
+                //计算科室业绩（含保底绩效临床医生人均绩效、保底绩效医技医生人均绩效、保底绩效护士人均绩效）保底绩效
+                logManageService.WriteMsg("计算保底绩效参考标准值", "计算科室业绩", 1, allot.ID, "ReceiveMessage", true);
+                var sheet = processComputService.Compute(excel, mergeSheets, minimumBaiscnorm);
+
+                //计算各人群人均保底绩效
+                logManageService.WriteMsg("计算保底绩效参考标准值", "正在生成保底绩效行政工勤人均绩效", 1, allot.ID, "ReceiveMessage", true);
+                var minimumBaiscnorm2 = resultComputeService.Compute(allot, excel, sheet);
+                if (minimumBaiscnorm2 != null && minimumBaiscnorm2.Any(t => t.PositionName == EnumHelper.GetDescription(PerforType.行政工勤)))
+                {
+                    var minimum = minimumBaiscnorm2.First(t => t.PositionName == EnumHelper.GetDescription(PerforType.行政工勤));
+                    minimum.PositionName = EnumHelper.GetDescription(MinimumType.保底工勤);
+                    minimumBaiscnorm.Add(minimum);
+                }
+
+                //保存 保底绩效参考标准
+                logManageService.WriteMsg("计算保底绩效参考标准值", "保存保底绩效参考标准", 1, allot.ID, "ReceiveMessage", true);
+                perforResbaiscnormRepository.AddRange(minimumBaiscnorm.ToArray());
+
+                //重新计算科室业绩（含所有提供保底金额）
+                logManageService.WriteMsg("正在生成绩效", "重新计算科室业绩，包含所有保底金额计算科室业绩", 1, allot.ID, "ReceiveMessage", true);
+                var sheetLast = processComputService.Compute(excel, mergeSheets, minimumBaiscnorm);
+
+                //保存计算过程数据
+                logManageService.WriteMsg("正在生成绩效", "保存科室业绩结果及计算过程中产生的数据", 1, allot.ID, "ReceiveMessage", true);
+                processComputService.Save(sheetLast, allot.ID);
+
                 // 计算最总数据
                 logManageService.WriteMsg("正在生成绩效", "计算最终绩效数据", 1, allot.ID, "ReceiveMessage", true);
-                var baiscnormList = resultComputeService.Compute(allot, excel, list);
+                var baiscnormList = resultComputeService.Compute(allot, excel, sheetLast);
                 logManageService.WriteMsg("正在生成绩效", "计算最终特殊科室绩效数据", 1, allot.ID, "ReceiveMessage", true);
                 resultComputeService.SpecialUnitCompute(excel, allot, baiscnormList);
                 logManageService.WriteMsg("正在生成绩效", "保存最终特殊科室绩效数据", 1, allot.ID, "ReceiveMessage", true);
 
+                //保存 绩效人均参考标准
+                logManageService.WriteMsg("正在生成绩效", "保存绩效人均参考标准", 1, allot.ID, "ReceiveMessage", true);
+                perforResbaiscnormRepository.AddRange(baiscnormList.ToArray());
+
                 UpdateAllotStates(allot.ID, (int)AllotStates.GenerateSucceed, EnumHelper.GetDescription(AllotStates.GenerateSucceed));
                 //发送邮件
                 SendEmail(allot, mail, 1, time);

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

@@ -137,7 +137,7 @@ public class ComputeDirector : IAutoInjection
         /// <param name="nurseList"></param>
         /// <param name="directorList"></param>
         /// <returns></returns>
-        public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<im_accountbasic> accountbasicList, per_allot allot)
+        public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<im_accountbasic> accountbasicList, List<PerSheet> accountSheet, per_allot allot)
         {
             var basicRuleList = new[]
             {
@@ -146,8 +146,11 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<im_a
                 new { AccountUnitType = AccountUnitType.科主任, UnitType = UnitType.医技组 },
             };
             //取出科室
-            var dataList = perforResaccountRepository.GetEntities(t => t.AllotID == allot.ID);
-
+            List<res_account> dataList = new List<res_account>();
+            foreach (var account in accountSheet)
+            {
+                dataList.AddRange(AutoMapper.Mapper.Map<List<res_account>>(account.PerData.Select(t => (PerDataAccountBaisc)t)));
+            }
             List<ComputeResult> computeList = new List<ComputeResult>();
             foreach (var accountbasic in accountbasicList)
             {
@@ -268,7 +271,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, per_allot
                     }
                 }
                 //添加参数计算
-                compute.BaiscNormValue = baiscnorm * (item.FitPeopleRatio ?? 1);
+                compute.BaiscNormValue = baiscnorm * (item.FitPeopleRatio == null || item.FitPeopleRatio == 0 ? 1 : item.FitPeopleRatio);
                 //应发绩效
                 compute.GiveFee = compute.BaiscNormValue * compute.PostCoefficient * (compute.WorkYear ?? 1) * compute.Attendance * compute.ScoreAverageRate
                    + (compute.OtherPerfor ?? 0) + (compute.Punishment ?? 0);

performance/Performance.Services/PerExcelService/SheetDataCompute/PerSheetDataComputeEconomic.cs

@@ -52,7 +52,7 @@ public PerSheet MergeCompute(PerExcel excel, List<EntityModels.cof_income> incom
                         //判断是否创建头部
                         if (!isHasData && dataList != null && dataList.Count() > 0)
                             isHasData = true;
-                        foreach (var item in EnumHelper.GetItems<UnitType>())
+                        foreach (var item in EnumHelper.GetItems<UnitType>().Where(t => t.Name != "专家组"))
                         {
                             var group = dataList.Where(t => t.UnitType == item.Name);
 
@@ -161,7 +161,7 @@ public PerSheet OnceCompute(PerSheet sheet)
 
                     var typeClass = dataList.Where(t => header.Children.Select(s => s.CellValue).Contains(t.TypeName));
                     int pointcell = 0;
-                    foreach (var item in EnumHelper.GetItems<UnitType>())
+                    foreach (var item in EnumHelper.GetItems<UnitType>().Where(t => t.Name != "专家组"))
                     {
                         pointcell++;
                         var group = typeClass.Where(t => t.UnitType == item.Name);