手工录入数据补录列表、查看详情

performance/Performance.Api/Controllers/EmployeeController.cs

@@ -858,12 +858,12 @@ public ApiResponse GetDeptComparisonTotal([FromRoute] int allotId)
         /// <returns></returns>
         [Route("getgatherdrop/{allotId}")]
         [HttpPost]
-        public ApiResponse GetGatherDrop([FromRoute] int allotId)
+        public ApiResponse GetGatherDrop([FromRoute] int allotId,int userId)
         {
             if (allotId <= 0)
                 return new ApiResponse(ResponseType.Fail, "参数错误", "allotid无效");
 
-            var relust = employeeService.GetGatherDrop(allotId);
+            var relust = employeeService.GetGatherDrop(allotId,userId);
             return new ApiResponse(ResponseType.OK, relust);
         }
 
@@ -914,16 +914,17 @@ public ApiResponse SaveGatherHands([FromRoute] int allotId, [FromBody] SaveGathe
         /// <param name="allotId"></param>
         /// <param name="department">科室</param>
         /// <param name="source">来源</param>
+        /// <param name="category">费用类型</param>
         /// <param name="request">分页</param>
         /// <returns></returns>
-        [Route("getgather/{allotId},{department},{source}")]
+        [Route("getgather/{allotId},{source},{category},{createTime}")]
         [HttpPost]
-        public ApiResponse GetGather([FromRoute] int allotId, string department, string source, [FromBody] PersonParamsRequest request)
+        public ApiResponse GetGather([FromRoute] int allotId,string department, string source, string category, [FromBody] PersonParamsRequest request)
         {
-            if (allotId <= 0 || string.IsNullOrEmpty(department) || string.IsNullOrEmpty(source))
-                return new ApiResponse(ResponseType.Fail, "参数错误", "请检查allotId，department，source是否正确");
+            if (allotId <= 0 || string.IsNullOrEmpty(source) || string.IsNullOrEmpty(category)  || string.IsNullOrEmpty(department) )
+                return new ApiResponse(ResponseType.Fail, "参数错误", "请检查allotId,source,category,department是否正确");
 
-            var result = employeeService.GetGather(allotId, department, source, request);
+            var result = employeeService.GetGather(allotId, department, source, category, request);
 
             return new ApiResponse(ResponseType.OK, result);
 
@@ -933,16 +934,17 @@ public ApiResponse GetGather([FromRoute] int allotId, string department, string
         /// 手工录入列表 - 汇总 
         /// </summary>
         /// <param name="allotId"></param>
+        /// <param name="userId"></param>
         /// <param name="request">分页</param>
         /// <returns></returns>
         [Route("getgathertotal/{allotId}")]
         [HttpPost]
-        public ApiResponse GetGatherTotal([FromRoute] int allotId, [FromBody] PersonParamsRequest request)
+        public ApiResponse GetGatherTotal([FromRoute] int allotId,int userId, [FromBody] PersonParamsRequest request)
         {
             if (allotId <= 0)
                 return new ApiResponse(ResponseType.Fail, "参数错误", "allotid无效");
 
-            var result = employeeService.GetGatherTotal(allotId, request);
+            var result = employeeService.GetGatherTotal(allotId,userId, request);
 
             return new ApiResponse(ResponseType.OK, result);
         }

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

@@ -1356,7 +1356,7 @@
             <param name="allotId"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.EmployeeController.GetGatherDrop(System.Int32)">
+        <member name="M:Performance.Api.Controllers.EmployeeController.GetGatherDrop(System.Int32,System.Int32)">
             <summary>
             手工录入 - 下拉列表
             </summary>
@@ -1379,21 +1379,23 @@
             <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.EmployeeController.GetGather(System.Int32,System.String,System.String,Performance.DtoModels.PersonParamsRequest)">
+        <member name="M:Performance.Api.Controllers.EmployeeController.GetGather(System.Int32,System.String,System.String,System.String,Performance.DtoModels.PersonParamsRequest)">
             <summary>
             手工录入列表 - 明细
             </summary>
             <param name="allotId"></param>
             <param name="department">科室</param>
             <param name="source">来源</param>
+            <param name="category">费用类型</param>
             <param name="request">分页</param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.EmployeeController.GetGatherTotal(System.Int32,Performance.DtoModels.PersonParamsRequest)">
+        <member name="M:Performance.Api.Controllers.EmployeeController.GetGatherTotal(System.Int32,System.Int32,Performance.DtoModels.PersonParamsRequest)">
             <summary>
             手工录入列表 - 汇总 
             </summary>
             <param name="allotId"></param>
+            <param name="userId"></param>
             <param name="request">分页</param>
             <returns></returns>
         </member>

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

@@ -3629,9 +3629,19 @@
             创建时间
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.ex_result_gather.AuditTime">
+            <summary>
+            审核时间
+            </summary>
+        </member>
+        <member name="P:Performance.EntityModels.ex_result_gather.States">
+            <summary>
+            审核状态 0未审核 1 未通过 2 通过 3审核中
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.ex_result_gather.Remark">
             <summary>
-            备注
+            失败理由
             </summary>
         </member>
         <member name="T:Performance.EntityModels.ex_script">

performance/Performance.DtoModels/AutoMapper/AutoMapperConfigs.cs

@@ -78,6 +78,7 @@ public AutoMapperConfigs()
             CreateMap<PerDataEmployee, im_employee>();
             CreateMap<im_employee, PerDataEmployee>();
             CreateMap<res_baiscnorm, ComputerAvgRequest>().ReverseMap();
+            CreateMap<ex_result_gather, GatherTotalRequest>();
 
             //CreateMap<PerDataAccountBaisc, PerDataAccount>()
             //    .ForMember(dest => dest.AccountingUnit, opt => opt.MapFrom(src => src.AccountingUnit))

performance/Performance.DtoModels/PerExcel/PerSheetHeader.cs

@@ -104,9 +104,13 @@ public class ColumnHeadsConfig
 
         public static List<Heads> GatherTotal { get; } = new List<Heads>
         {
-            new Heads{Column="科室",Name=nameof(GatherTotalRequest.Department)},
+            new Heads{Column="核算组别",Name=nameof(GatherTotalRequest.Department)},
             new Heads{Column="来源",Name=nameof(GatherTotalRequest.Source)},
-            new Heads{Column="费用",Name=nameof(GatherTotalRequest.Fee)}
+            new Heads{Column="核算项目",Name=nameof(GatherTotalRequest.Category)},
+            new Heads{Column="提交日期",Name=nameof(GatherTotalRequest.CreateTime)},
+            new Heads{Column="审核日期",Name=nameof(GatherTotalRequest.AuditTime)},
+            new Heads{Column="审核状态",Name=nameof(GatherTotalRequest.States)},
+            new Heads{Column="失败理由",Name=nameof(GatherTotalRequest.Remark)},
         };
     }
     

performance/Performance.DtoModels/Response/GatherResponse.cs

 using Performance.DtoModels.Request;
 using Performance.EntityModels;
 using Performance.Infrastructure.Models;
+using System;
 using System.Collections.Generic;
 
 namespace Performance.DtoModels
@@ -8,7 +9,7 @@ namespace Performance.DtoModels
     public class GatherResponse
     {
         public List<Heads> Heads { get; set; }
-        public List<GatherTotalRequest> Datas { get; set; }
+        public List<Dictionary<string, object>> Datas { get; set; }
         public int CurrentPage { get; set; }
         public int TotalPages { get; set; }
         public int PageSize { get; set; }
@@ -41,18 +42,22 @@ public class GatherRequest
 
     public class GatherTotalRequest
     {
-        public int ID { get; set; }
         public string Department { get; set; }
         public string Source { get; set; }
-        public decimal Fee { get; set; }
+        public string Category { get; set; }
+        public string CreateTime { get; set; }
+        public string AuditTime { get; set; }
+        public string States { get; set; }
+        public string Remark { get; set; }
     }
     public class GatherInfoRequest
     {
         public string Source { get; set; }
+        public string CreateTime { get; set; }
         public string Department { get; set; }
         public string DoctorName { get; set; }
         public string PersonnelNumber { get; set; }
-        public List<GatherInfoFee> Detail { get; set; }
+        public GatherInfoFee Detail { get; set; }
 
     }
     public class GatherInfoFee

performance/Performance.EntityModels/Entity/ex_result_gather.cs

@@ -43,12 +43,16 @@ public class ex_result_gather
         /// </summary>
         public DateTime CreateTime { get; set; }
         /// <summary>
-        /// 备注
+        /// 审核时间
+        /// </summary>
+        public DateTime? AuditTime { get; set; }
+        /// <summary>
+        /// 审核状态 0未审核 1 未通过 2 通过 3审核中
+        /// </summary>
+        public int States { get; set; }
+        /// <summary>
+        /// 失败理由
         /// </summary>
         public string Remark { get; set; }
-        // /// <summary>
-        // /// 1 未通过 2 通过 
-        // /// </summary>
-        // public int States { get; set; }
     }
 }