Merge branch 'release/v22.4.18-Beta-wuzhou' into develop

performance/Performance.Services/ExtractExcelService/ExtractService.cs

@@ -347,13 +347,11 @@ private List<ExtractTransDto> StandDataFormat(int hospitalId, int allotId, List<
                     #endregion
 
                     var dept = !string.IsNullOrEmpty(t.inner.FirstOrDefault(exp)?.Department) ? t.inner.FirstOrDefault(exp)?.Department : t.outer.Department;
-                    if (scripts.Any(w => w.TypeId == t.outer.TypeId && w.IsOrgDepartment == 1))
-                        dept = t.outer.Department;
 
                     return new ExtractTransDto
                     {
                         SheetName = t.outer.Source,
-                        Department = dept,
+                        Department = scripts.Any(w => w.TypeId == t.outer.TypeId && w.IsOrgDepartment == 1) ? t.outer.Department : dept,
                         Category = t.outer.Category,
                         DoctorName = t.outer.DoctorName,
                         PersonnelNumber = t.outer.PersonnelNumber,

performance/Performance.Services/RedistributionService.cs

@@ -102,9 +102,6 @@ public SecondDetailDto Load(int secondId, ComputeMode computeMode, EmployeeSourc
             var allot = _perallotRepository.GetEntity(t => t.ID == second.AllotId);
             if (allot == null) throw new PerformanceException("绩效记录不存在！");
 
-            // 前二次绩效
-            prevSecondAllot = _secondAllotDetails.GetPreviousSecondAllot(allot.HospitalId, second);
-
             // 填报模板带出 行政工勤 绩效 
             var computes = _rescomputeRepository.GetEntities(w => w.AllotID == allot.ID && UnitTypeUtil.Office.Contains(w.AccountType));
 
@@ -432,7 +429,7 @@ public void RowsExpand(per_allot allot, List<SecondColumnDictionary> dic, List<D
         /// <param name="second"></param>
         /// <param name="allot"></param>
         /// <returns></returns>
-        private Dictionary<string, object> LoadHead(ComputeMode computeMode, per_allot allot, ag_secondallot second, ag_secondallot prevSecondAllot = null, EmployeeSource overrideMode = 0)
+        private Dictionary<string, object> LoadHead(ComputeMode computeMode, per_allot allot, ag_secondallot second, ag_secondallot prevSecondAllot, EmployeeSource overrideMode = 0)
         {
             /*
              此处数据需要额外注意，前端显示规则：接口返回则显示
@@ -472,6 +469,8 @@ public void RowsExpand(per_allot allot, List<SecondColumnDictionary> dic, List<D
             {
                 int secondId = overrideMode == EmployeeSource.PrevSecondAllot ? prevSecondAllot.Id : second.Id;
                 var history = _agheadsourceRepository.GetEntity(t => t.SecondId == secondId);
+                if (history == null && secondId != (prevSecondAllot?.Id ?? 0))
+                    history = _agheadsourceRepository.GetEntity(t => t.SecondId == prevSecondAllot.Id);
 
                 head.AddOrUpdate(nameof(ag_headsource.SeniorityTitlesAccountedPerformance), history?.SeniorityTitlesAccountedPerformance ?? 0.2m);
                 head.AddOrUpdate(nameof(ag_headsource.Workload_Ratio_Default), history?.Workload_Ratio_Default ?? 0.8m);
@@ -481,6 +480,8 @@ public void RowsExpand(per_allot allot, List<SecondColumnDictionary> dic, List<D
                 var status = (new int[] { (int)SecondAllotStatus.WaitReview, (int)SecondAllotStatus.PassAudit });
 
                 var headDynamic = _agworktypesourceRepository.GetEntities(t => t.SecondId == secondId) ?? new List<ag_worktype_source>();
+                if (!headDynamic.Any() && secondId != (prevSecondAllot?.Id ?? 0))
+                    headDynamic = _agworktypesourceRepository.GetEntities(t => t.SecondId == prevSecondAllot.Id) ?? new List<ag_worktype_source>();
 
 
                 // 已提交
@@ -1618,9 +1619,10 @@ public List<SecondComputeCheckResultDto> CheckData(per_allot allot, ag_secondall
         /// <returns></returns>
         public (Dictionary<string, object> head, List<Dictionary<string, object>> rows) RedistributionDetail(ComputeMode computeMode, per_allot allot, ag_secondallot second, List<SecondWorkLoadDto> workloadGroups)
         {
+            var prevSecondAllot = _secondAllotDetails.GetPreviousSecondAllot(allot.HospitalId, second);
             var loadEmployees = _agbodysourceRepository.GetEntities(w => w.SecondId == second.Id);
             var rows = LoadWorkload(allot, second, loadEmployees);
-            var head = LoadHead(computeMode, allot, second);
+            var head = LoadHead(computeMode, allot, second, prevSecondAllot);
             if (computeMode != ComputeMode.NotCalculate)
             {
                 overviewCalculate(head, rows);