bug修复

parent 8a2a9a7f
...@@ -746,14 +746,14 @@ public List<IssuedPromptResponse> GetChangeSecond(List<ag_secondallot> secondLis ...@@ -746,14 +746,14 @@ public List<IssuedPromptResponse> GetChangeSecond(List<ag_secondallot> secondLis
promptSecond.IssueStatus = 4; promptSecond.IssueStatus = 4;
promptSeconds.Add(promptSecond); promptSeconds.Add(promptSecond);
} }
else if (isDiffer) else if (isDiffer && (item.PreRealGiveFee ?? 0) != 0)
{ {
if (status.Contains(item.Status.Value)) if (status.Contains(item.Status.Value))
{ {
var promptSecond = _mapper.Map<IssuedPromptResponse>(item); var promptSecond = _mapper.Map<IssuedPromptResponse>(item);
promptSecond.StatusRemake = $@"已提交或已审核科室实发绩效变更驳回,原金额:{item.RealGiveFee ?? 0:0.##}"; promptSecond.StatusRemake = $@"已提交或已审核科室实发绩效变更驳回,原金额:{item.RealGiveFee ?? 0:0.##}";
promptSecond.IssueStatus = 2;
promptSecond.RealGiveFee = item.PreRealGiveFee; promptSecond.RealGiveFee = item.PreRealGiveFee;
promptSecond.IssueStatus = 2;
promptSeconds.Add(promptSecond); promptSeconds.Add(promptSecond);
} }
...@@ -761,8 +761,8 @@ public List<IssuedPromptResponse> GetChangeSecond(List<ag_secondallot> secondLis ...@@ -761,8 +761,8 @@ public List<IssuedPromptResponse> GetChangeSecond(List<ag_secondallot> secondLis
{ {
var promptSecond = _mapper.Map<IssuedPromptResponse>(item); var promptSecond = _mapper.Map<IssuedPromptResponse>(item);
promptSecond.StatusRemake = $@"未提交科室实发绩效变更,原金额:{item.RealGiveFee ?? 0:0.##}"; promptSecond.StatusRemake = $@"未提交科室实发绩效变更,原金额:{item.RealGiveFee ?? 0:0.##}";
promptSecond.IssueStatus = 3;
promptSecond.RealGiveFee = item.PreRealGiveFee; promptSecond.RealGiveFee = item.PreRealGiveFee;
promptSecond.IssueStatus = 3;
promptSeconds.Add(promptSecond); promptSeconds.Add(promptSecond);
} }
} }
...@@ -770,11 +770,12 @@ public List<IssuedPromptResponse> GetChangeSecond(List<ag_secondallot> secondLis ...@@ -770,11 +770,12 @@ public List<IssuedPromptResponse> GetChangeSecond(List<ag_secondallot> secondLis
{ {
var promptSecond = _mapper.Map<IssuedPromptResponse>(item); var promptSecond = _mapper.Map<IssuedPromptResponse>(item);
promptSecond.StatusRemake = $"科室下发金额:{item.PreRealGiveFee ?? 0:0.##},原金额:{item.RealGiveFee ?? 0:0.##}"; promptSecond.StatusRemake = $"科室下发金额:{item.PreRealGiveFee ?? 0:0.##},原金额:{item.RealGiveFee ?? 0:0.##}";
promptSecond.RealGiveFee = item.PreRealGiveFee;
promptSecond.IssueStatus = 1; promptSecond.IssueStatus = 1;
promptSeconds.Add(promptSecond); promptSeconds.Add(promptSecond);
} }
} }
promptSeconds.ForEach(item => item.RealGiveFee = item.RealGiveFee.HasValue ? item.RealGiveFee.Value : 0);
return promptSeconds; return promptSeconds;
} }
} }
......
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