二次分配审核和护理部审核通过同步数据调整

performance/Performance.Services/SecondAllotService.cs

@@ -1703,11 +1703,21 @@ public bool ConfirmAudit(int userId, SecondAuditRequest request)
             if (histories != null && histories.Any())
                 agcomputeRepository.RemoveRange(histories.ToArray());
 
-            #region 添加至二次绩效汇总
+            if (request.IsPass == 1)
+                SyncSecondComputeData(second);
+
+            return result;
+        }
 
-            if (result && request.IsPass == 1)
+        /// <summary>
+        /// 审核结束 添加至二次绩效汇总
+        /// </summary>
+        /// <param name="second"></param>
+        /// <param name="isPass"></param>
+        /// <returns></returns>
+        private bool SyncSecondComputeData(ag_secondallot second)
         {
-                // 护理部审核
+            // 护理部及二次分配审核同时审核完成
             var allot = perallotRepository.GetEntity(w => w.ID == second.AllotId);
             if (allot == null) return true;
 
@@ -1717,13 +1727,16 @@ public bool ConfirmAudit(int userId, SecondAuditRequest request)
             if (hospital.IsOpenNursingDeptAudit == 1 && second.NursingDeptStatus != 3 && new string[] { UnitType.护理组.ToString(), UnitType.其他护理组.ToString() }.Contains(second.UnitType))
                 return true;
 
+            if (second.Status != 3)
+                return true;
+
             var computes = new List<ag_compute>();
 
             var (tempId, name) = GetUsingTempId(hospital.ID, second);
 
             if (new int[] { (int)Temp.crosswise, (int)Temp.lengthways }.Contains(tempId))
             {
-                    var items = agfixatitemRepository.GetEntities(t => t.SecondId == request.SecondId);
+                var items = agfixatitemRepository.GetEntities(t => t.SecondId == second.Id);
                 if (items != null && items.Any())
                 {
                     var rowNumbers = items.Select(t => t.RowNumber).Where(t => t >= 0)?.Distinct();
@@ -1753,7 +1766,7 @@ public bool ConfirmAudit(int userId, SecondAuditRequest request)
             }
             else if (tempId == (int)Temp.other)
             {
-                    var others = agothersourceRepository.GetEntities(t => t.SecondId == request.SecondId);
+                var others = agothersourceRepository.GetEntities(t => t.SecondId == second.Id);
                 if (others != null && others.Any())
                 {
                     foreach (var item in others)
@@ -1777,7 +1790,7 @@ public bool ConfirmAudit(int userId, SecondAuditRequest request)
             }
             else
             {
-                    var bodys = agbodysourceRepository.GetEntities(t => t.SecondId == request.SecondId);
+                var bodys = agbodysourceRepository.GetEntities(t => t.SecondId == second.Id);
                 if (bodys != null && bodys.Any())
                 {
                     foreach (var item in bodys)
@@ -1800,11 +1813,8 @@ public bool ConfirmAudit(int userId, SecondAuditRequest request)
                 }
             }
             agcomputeRepository.AddRange(computes.ToArray());
-            }
-
-            #endregion 添加至二次绩效汇总
 
-            return result;
+            return true;
         }
 
         /// <summary>
@@ -1834,6 +1844,9 @@ public bool NursingDeptAudit(int userId, SecondAuditRequest request)
             second.NursingDeptAuditUser = userId;
             second.NursingDeptAuditTime = DateTime.Now;
 
+            if (request.IsPass == 1)
+                SyncSecondComputeData(second);
+
             return agsecondallotRepository.Update(second);
         }