Merge branch 'develop' of http://192.168.18.110:8880/zry/performance into develop

performance/Performance.Services/ComputeService.cs

@@ -929,7 +929,9 @@ public List<ComputeResponse> AllCompute(int allotId, int hospitalId, int isShowM
                 });
             }
 
-            return response?.OrderByDescending(t => t.AccountingUnit).ToList();
+            var AccountTypes = EnumHelper.GetItems<AccountUnitType>();
+
+            return response?.OrderBy(t => AccountTypes.FirstOrDefault(a => a.Name == t.UnitType)?.Value).ThenByDescending(t => t.AccountingUnit).ToList();
         }
 
         ///// <summary>

performance/Performance.Services/EmployeeService.cs

@@ -517,7 +517,7 @@ public bool ConfirmAudit(int userid, AprAmountAuditRequest request)
             var allApramounts = perapramountRepository.GetEntities(t => t.AllotId == request.AllotId);
             foreach (var member in request.Members)
             {
-                var apramounts = allApramounts?.Where(t => (t.DoctorName ?? "") == member.DoctorName && (t.PersonnelNumber ?? "") == member.PersonnelNumber);
+                var apramounts = allApramounts?.Where(t => (t.PersonnelNumber ?? "") == member.PersonnelNumber);
                 if (request.IsPass == 1 && (apramounts == null || !apramounts.Any()))
                     throw new PerformanceException($"工号为“{member.PersonnelNumber}”的审核信息无效，请确认");