报表分析/预留金额分开

performance/Performance.Api/Controllers/AllotController.cs

@@ -497,8 +497,9 @@ public ApiResponse UpdateAllotShowFormula([FromBody] AllotRequest request)
         }
 
         /// <summary>
-        /// 获取
+        /// 获取预留金额
         /// </summary>
+        /// <param name="request"></param>
         /// <returns></returns>
         [Route("reserved")]
         [HttpPost]
@@ -508,7 +509,7 @@ public ApiResponse Reserved([FromBody] ReservedRequest request)
                 return new ApiResponse(ResponseType.ParameterError, "绩效信息无效");
 
             var userid = _claim.GetUserId();
-            var reserveds = _allotService.GetReserved(request.HospitalId, request.Year, userid);
+            var reserveds = _allotService.GetReserved(request, userid);
             return new ApiResponse(ResponseType.OK, reserveds);
         }
 

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

@@ -295,8 +295,9 @@
         </member>
         <member name="M:Performance.Api.Controllers.AllotController.Reserved(Performance.DtoModels.ReservedRequest)">
             <summary>
-            获取
+            获取预留金额
             </summary>
+            <param name="request"></param>
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.AllotController.DownloadCurrentCalculationTable(System.Int32)">
@@ -384,7 +385,6 @@
             查询考勤记录
             </summary>
             <param name="allotId"></param>
-            <param name="hospitalId"></param>
             <returns></returns>
         </member>
         <member name="M:Performance.Api.Controllers.AttendanceController.AttendanceBatch(System.Int32,System.Int32,Performance.DtoModels.SaveCollectData)">

performance/Performance.DtoModels/Request/ReservedRequest.cs

@@ -8,5 +8,6 @@ public class ReservedRequest
     {
         public int HospitalId { get; set; }
         public int Year { get; set; }
+        public int Source { get; set; }
     }
 }

performance/Performance.Repository/PerforReportRepository .cs

@@ -385,10 +385,12 @@ public List<PerReport> NurseAvg(ReportRequest request)
         /// <param name="hospitalId"></param>
         /// <param name="year"></param>
         /// <returns></returns>
-        public List<EmployeeReservedDto> GetEmployeeReserved(int hospitalId, int year)
+        public List<EmployeeReservedDto> GetEmployeeReserved(ReservedRequest request)
         {
-            string sql = "SELECT * FROM view_allot_result_report WHERE HospitalID=@HospitalID AND Year=@Year";
-            return DapperQuery<EmployeeReservedDto>(sql, new { HospitalID = hospitalId, Year = year })?.ToList();
+            string view = request.Source == 1 ? "view_allot_result_report_emp" : request.Source == 2 ? "view_allot_result_report_issue": request.Source == 3 ? "view_allot_result_report":"";
+
+            string sql = $"SELECT * FROM {view} WHERE HospitalID=@HospitalID AND Year=@Year";
+            return DapperQuery<EmployeeReservedDto>(sql, new { HospitalID = request.HospitalId, Year = request.Year })?.ToList();
         }
 
         public List<view_allot_result> GetOwnerPerformance(List<int> hospitalId, string jobNumber)

performance/Performance.Services/AllotService.cs

@@ -642,13 +642,12 @@ public List<log_dbug> AllotLog(per_allot allot, int type)
         }
 
         /// <summary>
-        /// 获取医院预留绩效
+        /// 
         /// </summary>
-        /// <param name="hospitalId"></param>
-        /// <param name="year"></param>
+        /// <param name="request"></param>
         /// <param name="userid"></param>
         /// <returns></returns>
-        public List<EmployeeReservedDto> GetReserved(int hospitalId, int year, int userid)
+        public List<EmployeeReservedDto> GetReserved(ReservedRequest request, int userid)
         {
             var user = userService.GetUser(userid);
             if (user == null)
@@ -658,7 +657,7 @@ public List<EmployeeReservedDto> GetReserved(int hospitalId, int year, int useri
             if (!role.HasValue)
                 throw new PerformanceException("用户信息错误");
 
-            var reserveds = _reportRepository.GetEmployeeReserved(hospitalId, year);
+            var reserveds = _reportRepository.GetEmployeeReserved(request);
 
             if (reserveds != null && reserveds.Any())
             {