夜班绩效初步完成

performance/Performance.Api/wwwroot/Performance.DtoModels.xml

@@ -1101,6 +1101,11 @@
             是否需要二次分配
             </summary>
         </member>
+        <member name="P:Performance.DtoModels.PerDataAccountBaisc.NightShiftWorkPerforFee">
+            <summary>
+            夜班绩效
+            </summary>
+        </member>
         <member name="P:Performance.DtoModels.PerDataClinicEmployee.UnitType">
             <summary>
             核算单元分类

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

@@ -4420,6 +4420,11 @@
             是否需要二次分配
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.res_account.NightShiftWorkPerforFee">
+            <summary>
+            夜班绩效
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.res_accountdoctor">
             <summary>
             医生科室核算结果
@@ -5175,6 +5180,11 @@
             调节后其他绩效
             </summary>
         </member>
+        <member name="P:Performance.EntityModels.res_specialunit.NightShiftWorkPerforFee">
+            <summary>
+            夜班绩效
+            </summary>
+        </member>
         <member name="T:Performance.EntityModels.sys_extract">
             <summary>
             医院数据提取脚本

performance/Performance.Services/AllotCompute/ResultComputeService.cs

@@ -587,15 +587,16 @@ public void GenerateSecondAllot(per_allot allot)
                         UnitType = item.UnitType,
                         Department = item.Department,
                         RealGiveFee = item.RealGiveFee,
+                        NightShiftWorkPerforFee = item.NightShiftWorkPerforFee,
                         Status = 1,
                         NursingDeptStatus = 1,
-                        NightShiftWorkPerforFee = item.NightShiftWorkPerforFee,
                     });
                 }
                 else
                 {
-                    if ((Math.Abs((second.RealGiveFee ?? 0) - (item.RealGiveFee ?? 0)) >= 0.5m || Math.Abs((second.NightShiftWorkPerforFee ?? 0) - (item.NightShiftWorkPerforFee ?? 0)) >= 0.5m)
-                         && second.Status > 1)
+                    var backResult = Math.Abs((second.RealGiveFee ?? 0) - (item.RealGiveFee ?? 0)) >= 0.5m
+                        || Math.Abs((second.NightShiftWorkPerforFee ?? 0) - (item.NightShiftWorkPerforFee ?? 0)) >= 0.5m;
+                    if (backResult && second.Status > 1)
                     {
                         second.Status = 4;
                         second.Remark = "科室绩效结果发生变更，需要重新提交";