人员字典粘贴后人员标签错乱

performance/Performance.Api/Controllers/EmployeeController.cs

@@ -301,7 +301,7 @@ public ApiResponse GetAprGroupList([FromRoute] int isAudit, [FromBody] AllotIdRe
                     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,
+                    Status = t.OrderByDescending(w => w.Id).FirstOrDefault().Status,
                     PerforType = string.Join("/", t.Select(w => w.PerforType).Distinct()),
                     AuditTime = t.Any(s => s.Status == 2) ? "" : t.Max(w => w.AuditTime)?.ToString("yyyy-MM-dd HH:mm:ss"),
                     Remark = t.Any(s => !s.MarkStatus.HasValue) ? "" : $"已审计{t.Max(w => w.MarkTime)?.ToString("(yyyy-MM-dd HH:mm:ss)")}",
@@ -313,6 +313,20 @@ public ApiResponse GetAprGroupList([FromRoute] int isAudit, [FromBody] AllotIdRe
         }
 
         /// <summary>
+        /// 医院其他绩效提交
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("apr/submitdeptlist")]
+        [HttpPost]
+        public ApiResponse SubmitDeptList([FromBody] SubmitAmountRequest request)
+        {
+            if (employeeService.SubmitDeptList(request))
+                return new ApiResponse(ResponseType.OK,"提交成功");
+            else
+                return new ApiResponse(ResponseType.Fail,"提交失败");
+        }
+        /// <summary>
         /// 医院其他绩效审核详情
         /// </summary>
         /// <param name="request"></param>
@@ -643,7 +657,7 @@ public ApiResponse GetAprHideGroupList([FromRoute] int isAudit, [FromBody] Allot
                     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,
+                    Status = t.OrderByDescending(w => w.Id).FirstOrDefault().Status,
                     PerforType = string.Join("/", t.Select(w => w.PerforType).Distinct()),
                     AuditTime = t.Any(s => s.Status == 2) ? "" : t.Max(w => w.AuditTime)?.ToString("yyyy-MM-dd HH:mm:ss"),
                     Remark = t.Any(s => !s.MarkStatus.HasValue) ? "" : $"已审计{t.Max(w => w.MarkTime)?.ToString("(yyyy-MM-dd HH:mm:ss)")}",
@@ -654,6 +668,22 @@ public ApiResponse GetAprHideGroupList([FromRoute] int isAudit, [FromBody] Allot
             return new ApiResponse(ResponseType.OK, "ok", result);
         }
 
+
+        /// <summary>
+        /// 不公示其他绩效提交
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        [Route("apr/submithidegrouplist")]
+        [HttpPost]
+        public ApiResponse SubmitHideGroupList([FromBody] SubmitAmountRequest request)
+        {
+            if (employeeService.SubmitHideDeptList(request))
+                return new ApiResponse(ResponseType.OK, "提交成功");
+            else
+                return new ApiResponse(ResponseType.Fail, "提交失败");
+        }
+
         /// <summary>
         ///不公示其他绩效审核详情
         /// </summary>

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

@@ -1151,6 +1151,13 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.EmployeeController.SubmitDeptList(Performance.DtoModels.SubmitAmountRequest)">
+            <summary>
+            医院其他绩效提交
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.EmployeeController.GetAprDetail(Performance.DtoModels.AprAmountAuditRequest)">
             <summary>
             医院其他绩效审核详情
@@ -1263,6 +1270,13 @@
             <param name="request"></param>
             <returns></returns>
         </member>
+        <member name="M:Performance.Api.Controllers.EmployeeController.SubmitHideGroupList(Performance.DtoModels.SubmitAmountRequest)">
+            <summary>
+            不公示其他绩效提交
+            </summary>
+            <param name="request"></param>
+            <returns></returns>
+        </member>
         <member name="M:Performance.Api.Controllers.EmployeeController.GetAprHideDetail(Performance.EntityModels.per_apr_amount)">
              <summary>
             不公示其他绩效审核详情

performance/Performance.DtoModels/Request/AprAmountAuditRequest.cs

@@ -33,4 +33,12 @@ public class Member
         public string PersonnelNumber { get; set; }
         public string DoctorName { get; set; }
     }
+
+    public class SubmitAmountRequest
+    {
+        public int AllotId { get; set; }
+        public string TypeInDepartment { get; set; }
+        public string PerforType { get; set; }
+        public string Remark { get; set; }
+    }
 }

performance/Performance.Services/EmployeeService.cs

@@ -449,7 +449,23 @@ public List<per_apr_amount> GetAprList(int allotId, int userId, int isAudit)
 
             return list;
         }
+        /// <summary>
+        /// 医院其他绩效提交
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public bool SubmitDeptList(SubmitAmountRequest request)
+        {
+            string[] perforTypes = request.PerforType.Split("/");
+            var result = perapramountRepository.GetEntities(w => w.AllotId == request.AllotId && w.TypeInDepartment == request.TypeInDepartment && perforTypes.Contains(w.PerforType));
+            result.ForEach(w =>
+            {
+                w.Status = 2;
+                w.Remark = request.Remark;
+            });
+            return perapramountRepository.UpdateRange(result.ToArray());
 
+        }
         /// <summary>
         /// 医院其他绩效审核详情
         /// </summary>
@@ -925,6 +941,22 @@ public List<per_apr_amount_hide> GetAprHideList(int allotId, int userId, int isA
             return list;
         }
         /// <summary>
+        /// 不公示其他绩效提交
+        /// </summary>
+        /// <returns></returns>
+        public bool SubmitHideDeptList(SubmitAmountRequest request)
+        {
+            string[] perforTypes = request.PerforType.Split("/");
+            var result = _hideRepository.GetEntities(w => w.AllotId == request.AllotId && w.TypeInDepartment == request.TypeInDepartment && perforTypes.Contains(w.PerforType));
+            result.ForEach(w =>
+            {
+                w.Status = 2;
+                w.Remark = request.Remark;
+            });
+            return _hideRepository.UpdateRange(result.ToArray());
+
+        }
+        /// <summary>
         /// 医院其他绩效审核详情
         /// </summary>
         /// <param name="allotId"></param>

performance/Performance.Services/PersonService.cs

@@ -984,7 +984,7 @@ public ApiResponse BathSavePerson(int allotId, int HospitalId, SaveCollectData r
                 var backupTab = perforPeremployeeBackupRepository.GetEntities(t => t.AllotId == allotId);
                 employees.ForEach(e =>
                 {
-                    var result = backupTab.FirstOrDefault(d => d.PersonnelNumber.Contains(e.PersonnelNumber) && d.AllotId == e.AllotId && d.HospitalId == e.HospitalId);
+                    var result = backupTab.FirstOrDefault(d => d.PersonnelNumber.Replace(" ","") == e.PersonnelNumber.Replace(" ", "") && d.AllotId == e.AllotId && d.HospitalId == e.HospitalId);
                     if (result != null)
                     {
                         e.JobNumber = result.JobNumber;