BUG修复及其他功能完善

performance/Performance.Api/Controllers/SecondAllotController.cs

@@ -678,7 +678,7 @@ public ApiResponse RedistributionCompute([FromBody] SecondComputeDto request)
                 // 重算部分数据
                 _redistributionService.RedistributionCompute((ComputeMode)request.ComputeMode, request.Head, cleanDatas);
 
-                var dic = _redistributionService.GetTableHeaderDictionary((ComputeMode)request.ComputeMode, second, loads, workloadGroups);
+                var dic = _redistributionService.GetTableHeaderDictionary((ComputeMode)request.ComputeMode, allot, second, loads, workloadGroups);
                 return new ApiResponse(ResponseType.OK, new { Head = request.Head, Body = cleanDatas, Dic = dic });
             }
             catch (PerformanceException ex)
@@ -717,7 +717,7 @@ public ApiResponse RedistributionSave([FromBody] SecondComputeDto request)
                 // 清理无效数据 没有Tab标签的数据才是要计算的数据
                 var cleanDatas = request.Body.Where(w => w.Count > 0 && w.GetValue(nameof(ResponseType), "") == ResponseType.OK.ToString()).ToList();
                 if (cleanDatas == null || cleanDatas.Count == 0)
-                    throw new PerformanceException("提交参数都是无效数据，请重新填写数据后查看计算结果！");
+                    throw new PerformanceException("提交参数都是无效数据，请重新填写数据后保存！");
 
                 var result = secondAllotService.RedistributionSave(allot, second, request.Head, cleanDatas);
                 return result ? new ApiResponse(ResponseType.OK) : new ApiResponse(ResponseType.Fail, "保存失败");
@@ -821,9 +821,9 @@ public ApiResponse RedistributionDetail([FromBody] SecondBaseDto request)
             var workloadGroups = _redistributionService.GetTopWorkloadBodyGroups(loads);
 
             // 返回信息 
-            var (head, rows) = _redistributionService.RedistributionDetail((ComputeMode)request.ComputeMode, allot, second);
+            var (head, rows) = _redistributionService.RedistributionDetail((ComputeMode)request.ComputeMode, allot, second, workloadGroups);
 
-            var dic = _redistributionService.GetTableHeaderDictionary((ComputeMode)request.ComputeMode, second, loads, workloadGroups);
+            var dic = _redistributionService.GetTableHeaderDictionary((ComputeMode)request.ComputeMode, allot, second, loads, workloadGroups);
             return new ApiResponse(ResponseType.OK, new { Head = head, Body = rows, Dic = dic });
         }
         #endregion

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

@@ -469,6 +469,11 @@
             职称系数
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.ag_bodysource.TitlePerformanceScore">
+            <summary>
+            职称绩效得分
+            </summary>
+        </member>
         <member name="P:Performance.EntityModels.ag_bodysource.TitlePerformance">
             <summary>
             职称绩效

performance/Performance.EntityModels/Entity/ag_bodysource.cs

@@ -72,6 +72,11 @@ public class ag_bodysource
         public Nullable<decimal> TitleCoefficient { get; set; }
 
         /// <summary>
+        /// 职称绩效得分
+        /// </summary>
+        public Nullable<decimal> TitlePerformanceScore { get; set; }
+
+        /// <summary>
         /// 职称绩效
         /// </summary>
         public Nullable<decimal> TitlePerformance { get; set; }

performance/Performance.Services/SecondAllotService.cs

@@ -1420,7 +1420,7 @@ private List<ag_secondallot> GetNotAuditSeconds(int hospitalId, ag_workload_type
             /**
              * 添加数据时注意避免给已经提交过的数据添加，否则会造成提交时的数据和显示数据不一致 
              */
-            return agsecondallotRepository.GetEntities(t => allots.Select(w => w.ID).Contains(t.AllotId.Value) && t.Department == type.Department && t.UnitType == type.UnitType && IsAudit(t.Status)) ?? seconds;
+            return agsecondallotRepository.GetEntities(t => allots.Select(w => w.ID).Contains(t.AllotId.Value) && t.Department == type.Department && t.UnitType == type.UnitType && !IsAudit(t.Status)) ?? seconds;
         }
 
         /// <summary>