医院其他绩效8.23问题修改

performance/Performance.Api/Controllers/EmployeeController.cs

@@ -268,12 +268,12 @@ public ApiResponse Audit(int allotid)
         /// <returns></returns>
         [Route("apr/getlist")]
         [HttpPost]
-        public ApiResponse GetAprList([FromBody] per_apr_amount request)
+        public ApiResponse GetAprList([FromBody] AprAmountAuditRequest request)
         {
             if (request.AllotId == 0)
                 return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
 
-            var employee = employeeService.GetAprByTypeInDepartment(request.AllotId, request.TypeInDepartment);
+            var employee = employeeService.GetAprByTypeInDepartment(request.AllotId, request.TypeInDepartment, request.CreateDate);
             return new ApiResponse(ResponseType.OK, "ok", employee);
         }
 
@@ -293,10 +293,11 @@ public ApiResponse GetAprGroupList([FromBody] AllotIdRequest request)
             if (employee == null || !employee.Any())
                 return new ApiResponse(ResponseType.OK, "ok", employee);
 
-            var result = employee.GroupBy(t => new { TypeInDepartment = t.TypeInDepartment ?? "" })
+            var result = employee.GroupBy(t => new { TypeInDepartment = t.TypeInDepartment ?? "", t.CreateDate })
                 .Select(t => new OhterAmountAuditResponse
                 {
                     TypeInDepartment = t.Key.TypeInDepartment,
+                    CreateDate = t.Key.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
                     Amount = t.Sum(s => s.Amount ?? 0),
                     Status = t.Any(s => s.Status == 2) ? 2 : t.Any(s => s.Status == 4) ? 4 : t.FirstOrDefault().Status,
                     AuditTime = t.Any(s => s.Status == 2) ? "" : t.Max(w => w.AuditTime)?.ToString("yyyy-MM-dd HH:mm:ss"),
@@ -312,12 +313,12 @@ public ApiResponse GetAprGroupList([FromBody] AllotIdRequest request)
         /// <returns></returns>
         [Route("apr/getdeptdetail")]
         [HttpPost]
-        public ApiResponse GetAprDetail([FromBody] per_apr_amount request)
+        public ApiResponse GetAprDetail([FromBody] AprAmountAuditRequest request)
         {
             if (request.AllotId == 0)
                 return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
 
-            var employee = employeeService.GetAprList(request.AllotId, request.TypeInDepartment);
+            var employee = employeeService.GetAprList(request.AllotId, request.TypeInDepartment, date: request.CreateDate);
             if (employee == null || !employee.Any())
                 return new ApiResponse(ResponseType.OK, "ok", employee);
 
@@ -398,12 +399,12 @@ public ApiResponse DeleteApr([FromBody] IdRequest request)
         /// <returns></returns>
         [HttpPost]
         [Route("apr/commit")]
-        public ApiResponse CommitResult([FromBody] per_apr_amount request)
+        public ApiResponse CommitResult([FromBody] AprAmountAuditRequest request)
         {
             if (request.AllotId == 0)
                 return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
 
-            var result = employeeService.CommitApr(request.AllotId, request.TypeInDepartment, request.Status ?? 1);
+            var result = employeeService.CommitApr(request.AllotId, request.TypeInDepartment, request.Status, request.CreateDate);
             return new ApiResponse(ResponseType.OK);
         }
 
@@ -547,10 +548,11 @@ public ApiResponse AprOverview(int allotId)
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("apr/clear")]
-        public ApiResponse<List<TitleValue>> ClearAprData([FromBody] per_apr_amount request)
+        public ApiResponse<List<TitleValue>> ClearAprData([FromBody] AprAmountAuditRequest request)
         {
             var result = employeeService.ClearAprData(request);
-            return new ApiResponse<List<TitleValue>>(ResponseType.OK, "删除成功");
+            return result ? new ApiResponse<List<TitleValue>>(ResponseType.OK, "删除成功")
+               : new ApiResponse<List<TitleValue>>(ResponseType.OK, "删除失败");
         }
         #endregion
 
@@ -599,12 +601,12 @@ public ApiResponse GetDeptAssessment(int allotId)
         /// <returns></returns>
         [Route("apr/hide/getlist")]
         [HttpPost]
-        public ApiResponse GetAprHideList([FromBody] per_apr_amount request)
+        public ApiResponse GetAprHideList([FromBody] AprAmountAuditRequest request)
         {
             if (request.AllotId == 0)
                 return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
 
-            var employee = employeeService.GetAprHideByTypeInDepartment(request.AllotId, request.TypeInDepartment);
+            var employee = employeeService.GetAprHideByTypeInDepartment(request.AllotId, request.TypeInDepartment, request.CreateDate);
             return new ApiResponse(ResponseType.OK, "ok", employee);
         }
 
@@ -624,10 +626,11 @@ public ApiResponse GetAprHideGroupList([FromBody] AllotIdRequest request)
             if (employee == null || !employee.Any())
                 return new ApiResponse(ResponseType.OK, "ok", employee);
 
-            var result = employee.GroupBy(t => new { TypeInDepartment = t.TypeInDepartment ?? "" })
+            var result = employee.GroupBy(t => new { TypeInDepartment = t.TypeInDepartment ?? "", t.CreateDate })
                 .Select(t => new OhterAmountAuditResponse
                 {
                     TypeInDepartment = t.Key.TypeInDepartment,
+                    CreateDate = t.Key.CreateDate.ToString("yyyy-MM-dd HH:mm:ss"),
                     Amount = t.Sum(s => s.Amount ?? 0),
                     Status = t.Any(s => s.Status == 2) ? 2 : t.Any(s => s.Status == 4) ? 4 : t.FirstOrDefault().Status,
                     AuditTime = t.Any(s => s.Status == 2) ? "" : t.Max(w => w.AuditTime)?.ToString("yyyy-MM-dd HH:mm:ss"),
@@ -729,12 +732,12 @@ public ApiResponse DeleteAprHide([FromBody] IdRequest request)
         /// <returns></returns>
         [HttpPost]
         [Route("apr/hide/commit")]
-        public ApiResponse CommitResultHide([FromBody] per_apr_amount request)
+        public ApiResponse CommitResultHide([FromBody] AprAmountAuditRequest request)
         {
             if (request.AllotId == 0)
                 return new ApiResponse(ResponseType.ParameterError, "参数AllotId无效！");
 
-            var result = employeeService.CommitAprHide(request.AllotId, request.TypeInDepartment, request.Status ?? 1);
+            var result = employeeService.CommitAprHide(request.AllotId, request.TypeInDepartment, request.Status, request.CreateDate);
             return new ApiResponse(ResponseType.OK);
         }
 
@@ -867,10 +870,11 @@ public ApiResponse AprHideOverview(int allotId)
         /// <param name="request"></param>
         /// <returns></returns>
         [HttpPost("apr/hide/clear")]
-        public ApiResponse<List<TitleValue>> ClearAprHideData([FromBody] per_apr_amount request)
+        public ApiResponse<List<TitleValue>> ClearAprHideData([FromBody] AprAmountAuditRequest request)
         {
             var result = employeeService.ClearAprHideData(request);
-            return new ApiResponse<List<TitleValue>>(ResponseType.OK, "删除成功");
+            return result ? new ApiResponse<List<TitleValue>>(ResponseType.OK, "删除成功")
+               : new ApiResponse<List<TitleValue>>(ResponseType.OK, "删除失败");
         }
         #endregion
 

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

@@ -1136,7 +1136,7 @@
             <param name="allotid"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.EmployeeController.GetAprList(Performance.DtoModels.AllotIdRequest)">
+        <member name="M:Performance.Api.Controllers.EmployeeController.GetAprList(Performance.DtoModels.AprAmountAuditRequest)">
             <summary>
             获取医院其他绩效列表
             </summary>
@@ -1150,7 +1150,7 @@
             <param name="request"></param>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.EmployeeController.GetAprDetail(Performance.EntityModels.per_apr_amount)">
+        <member name="M:Performance.Api.Controllers.EmployeeController.GetAprDetail(Performance.DtoModels.AprAmountAuditRequest)">
             <summary>
             医院其他绩效审核详情
             </summary>
@@ -1217,6 +1217,13 @@
             <param name="allotId"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.EmployeeController.ClearAprData(Performance.DtoModels.AprAmountAuditRequest)">
+            <summary>
+            清理该科室录入数据
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.EmployeeController.GetEmployeeMessage(Performance.EntityModels.per_apr_amount)">
              <summary>
              自动获取人员信息
@@ -1240,7 +1247,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Performance.Api.Controllers.EmployeeController.GetAprHideList(Performance.DtoModels.AllotIdRequest)">
+        <member name="M:Performance.Api.Controllers.EmployeeController.GetAprHideList(Performance.DtoModels.AprAmountAuditRequest)">
             <summary>
             获取不公示其他绩效列表
             </summary>
@@ -1321,6 +1328,13 @@
             <param name="allotId"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.EmployeeController.ClearAprHideData(Performance.DtoModels.AprAmountAuditRequest)">
+            <summary>
+            清理该科室录入不公示数据
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.EmployeeController.GetDeptComparison(Performance.DtoModels.ComparisonPagingRequest)">
             <summary>
             实发绩效比对

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

@@ -1909,6 +1909,15 @@
         <member name="P:Performance.DtoModels.AprAmountAuditRequest.AllotId">
             <summary> 绩效ID </summary>
         </member>
+        <member name="P:Performance.DtoModels.AprAmountAuditRequest.TypeInDepartment">
+            <summary> 录入科室 </summary>
+        </member>
+        <member name="P:Performance.DtoModels.AprAmountAuditRequest.CreateDate">
+            <summary> 创建时间 </summary>
+        </member>
+        <member name="P:Performance.DtoModels.AprAmountAuditRequest.Status">
+            <summary> 提交 1、撤销 2、提交 </summary>
+        </member>
         <member name="P:Performance.DtoModels.AprAmountAuditRequest.IsPass">
             <summary> 审核结果 1、审核通过 2、驳回 </summary>
         </member>

performance/Performance.DtoModels/Request/AprAmountAuditRequest.cs

@@ -7,24 +7,30 @@ namespace Performance.DtoModels
 {
     public class AprAmountAuditRequest
     {
-        public class Member
-        {
-            public string PersonnelNumber { get; set; }
-            public string DoctorName { get; set; }
-        }
         /// <summary> 绩效ID </summary>
         public int AllotId { get; set; }
-        public List<Member> Members { get; set; }
+
+        /// <summary> 录入科室 </summary>
+        public string TypeInDepartment { get; set; }
+
+        /// <summary> 创建时间 </summary>
+        public DateTime CreateDate { get; set; }
+
+        /// <summary> 提交 1、撤销 2、提交 </summary>
+        public int Status { get; set; }
+
         /// <summary> 审核结果 1、审核通过 2、驳回 </summary>
         public int IsPass { get; set; }
+
         /// <summary> 备注 </summary>
         public string Remark { get; set; }
+
+        public List<Member> Members { get; set; }
     }
-    public class AprAmountAuditRequestValidator : AbstractValidator<AprAmountAuditRequest>
+
+    public class Member
     {
-        public AprAmountAuditRequestValidator()
-        {
-            RuleFor(x => x.IsPass).NotNull().NotEmpty().InclusiveBetween(1, 2);
-        }
+        public string PersonnelNumber { get; set; }
+        public string DoctorName { get; set; }
     }
 }

performance/Performance.DtoModels/Response/OhterAmountAuditResponse.cs

@@ -11,6 +11,7 @@ public class OhterAmountAuditResponse
         public string TypeInDepartment { get; set; }
         public decimal Amount { get; set; }
         public int? Status { get; set; }
+        public string CreateDate { get; set; }
         public string AuditTime { get; set; }
         public string Remark { get; set; }
     }

performance/Performance.EntityModels/Entity/per_apr_amount.cs

@@ -74,7 +74,7 @@ public class per_apr_amount
         /// <summary>
         /// 
         /// </summary>
-        public Nullable<DateTime> CreateDate { get; set; }
+        public DateTime CreateDate { get; set; }
 
         /// <summary>
         /// 

performance/Performance.EntityModels/Entity/per_apr_amount_hide.cs

@@ -69,7 +69,7 @@ public class per_apr_amount_hide
         /// <summary>
         /// 
         /// </summary>
-        public Nullable<DateTime> CreateDate { get; set; }
+        public DateTime CreateDate { get; set; }
 
         /// <summary>
         ///