人员字典添加搜索条件、粘贴数据下载，二次绩效、支出费用类型、工作量配置修改为分页

performance/Performance.Api/Controllers/ConfigController.cs

@@ -321,8 +321,15 @@ public ApiResponse DrugtypeDelete([CustomizeValidator(RuleSet = "Delete"), FromB
         [HttpPost]
         public ApiResponse GetDrugtypeDisburseList([CustomizeValidator(RuleSet = "Select"), FromBody] DrugpropRequest request)
         {
-            var list = _configService.GetDrugtypeDisburseList(request.HospitalId, request.AllotID);
-            return new ApiResponse(ResponseType.OK, "ok", list);
+            var list = _configService.GetDrugtypeDisburseList(request.HospitalId, request.AllotID).OrderBy(t=>t.ID);
+            return new ApiResponse(ResponseType.OK, "ok", new
+            {
+                Data = list.Skip(request.PageSize * (request.CurrentPage - 1)).Take(request.PageSize).ToList(),
+                TotalCount = list.Count(),
+                TotalPages = (int)Math.Ceiling((double)list.Count() / request.PageSize),
+                CurrentPage = request.CurrentPage,
+                PageSize = request.PageSize
+            });
         }
 
         /// <summary>
@@ -376,8 +383,15 @@ public ApiResponse DrugtypeDisburseDelete([CustomizeValidator(RuleSet = "Delete"
         [HttpPost]
         public ApiResponse GetAgainList([CustomizeValidator(RuleSet = "Select"), FromBody] CofAgainRequest request)
         {
-            var list = _configService.GetAgainList(request.AllotID);
-            return new ApiResponse(ResponseType.OK, "ok", list);
+            var list = _configService.GetAgainList(request.AllotID).OrderBy(t=>t.ID);
+            return new ApiResponse(ResponseType.OK, "ok", new 
+            {
+                Data = list.Skip(request.PageSize * (request.CurrentPage - 1)).Take(request.PageSize).ToList(),
+                TotalCount = list.Count(),
+                TotalPages = (int)Math.Ceiling((double)list.Count() / request.PageSize),
+                CurrentPage = request.CurrentPage,
+                PageSize = request.PageSize
+            });
         }
 
         /// <summary>
@@ -429,10 +443,17 @@ public ApiResponse AgainDelete([CustomizeValidator(RuleSet = "Delete"), FromBody
         /// <returns></returns>
         [Route("workitemlist")]
         [HttpPost]
-        public ApiResponse<List<cof_workitem>> GetWorkItems([CustomizeValidator(RuleSet = "Select"), FromBody] WorkItemRequest request)
+        public ApiResponse GetWorkItems([CustomizeValidator(RuleSet = "Select"), FromBody] WorkItemRequest request)
+        {
+            var list = _configService.GetWorkItems(request.AllotID, request.Type).OrderBy(t=>t.ID);
+            return new ApiResponse(ResponseType.OK, "ok", new
             {
-            var list = _configService.GetWorkItems(request.AllotID, request.Type);
-            return new ApiResponse<List<cof_workitem>>(ResponseType.OK, "ok", list);
+                Data = list.Skip(request.PageSize * (request.CurrentPage - 1)).Take(request.PageSize).ToList(),
+                TotalCount = list.Count(),
+                TotalPages = (int)Math.Ceiling((double)list.Count() / request.PageSize),
+                CurrentPage = request.CurrentPage,
+                PageSize = request.PageSize
+            });
         }
 
         /// <summary> 

performance/Performance.Api/Controllers/EmployeeController.cs

@@ -350,6 +350,8 @@ public ApiResponse InsertApr([FromBody] per_apr_amount request)
         {
             if (request.AllotId == 0)
                 return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
+            if (request.Amount == 0)
+                return new ApiResponse(ResponseType.ParameterError, "金额不能是0！");
 
             var result = employeeService.InsertApr(request, claim.GetUserId());
             return result ? new ApiResponse(ResponseType.OK, "添加成功", request) :
@@ -651,6 +653,8 @@ public ApiResponse InsertAprHide([FromBody] per_apr_amount_hide request)
         {
             if (request.AllotId == 0)
                 return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
+            if (request.Amount == 0)
+                return new ApiResponse(ResponseType.ParameterError, "金额不能是0！");
 
             var result = employeeService.InsertAprHide(request, claim.GetUserId());
             return result ? new ApiResponse(ResponseType.OK, "添加成功", request) :

performance/Performance.DtoModels/Request/CofAgainRequest.cs

@@ -32,6 +32,9 @@ public class CofAgainRequest
         /// </summary>
         public Nullable<decimal> Value { get; set; }
 
+        public int CurrentPage { get; set; } = 0;
+        public int PageSize { get; set; } = 0;
+
         public class CofAgainRequestValidator : AbstractValidator<CofAgainRequest>
         {
             public CofAgainRequestValidator()

performance/Performance.DtoModels/Request/DrugpropRequest.cs

@@ -32,6 +32,8 @@ public class DrugpropRequest
         /// 费用类别
         /// </summary>
         public string ChargeType { get; set; }
+        public int CurrentPage { get; set; } = 0;
+        public int PageSize { get; set; } = 0;
 
 
         public class DrugpropRequestValidator : AbstractValidator<DrugpropRequest>

performance/Performance.DtoModels/Request/WorkItemRequest.cs

@@ -20,6 +20,8 @@ public class WorkItemRequest
         /// 1. 药占比 2. CMI
         /// </summary>
         public int Type { get; set; }
+        public int CurrentPage { get; set; } = 0;
+        public int PageSize { get; set; } = 0;
     }
     public class WorkItemRequestValidator : AbstractValidator<WorkItemRequest>
     {

performance/Performance.Services/ConfigService.cs

@@ -3,6 +3,7 @@
 using Performance.EntityModels;
 using Performance.EntityModels.Other;
 using Performance.Infrastructure;
+using Performance.Infrastructure.Models;
 using Performance.Repository;
 using Performance.Repository.Repository;
 using System;

performance/Performance.Services/PersonService.cs

@@ -211,7 +211,7 @@ public PageList<per_employee> GetPersons(int allotId, int userId, PersonParamsRe
                 exp = exp.And(t => t.AccountingUnit == dept && unittype.Contains(t.UnitType));
 
             if (request != null && !string.IsNullOrEmpty(request.SearchQuery))
-                exp = exp.And(t => true && (t.AccountingUnit.Contains(request.SearchQuery) || t.PersonnelNumber.Contains(request.SearchQuery) || t.DoctorName.Contains(request.SearchQuery) || t.Department.Contains(request.SearchQuery)));
+                exp = exp.And(t => true && (t.AccountingUnit.Contains(request.SearchQuery) || t.PersonnelNumber.Contains(request.SearchQuery) || t.DoctorName.Contains(request.SearchQuery) || t.Department.Contains(request.SearchQuery) || t.UnitType.Contains(request.SearchQuery)));
 
             var result = new List<per_employee>();