Commit be8b6961 by 纪旭 韦

二次分配录入错误

parent dc6dedd5
...@@ -140,7 +140,7 @@ public SecondDetailDto Load(int secondId, ComputeMode computeMode, EmployeeSourc ...@@ -140,7 +140,7 @@ public SecondDetailDto Load(int secondId, ComputeMode computeMode, EmployeeSourc
} }
} }
var head = LoadHead(computeMode, allot, second, overrideMode); var head = LoadHead(computeMode, allot, second, prevSecondAllot, overrideMode);
var dic = GetTableHeaderDictionary(computeMode, allot, second, loads, isAttachFactor: false); var dic = GetTableHeaderDictionary(computeMode, allot, second, loads, isAttachFactor: false);
return new SecondDetailDto { Head = head, Body = handson, Dic = dic }; return new SecondDetailDto { Head = head, Body = handson, Dic = dic };
} }
...@@ -426,9 +426,8 @@ public void RowsExpand(per_allot allot, List<SecondColumnDictionary> dic, List<D ...@@ -426,9 +426,8 @@ public void RowsExpand(per_allot allot, List<SecondColumnDictionary> dic, List<D
/// <param name="second"></param> /// <param name="second"></param>
/// <param name="allot"></param> /// <param name="allot"></param>
/// <returns></returns> /// <returns></returns>
private Dictionary<string, object> LoadHead(ComputeMode computeMode, per_allot allot, ag_secondallot second, EmployeeSource overrideMode = 0) private Dictionary<string, object> LoadHead(ComputeMode computeMode, per_allot allot, ag_secondallot second, ag_secondallot prevSecondAllot, EmployeeSource overrideMode = 0)
{ {
prevSecondAllot = _secondAllotDetails.GetPreviousSecondAllot(allot.HospitalId, second);
/* /*
此处数据需要额外注意,前端显示规则:接口返回则显示 此处数据需要额外注意,前端显示规则:接口返回则显示
避免额外返回造成前端错误显示 避免额外返回造成前端错误显示
...@@ -1601,9 +1600,10 @@ public List<SecondComputeCheckResultDto> CheckData(per_allot allot, ag_secondall ...@@ -1601,9 +1600,10 @@ public List<SecondComputeCheckResultDto> CheckData(per_allot allot, ag_secondall
/// <returns></returns> /// <returns></returns>
public (Dictionary<string, object> head, List<Dictionary<string, object>> rows) RedistributionDetail(ComputeMode computeMode, per_allot allot, ag_secondallot second, List<SecondWorkLoadDto> workloadGroups) 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 loadEmployees = _agbodysourceRepository.GetEntities(w => w.SecondId == second.Id);
var rows = LoadWorkload(allot, second, loadEmployees); var rows = LoadWorkload(allot, second, loadEmployees);
var head = LoadHead(computeMode, allot, second); var head = LoadHead(computeMode, allot, second, prevSecondAllot);
if (computeMode != ComputeMode.NotCalculate) if (computeMode != ComputeMode.NotCalculate)
{ {
overviewCalculate(head, rows); overviewCalculate(head, rows);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment