Merge branch 'hotfix/修复下发新增判定条件'

performance/Performance.Services/AllotCompute/ResultComputeService.cs

@@ -672,7 +672,7 @@ public List<IssuedPromptResponse> IssuedPrompt(per_allot allot, AllotRequest req
             foreach (var item in secondList)
             {
                 var second = secondList?.FirstOrDefault(f => f.UnitType == item.UnitType && f.Department == item.Department);
-                
+
                 var isDiffer = (item.RealGiveFee ?? 0) != (item.PreRealGiveFee ?? 0);
 
                 if ((item.RealGiveFee ?? 0) == 0 && (item.PreRealGiveFee ?? 0) > 0)
@@ -683,7 +683,7 @@ public List<IssuedPromptResponse> IssuedPrompt(per_allot allot, AllotRequest req
                     promptSecond.IssueStatus = 4;
                     promptSeconds.Add(promptSecond);
                 }
-                else if (isDiffer && !status.Contains(item.Status.Value) && (IsOpen==true? !status.Contains(item.NursingDeptStatus.Value):true))
+                else if (isDiffer && !status.Contains(item.Status.Value) && (IsOpen == true ? !status.Contains(item.NursingDeptStatus.Value) : true))
                 {
                     var promptSecond = _mapper.Map<IssuedPromptResponse>(item);
                     promptSecond.StatusRemake = $@"未提交科室实发绩效变更,原金额:{item.RealGiveFee ?? 0}";
@@ -691,7 +691,7 @@ public List<IssuedPromptResponse> IssuedPrompt(per_allot allot, AllotRequest req
                     promptSecond.RealGiveFee = item.PreRealGiveFee;
                     promptSeconds.Add(promptSecond);
                 }
-                else if (isDiffer && status.Contains(item.Status.Value) && (IsOpen==true? status.Contains(item.NursingDeptStatus.Value):true))
+                else if (isDiffer && status.Contains(item.Status.Value) && (IsOpen == true ? status.Contains(item.NursingDeptStatus.Value) : true))
                 {
                     var promptSecond = _mapper.Map<IssuedPromptResponse>(item);
                     promptSecond.StatusRemake = $@"已提交或已审核科室实发绩效变更驳回,原金额:{item.RealGiveFee ?? 0}";
@@ -708,7 +708,7 @@ public List<IssuedPromptResponse> IssuedPrompt(per_allot allot, AllotRequest req
 
                     promptSeconds.Add(promptSecond);
                 }
-                else if ((item.RealGiveFee ?? 0) >= 0 && (item.PreRealGiveFee ?? 0) == 0)
+                else if ((item.PreRealGiveFee ?? 0) == 0)
                 {
                     var promptSecond = _mapper.Map<IssuedPromptResponse>(item);
                     promptSecond.StatusRemake = "";