医院其他绩效审核修改

performance/Performance.Api/Controllers/EmployeeController.cs

@@ -397,8 +397,7 @@ public ApiResponse DeleteApr([FromBody] IdRequest request)
         public ApiResponse AuditResult([FromBody] AprAmountAuditRequest request)
         {
             var userid = claim.GetUserId();
-            var result = employeeService.ConfirmAudit(userid, request);
-            return result ? new ApiResponse(ResponseType.OK, "操作成功") : new ApiResponse(ResponseType.Fail, "操作失败");
+            return employeeService.ConfirmAudit(userid, request);
         }
 
         /// <summary>
@@ -685,8 +684,7 @@ public ApiResponse DeleteAprHide([FromBody] IdRequest request)
         public ApiResponse AuditResultHide([FromBody] AprAmountAuditRequest request)
         {
             var userid = claim.GetUserId();
-            var result = employeeService.ConfirmAuditHide(userid, request);
-            return result ? new ApiResponse(ResponseType.OK, "操作成功") : new ApiResponse(ResponseType.Fail, "操作失败");
+            return employeeService.ConfirmAuditHide(userid, request);
         }
 
         /// <summary>

performance/Performance.Api/Controllers/ReportController.cs

@@ -348,7 +348,6 @@ public IActionResult AllComputeViewDownload([FromBody] BeginEndTime request)
         public ApiResponse GetWholeHospitalGrantSummary([FromBody] HospitalGrantSummary request)
         {
             return new ApiResponse(ResponseType.OK, "ok", _computeService.GetPerformanceSummary(request, "view_allot_sign_emp"));
-
         }
 
         /// <summary>

performance/Performance.DtoModels/ResponseType.cs

@@ -15,6 +15,8 @@ public enum ResponseType
         Disable = 7,
         TooManyRequests = 8,
         Warning = 9,
+
+        WarningTable = 10,
         Expiration = 99,
     }
 }

performance/Performance.Services/EmployeeService.cs

@@ -539,27 +539,37 @@ public bool DeleteApr(int id)
         /// <param name="userid"></param>
         /// <param name="request"></param>
         /// <returns></returns>
-        public bool ConfirmAudit(int userid, AprAmountAuditRequest request)
-        {
-            if (request.IsPass == 1)
+        public ApiResponse ConfirmAudit(int userid, AprAmountAuditRequest request)
         {
+            List<Dictionary<string, string>> error = new List<Dictionary<string, string>>();
+
             if (request?.Members == null || !request.Members.Any())
                 throw new PerformanceException("审核信息无效，请确认");
 
-                foreach (var item in request.Members)
+            var err = request.Members
+                .Select((w, i) =>
                 {
-                    if (string.IsNullOrEmpty(item.DoctorName) && string.IsNullOrEmpty(item.PersonnelNumber))
-                        throw new PerformanceException("审核信息无效，请确认");
-                }
+                    if (string.IsNullOrEmpty(w.PersonnelNumber))
+                    {
+                        return new Dictionary<string, string>
+                        {
+                            { "行号", $"第{i+1}行" }, { "人员工号", w.PersonnelNumber??"" }, { "姓名", w.DoctorName??"" }, { "错误原因", "“人员工号”为空" },
+                        };
                     }
+                    return null;
+                })
+                .Where(w => w != null);
+
+            error.AddRange(err);
+            if (error.Count > 0)
+                return new ApiResponse(ResponseType.WarningTable, "当前操作已拒绝", error);
 
             var allApramounts = perapramountRepository.GetEntities(t => t.AllotId == request.AllotId);
             foreach (var member in request.Members)
             {
                 var apramounts = allApramounts?.Where(t => (t.PersonnelNumber ?? "") == member.PersonnelNumber);
-                if (request.IsPass == 1 && (apramounts == null || !apramounts.Any()))
-                    throw new PerformanceException($"工号为“{member.PersonnelNumber}”的审核信息无效，请确认");
-
+                if (apramounts != null && apramounts.Any())
+                {
                     foreach (var item in apramounts)
                     {
                         item.Status = (request.IsPass == 1) ? 3 : 4;
@@ -568,7 +578,8 @@ public bool ConfirmAudit(int userid, AprAmountAuditRequest request)
                         perapramountRepository.UpdateRange(apramounts.ToArray());
                     }
                 }
-            return true;
+            }
+            return new ApiResponse(ResponseType.OK, "");
         }
         /// <summary>
         /// 上传导入医院其他绩效
@@ -951,24 +962,38 @@ public bool DeleteAprHide(int id)
         /// <param name="userid"></param>
         /// <param name="request"></param>
         /// <returns></returns>
-        public bool ConfirmAuditHide(int userid, AprAmountAuditRequest request)
+        public ApiResponse ConfirmAuditHide(int userid, AprAmountAuditRequest request)
         {
+            List<Dictionary<string, string>> error = new List<Dictionary<string, string>>();
+
             if (request?.Members == null || !request.Members.Any())
                 throw new PerformanceException("审核信息无效，请确认");
 
-            foreach (var item in request.Members)
+
+            var err = request.Members
+                .Select((w, i) =>
                 {
-                if (string.IsNullOrEmpty(item.DoctorName) && string.IsNullOrEmpty(item.PersonnelNumber))
-                    throw new PerformanceException("审核信息无效，请确认");
+                    if (string.IsNullOrEmpty(w.PersonnelNumber))
+                    {
+                        return new Dictionary<string, string>
+                        {
+                            { "行号", $"第{i+1}行" }, { "人员工号", w.PersonnelNumber??"" }, { "姓名", w.DoctorName??"" }, { "错误原因", "“人员工号”为空" },
+                        };
                     }
+                    return null;
+                })
+                .Where(w => w != null);
+
+            error.AddRange(err);
+            if (error.Count > 0)
+                return new ApiResponse(ResponseType.WarningTable, "当前操作已拒绝", error);
 
             var allApramounts = _hideRepository.GetEntities(t => t.AllotId == request.AllotId);
             foreach (var member in request.Members)
             {
                 var apramounts = allApramounts?.Where(t => (t.PersonnelNumber ?? "") == member.PersonnelNumber);
-                if (apramounts == null || !apramounts.Any())
-                    throw new PerformanceException($"工号为“{member.PersonnelNumber}”的审核信息无效，请确认");
-
+                if (apramounts != null && apramounts.Any())
+                {
                     foreach (var item in apramounts)
                     {
                         item.Status = (request.IsPass == 1) ? 3 : 4;
@@ -977,7 +1002,8 @@ public bool ConfirmAuditHide(int userid, AprAmountAuditRequest request)
                         _hideRepository.UpdateRange(apramounts.ToArray());
                     }
                 }
-            return true;
+            }
+            return new ApiResponse(ResponseType.OK, "");
         }
 
         /// <summary>

performance/Performance.Services/PersonService.cs

@@ -771,8 +771,7 @@ public bool BathSavePerson(int AllotId, int HospitalId, SaveCollectData request)
 
                 if (!string.IsNullOrEmpty(data.Department?.Trim()) && !string.IsNullOrEmpty(data.AccountingUnit?.Trim()) && !string.IsNullOrEmpty(data.DoctorName?.Trim()) && !any)
                 {
-                    if (persons != null)
-                        if (persons.Any(t => t.PersonnelNumber?.Trim() == data.PersonnelNumber?.Trim()))
+                    if (persons != null && persons.Any(t => t.PersonnelNumber?.Trim() == data.PersonnelNumber?.Trim()))
                         delPersonsNum.Add(data.PersonnelNumber);
 
                     data.HospitalId = HospitalId;