Merge branch 'v2020calculate' into v2020income

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

@@ -859,7 +859,7 @@
         </member>
         <member name="P:Performance.EntityModels.ag_secondallot.NursingDeptStatus">
             <summary>
-            护理部审核状态 2 等待审核 3 审核通过 4 驳回
+            护理部审核状态 1 未提交  2 等待审核 3 审核通过 4 驳回
             </summary>
         </member>
         <member name="P:Performance.EntityModels.ag_secondallot.NursingDeptAuditTime">

performance/Performance.EntityModels/Entity/ag_secondallot.cs

@@ -87,7 +87,7 @@ public class ag_secondallot
         public string Remark { get; set; }
 
         /// <summary>
-        /// 护理部审核状态 2 等待审核 3 审核通过 4 驳回
+        /// 护理部审核状态 1 未提交  2 等待审核 3 审核通过 4 驳回
         /// </summary>
         public Nullable<int> NursingDeptStatus { get; set; }
 

performance/Performance.Services/AllotCompute/ResultComputeService.cs

@@ -496,6 +496,8 @@ public void GenerateSecondAllot(per_allot allot)
             {
                 foreach (var item in accountUnit)
                 {
+                    if (!tempSecond.Any(f => f.UnitType == ((UnitType)item.UnitType).ToString() && f.Department == item.AccountingUnit))
+                    {
                         tempSecond.Add(new ag_secondallot
                         {
                             AllotId = allot.ID,
@@ -507,9 +509,12 @@ public void GenerateSecondAllot(per_allot allot)
                         });
                     }
                 }
+            }
             if (specialList != null)
             {
-                foreach (var item in specialList)
+                foreach (var item in specialList.Select(w => new { w.AccountingUnit, w.RealGiveFee }).Distinct())
+                {
+                    if (!tempSecond.Any(f => f.UnitType == UnitType.特殊核算组.ToString() && f.Department == item.AccountingUnit))
                     {
                         tempSecond.Add(new ag_secondallot
                         {
@@ -522,6 +527,7 @@ public void GenerateSecondAllot(per_allot allot)
                         });
                     }
                 }
+            }
 
             var secondList = perforAgsecondallotRepository.GetEntities(t => t.AllotId == allot.ID && t.Year == allot.Year && t.Month == allot.Month);
 
@@ -539,6 +545,7 @@ public void GenerateSecondAllot(per_allot allot)
                         Department = item.Department,
                         RealGiveFee = item.RealGiveFee,
                         Status = 1,
+                        NursingDeptStatus = 1,
                     });
                 }
                 else if (Math.Round((second.RealGiveFee ?? 0) - (item.RealGiveFee ?? 0)) >= 0.5m)
@@ -548,6 +555,8 @@ public void GenerateSecondAllot(per_allot allot)
                     {
                         second.Status = 4;
                         second.Remark = "科室绩效结果发生变更，需要重新提交";
+                        second.NursingDeptStatus = 4;
+                        second.NursingDeptRemark = "科室绩效结果发生变更，需要重新提交";
                     }
                     updSecond.Add(second);
                 }

performance/Performance.Services/SecondAllotService.cs

@@ -1308,6 +1308,7 @@ public bool AuditSubmit(ag_secondallot second, int userId)
             }
             second.UseTempId = temp.UseTempId;
             second.Status = 2;
+            second.NursingDeptStatus = 2;
             second.SubmitType = temp.UseTempId == 6 ? 2 : 1;
             second.SubmitTime = DateTime.Now;
             //second.Remark = "已提交审核，等待审核中";