修改上一版分页

performance/Performance.Api/Controllers/ConfigController.cs

@@ -322,13 +322,14 @@ public ApiResponse DrugtypeDelete([CustomizeValidator(RuleSet = "Delete"), FromB
         public ApiResponse GetDrugtypeDisburseList([CustomizeValidator(RuleSet = "Select"), FromBody] DrugpropRequest request)
         {
             var list = _configService.GetDrugtypeDisburseList(request.HospitalId, request.AllotID).OrderBy(t=>t.ID);
+            var listpage = list.Skip(request.PageSize * (request.CurrentPage - 1)).Take(request.PageSize).ToList();
             return new ApiResponse(ResponseType.OK, "ok", new
             {
-                Data = list.Skip(request.PageSize * (request.CurrentPage - 1)).Take(request.PageSize).ToList(),
+                Data = listpage,
                 TotalCount = list.Count(),
                 TotalPages = (int)Math.Ceiling((double)list.Count() / request.PageSize),
                 CurrentPage = request.CurrentPage,
-                PageSize = request.PageSize
+                PageSize = listpage.Count()
             });
         }
 
@@ -384,13 +385,14 @@ public ApiResponse DrugtypeDisburseDelete([CustomizeValidator(RuleSet = "Delete"
         public ApiResponse GetAgainList([CustomizeValidator(RuleSet = "Select"), FromBody] CofAgainRequest request)
         {
             var list = _configService.GetAgainList(request.AllotID).OrderBy(t=>t.ID);
+            var listpage = list.Skip(request.PageSize * (request.CurrentPage - 1)).Take(request.PageSize).ToList();
             return new ApiResponse(ResponseType.OK, "ok", new
             {
-                Data = list.Skip(request.PageSize * (request.CurrentPage - 1)).Take(request.PageSize).ToList(),
+                Data = listpage,
                 TotalCount = list.Count(),
                 TotalPages = (int)Math.Ceiling((double)list.Count() / request.PageSize),
                 CurrentPage = request.CurrentPage,
-                PageSize = request.PageSize
+                PageSize = listpage.Count()
             });
         }
 
@@ -446,13 +448,14 @@ public ApiResponse AgainDelete([CustomizeValidator(RuleSet = "Delete"), FromBody
         public ApiResponse GetWorkItems([CustomizeValidator(RuleSet = "Select"), FromBody] WorkItemRequest request)
         {
             var list = _configService.GetWorkItems(request.AllotID, request.Type).OrderBy(t=>t.ID);
+            var listpage = list.Skip(request.PageSize * (request.CurrentPage - 1)).Take(request.PageSize).ToList();
             return new ApiResponse(ResponseType.OK, "ok", new
             {
-                Data = list.Skip(request.PageSize * (request.CurrentPage - 1)).Take(request.PageSize).ToList(),
+                Data = listpage,
                 TotalCount = list.Count(),
                 TotalPages = (int)Math.Ceiling((double)list.Count() / request.PageSize),
                 CurrentPage = request.CurrentPage,
-                PageSize = request.PageSize
+                PageSize = listpage.Count()
             });
         }
 

performance/Performance.Services/PersonService.cs

@@ -316,7 +316,7 @@ public ApiResponse UpdatePerson(PerEmployeeResponse request)
                 throw new PerformanceException($"“关键信息缺失”请补全！");
             }
 
-            var employees = peremployeeRepository.GetEntities(t => t.AllotId == request.AllotId && t.PersonnelNumber == request.PersonnelNumber);
+            var employees = peremployeeRepository.GetEntities(t => t.AllotId == request.AllotId && t.Id == request.Id);
             if (employees == null)
                 throw new PerformanceException($"员工工号为“{request.PersonnelNumber}”不存在，请重新添加！");