二次分配多工作量名称返回

performance/Performance.Services/RedistributionService.cs

@@ -229,12 +229,26 @@ public List<SecondColumnDictionary> GetTableHeaderDictionary(ComputeMode compute
                         maps.Add(new SecondColumnDictionary(label, item.Title, false, ++workloadSort, type: "Workload", color: $"workload_color{index}"));
                     }
                 }
-
                 // 多工作量加载 
-                var headDynamic = _agworktypesourceRepository.GetEntities(t => t.SecondId == second.Id) ?? new List<ag_worktype_source>();
-                foreach (var item in headDynamic.OrderBy(t => t.Id))
+                var status = (new int[] { (int)SecondAllotStatus.WaitReview, (int)SecondAllotStatus.PassAudit });
+                // 已提交
+                if (second.Status.HasValue && status.Contains(second.Status.Value))
                 {
-                    maps.Add(new SecondColumnDictionary(item.FieldName, item.FieldId, true, 1, "Top"));
+                    var headDynamic = _agworktypesourceRepository.GetEntities(t => t.SecondId == second.Id) ?? new List<ag_worktype_source>();
+                    foreach (var item in headDynamic.OrderBy(t => t.Id))
+                    {
+                        maps.Add(new SecondColumnDictionary(item.FieldName, item.FieldId, true, 1, "Top"));
+                    }
+                }
+                else
+                {
+                    var workloadTypes = _agworkloadtypeRepository
+                           .GetEntities(t => t.HospitalId == allot.HospitalId && t.Department == second.Department && t.UnitType == second.UnitType) ?? new List<ag_workload_type>();
+                    foreach (var item in workloadTypes.OrderBy(t => t.Id))
+                    {
+                        maps.Add(new SecondColumnDictionary($"{item.TypeName}占比", $"Workload_Ratio_{item.Id}", true, 1, "Top"));
+                        maps.Add(new SecondColumnDictionary($"{item.TypeName}金额", $"Workload_Amount_{item.Id}", true, 1, "Top"));
+                    }
                 }
             }
             // 单项奖励