Merge remote-tracking branch 'origin/v20201230yubei' into v20201230yubei

performance/Performance.Api/Controllers/ComputeController.cs

@@ -257,7 +257,7 @@ public ApiResponse AllComputeAvg([FromBody] ComputerRequest request)
             //            ? 0 : Math.Round(gc.Sum(s => s.RealGiveFee) / gc.Select(p => new { p.JobNumber, p.EmployeeName }).Distinct().Count() ?? 0)
             //    }));
 
-            return new ApiResponse(ResponseType.OK, "ok", avgs.Select(w => new {w.ID, w.PositionName, w.TotelNumber, w.TotelValue, w.AvgValue }));
+            return new ApiResponse(ResponseType.OK, "ok", avgs.Select(w => new { w.ID, w.PositionName, w.TotelNumber, w.TotelValue, w.AvgValue }));
         }
 
         /// <summary>
@@ -388,7 +388,7 @@ public ApiResponse<res_baiscnorm> EditHospitalAvg([FromBody] ComputerAvgRequest
 
             var result = _computeService.EditHospitalAvg(request);
 
-            return new ApiResponse<res_baiscnorm>(ResponseType.OK,  result);
+            return new ApiResponse<res_baiscnorm>(ResponseType.OK, result);
         }
 
         #endregion
@@ -397,16 +397,16 @@ public ApiResponse<res_baiscnorm> EditHospitalAvg([FromBody] ComputerAvgRequest
         /// <summary>
         /// 其他医院绩效统计
         /// </summary>
-        /// <param name="request"></param>
+        /// <param name="allotId"></param>
         /// <returns></returns>
         [Route("OtherPerStats/{allotId}")]
         [HttpPost]
         public ApiResponse OtherPerStats(int allotId)
         {
             var employee = _employeeService.GetAprList(allotId, _claim.GetUserId());
-            
-            var relust= _computeService.GetOtherPerStats(employee);
-            return new ApiResponse(ResponseType.OK,relust);
+
+            var relust = _computeService.GetOtherPerStats(employee);
+            return new ApiResponse(ResponseType.OK, relust);
         }
 
         #endregion

performance/Performance.Services/EmployeeService.cs

@@ -392,7 +392,7 @@ public List<per_apr_amount> GetAprList(int allotId, int userId)
             if (userrole == null) throw new PerformanceException("用户未绑定角色");
 
             var list = new List<per_apr_amount>();
-            if (new int[] { 1, 2, 5 }.Contains(userrole.RoleID))   //  绩效管理员、医院管理员、绩效核算办查看所有科室的数据
+            if (new int[] { 1, 2, 5, 6 }.Contains(userrole.RoleID))   //  绩效管理员、医院管理员、绩效核算办、院领导查看所有科室的数据
                 list = perapramountRepository.GetEntities(t => t.AllotId == allotId && (t.Amount ?? 0) != 0);
             else
                 list = perapramountRepository.GetEntities(t => t.AllotId == allotId && (t.Amount ?? 0) != 0 && t.CreateUser == userId);
@@ -650,7 +650,7 @@ public List<TitleValue> GetPerforTypeDict(int allotId)
                 return new List<Dictionary<string, string>>();
 
             var imData = perforImdataRepository.GetEntities(t => t.AllotID == allotId && t.SheetID == sheet.ID);
-            var headers = imData.OrderByDescending(c=>c.IsTotal).Select(t => t.TypeName).Distinct();
+            var headers = imData.OrderByDescending(c => c.IsTotal).Select(t => t.TypeName).Distinct();
             var dataNum = imData.Select(t => t.RowNumber)?.OrderBy(c => c.Value).Distinct().ToList();
             if (!dataNum.Any())
                 return new List<Dictionary<string, string>>();