Merge branch 'v2020calculate' into v2020morge

performance/Performance.Api/Controllers/AllotController.cs

@@ -188,6 +188,9 @@ public ApiResponse Generate([CustomizeValidator(RuleSet = "Delete"), FromBody] A
             logManageService.WriteMsg("等待绩效生成", $"等待绩效生成{allot.Year}-{allot.Month.ToString().PadLeft(2, '0')}月份绩效!", 1, allot.ID, "ReceiveMessage");
             //_allotService.Generate(allot, email);
             ////BackgroundJob.Enqueue(() => _allotService.Generate(allot, email));
+            ///
+            // 科室下发
+            resultComputeService.GenerateSecondAllot(allot);
             return new ApiResponse(ResponseType.OK);
         }
 
@@ -269,8 +272,6 @@ public ApiResponse Issued([FromBody] AllotRequest request)
             if (null == allot)
                 throw new PerformanceException("当前绩效记录不存在");
             _allotService.UpdateAllotStates(allot.ID, (int)AllotStates.GenerateSucceed, EnumHelper.GetDescription(AllotStates.GenerateSucceed));
-            // 科室下发
-            resultComputeService.GenerateSecondAllot(allot);
             return new ApiResponse(ResponseType.OK);
         }
 

performance/Performance.Api/Controllers/ComputeController.cs

@@ -267,6 +267,41 @@ public ApiResponse AllManageCompute([FromBody] ComputerRequest request)
         }
 
         /// <summary>
+        /// 获取全院绩效列表（人事科）
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("allcompute/personnel")]
+        [HttpPost]
+        public ApiResponse AllComputeByPM([FromBody] ComputerRequest request)
+        {
+            var allot = _allotService.GetAllot(request.AllotId);
+            if (null == allot)
+                throw new PerformanceException("当前绩效记录不存在");
+            var isShowManage = _computeService.IsShowManage(request.AllotId);
+
+            var list = _computeService.AllCompute(request.AllotId, isShowManage);
+            if (list == null || !list.Any())
+                return new ApiResponse(ResponseType.OK, "ok", list);
+
+            var result = list.GroupBy(t => new { t.Source, t.EmployeeName, t.JobNumber }).Select(t => new ComputeResponse
+            {
+                Source = t.Key.Source,
+                EmployeeName = t.Key.EmployeeName,
+                JobNumber = t.Key.JobNumber,
+                PerforSumFee = t.Sum(s => s.PerforSumFee),
+                PerforManagementFee = t.Sum(s => s.PerforManagementFee),
+                ShouldGiveFee = t.Sum(s => s.ShouldGiveFee),
+                OthePerfor = t.Sum(s => s.OthePerfor),
+                NightWorkPerfor = t.Sum(s => s.NightWorkPerfor),
+                RealGiveFee = t.Sum(s => s.RealGiveFee),
+                //ReservedRatio = t.Sum(s => s.ReservedRatio),
+                //ReservedRatioFee = t.Sum(s => s.ReservedRatioFee),
+            });
+            return new ApiResponse(ResponseType.OK, "ok", result);
+        }
+
+        /// <summary>
         /// 修改实发绩效
         /// </summary>
         /// <param name="request"></param>

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

@@ -398,6 +398,13 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.ComputeController.AllComputeByPM(Performance.DtoModels.ComputerRequest)">
+            <summary>
+            获取全院绩效列表（人事科）
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.ComputeController.UpdateRealfee(Performance.DtoModels.ComputerRequest)">
             <summary>
             修改实发绩效

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

@@ -3229,6 +3229,13 @@
         <member name="P:Performance.DtoModels.SecondListResponse.IsArchive">
             <summary> 是否归档 </summary>
         </member>
+        <member name="P:Performance.DtoModels.SecondListResponse.States">
+            <summary>
+            0 数据未上传 1 数据已上传 2 正在校验数据 3 数据验证通过 
+            4 数据错误 5 正在生成绩效 6 下发绩效 7 绩效解析失败 
+            8 归档 9 等待生成 10 绩效结果解析成功
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.SecondPerforResponse.EmployeeName">
             <summary>
             人员姓名

performance/Performance.DtoModels/Response/ComputeResponse.cs

@@ -83,5 +83,25 @@ public ComputeResponse(string source, string accountingUnit, string employeeName
         /// 预留比例金额
         /// </summary>
         public Nullable<decimal> ReservedRatioFee { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<decimal> Punishment { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<decimal> GiveFee { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<decimal> Adjust { get; set; }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public Nullable<decimal> AdjustLaterOtherFee { get; set; }
     }
 }

performance/Performance.DtoModels/Response/SecondListResponse.cs

@@ -9,5 +9,12 @@ public class SecondListResponse : ag_secondallot
     {
         /// <summary> 是否归档 </summary>
         public int IsArchive { get; set; }
+
+        /// <summary>
+        /// 0 数据未上传 1 数据已上传 2 正在校验数据 3 数据验证通过 
+        /// 4 数据错误 5 正在生成绩效 6 下发绩效 7 绩效解析失败 
+        /// 8 归档 9 等待生成 10 绩效结果解析成功
+        /// </summary>
+        public int States { get; set; }
     }
 }

performance/Performance.Repository/PerforPerAllotRepository.cs

@@ -165,8 +165,8 @@ public IEnumerable<report_original_workload> QueryWorkloadData(int allotid, stri
                 if (connection.State != ConnectionState.Open) connection.Open();
                 try
                 {
-                    string clear = @"SELECT t3.AccountingUnit as Department,t1.DoctorName,t1.PersonnelNumber,t1.Category,t1.Fee FROM ex_result t1
-	JOIN per_employee t2 on t1.doctorname = t2.doctorname and t1.personnelnumber = t2.personnelnumber
+                    string clear = @"SELECT t3.AccountingUnit as Department,t1.DoctorName,if(ifnull(t2.PersonnelNumber,'')='', t2.JobNumber, t2.PersonnelNumber) PersonnelNumber,t1.Category,t1.Fee FROM ex_result t1
+	JOIN per_employee t2 on t1.doctorname = t2.doctorname and t1.personnelnumber = t2.jobnumber
 	JOIN (select distinct AccountingUnit,HISDeptName,unittype from per_dept_dic where HospitalId = @hospitalid) t3 ON t1.Department = t3.HISDeptName
 WHERE t1.allotid = @allotid
 	AND t2.allotid = @allotid
@@ -195,8 +195,8 @@ public IEnumerable<ex_result> QueryIncomeData(int allotid, string accountingunit
                 if (connection.State != ConnectionState.Open) connection.Open();
                 try
                 {
-                    string clear = @"SELECT t3.AccountingUnit as Department,t1.DoctorName,t1.PersonnelNumber,t1.Category,t1.Fee FROM ex_result t1
-	JOIN per_employee t2 on t1.doctorname = t2.doctorname and t1.personnelnumber = t2.personnelnumber
+                    string clear = @"SELECT t3.AccountingUnit as Department,t1.DoctorName,if(ifnull(t2.PersonnelNumber,'')='', t2.JobNumber, t2.PersonnelNumber) PersonnelNumber,t1.Category,t1.Fee FROM ex_result t1
+	JOIN per_employee t2 on t1.doctorname = t2.doctorname and t1.personnelnumber = t2.jobnumber
 	JOIN (select distinct AccountingUnit,HISDeptName,unittype from per_dept_dic where HospitalId = @hospitalid) t3 ON t1.Department = t3.HISDeptName
 WHERE t1.allotid = @allotid
 	AND t2.allotid = @allotid

performance/Performance.Services/ComputeService.cs

@@ -471,14 +471,18 @@ public List<ComputeResponse> AllCompute(int allotId, int isShowManage)
                 var empDic = perforPeremployeeRepository.GetEntities(w => w.AllotId == allotId);
                 foreach (var item in result)
                 {
+                    var perfor = ((item.GiveFee ?? 0) != 0 ? item.GiveFee : item.PerforSumFee) ?? 0;
+
                     item.PerforSumFee = Math.Round(item.PerforSumFee ?? 0, 0, MidpointRounding.AwayFromZero);
                     item.PerforManagementFee = Math.Round(item.PerforManagementFee ?? 0, 0, MidpointRounding.AwayFromZero);
+                    item.GiveFee = Math.Round(perfor, 0, MidpointRounding.AwayFromZero);
+                    item.AdjustLaterOtherFee = Math.Round(item.AdjustLaterOtherFee ?? 0, 0, MidpointRounding.AwayFromZero);
                     item.OthePerfor = Math.Round(item.OthePerfor ?? 0, 0, MidpointRounding.AwayFromZero);
                     item.NightWorkPerfor = Math.Round(item.NightWorkPerfor ?? 0, 0, MidpointRounding.AwayFromZero);
-                    item.ShouldGiveFee = Math.Round((item.PerforSumFee ?? 0) + (item.PerforManagementFee ?? 0) + (item.OthePerfor ?? 0) + (item.NightWorkPerfor ?? 0), 0, MidpointRounding.AwayFromZero);
-                    item.ReservedRatio = empDic?.FirstOrDefault(w => w.PersonnelNumber == item.JobNumber)?.ReservedRatio ?? 0;
-                    item.ReservedRatioFee = Math.Round(((item.PerforSumFee ?? 0) + (item.PerforManagementFee ?? 0)) * item.ReservedRatio ?? 0, 0, MidpointRounding.AwayFromZero);
-                    item.RealGiveFee = Math.Round(item.ShouldGiveFee - (item.ReservedRatioFee ?? 0) ?? 0, 0, MidpointRounding.AwayFromZero);
+                    item.ShouldGiveFee = Math.Round((perfor + item.AdjustLaterOtherFee + item.NightWorkPerfor) ?? 0, 0, MidpointRounding.AwayFromZero);
+                    //item.ReservedRatio = empDic?.FirstOrDefault(w => w.PersonnelNumber == item.JobNumber)?.ReservedRatio ?? 0;
+                    //item.ReservedRatioFee = Math.Round(((item.PerforSumFee ?? 0) + (item.PerforManagementFee ?? 0)) * item.ReservedRatio ?? 0, 0, MidpointRounding.AwayFromZero);
+                    item.RealGiveFee = Math.Round((perfor + item.AdjustLaterOtherFee + item.NightWorkPerfor) ?? 0, 0, MidpointRounding.AwayFromZero);
                 }
             }
 
@@ -507,7 +511,7 @@ private List<ComputeResponse> GetAllotPerformance(int allotId, int isShowManage)
                 comp.UnitType = t.AccountType;
 
                 if (types1.Contains(t.AccountType))
-                    comp.PerforManagementFee = (t.ShouldGiveFee ?? 0) + (t.OtherPerfor ?? 0) + (t.Punishment ?? 0);
+                    comp.PerforManagementFee = ((t.Efficiency + t.Scale) * t.Grant + t.OtherManagePerfor) * t.Attendance * t.ScoreAverageRate;
                 else
                     comp.PerforManagementFee = t.RealGiveFee;
                 // 行政中层  行政高层 补充  夜班费
@@ -519,8 +523,15 @@ private List<ComputeResponse> GetAllotPerformance(int allotId, int isShowManage)
                 if (isShowManage == 2)
                     comp.PerforSumFee = 0;
                 else
-                    comp.PerforSumFee = basics.HasValue ? t.Avg * basics : t.Avg;
-
+                    comp.PerforSumFee = Math.Round((t.Avg * (basics ?? 1)) + t.ShouldGiveFee + t.AssessBeforeOtherFee ?? 0);
+
+                comp.Punishment = t.Punishment;
+                comp.ShouldGiveFee = t.ShouldGiveFee;
+                comp.PerforSumFee = t.PerforSumFee;
+                comp.GiveFee = t.GiveFee * t.Adjust;
+                comp.AdjustLaterOtherFee = t.AdjustLaterOtherFee ?? 0;
+                comp.OthePerfor = t.OtherPerfor;
+                comp.RealGiveFee = t.RealGiveFee;
                 return comp;
             }).ToList();
         }

performance/Performance.Services/SecondAllotService.cs

@@ -121,7 +121,12 @@ public List<SecondListResponse> GetSecondList(int userId)
 
             var secondList = perforAgsecondallotRepository.GetEntities(exp);
             var list = Mapper.Map<List<SecondListResponse>>(secondList);
-            list?.ForEach(t => t.IsArchive = allotList.FirstOrDefault(a => a.ID == t.AllotId).States == 8 ? 1 : 0);
+            list?.ForEach(t =>
+            {
+                var states = allotList.FirstOrDefault(a => a.ID == t.AllotId).States;
+                t.IsArchive = states == 8 ? 1 : 0;
+                t.States = states;
+            });
             return list;
         }