护理部审核调整

parent 0090cfe6
...@@ -859,7 +859,7 @@ ...@@ -859,7 +859,7 @@
</member> </member>
<member name="P:Performance.EntityModels.ag_secondallot.NursingDeptStatus"> <member name="P:Performance.EntityModels.ag_secondallot.NursingDeptStatus">
<summary> <summary>
护理部审核状态 2 等待审核 3 审核通过 4 驳回 护理部审核状态 1 未提交 2 等待审核 3 审核通过 4 驳回
</summary> </summary>
</member> </member>
<member name="P:Performance.EntityModels.ag_secondallot.NursingDeptAuditTime"> <member name="P:Performance.EntityModels.ag_secondallot.NursingDeptAuditTime">
......
...@@ -87,7 +87,7 @@ public class ag_secondallot ...@@ -87,7 +87,7 @@ public class ag_secondallot
public string Remark { get; set; } public string Remark { get; set; }
/// <summary> /// <summary>
/// 护理部审核状态 2 等待审核 3 审核通过 4 驳回 /// 护理部审核状态 1 未提交 2 等待审核 3 审核通过 4 驳回
/// </summary> /// </summary>
public Nullable<int> NursingDeptStatus { get; set; } public Nullable<int> NursingDeptStatus { get; set; }
......
...@@ -545,6 +545,7 @@ public void GenerateSecondAllot(per_allot allot) ...@@ -545,6 +545,7 @@ public void GenerateSecondAllot(per_allot allot)
Department = item.Department, Department = item.Department,
RealGiveFee = item.RealGiveFee, RealGiveFee = item.RealGiveFee,
Status = 1, Status = 1,
NursingDeptStatus = 1,
}); });
} }
else if (Math.Round((second.RealGiveFee ?? 0) - (item.RealGiveFee ?? 0)) >= 0.5m) else if (Math.Round((second.RealGiveFee ?? 0) - (item.RealGiveFee ?? 0)) >= 0.5m)
...@@ -554,6 +555,8 @@ public void GenerateSecondAllot(per_allot allot) ...@@ -554,6 +555,8 @@ public void GenerateSecondAllot(per_allot allot)
{ {
second.Status = 4; second.Status = 4;
second.Remark = "科室绩效结果发生变更,需要重新提交"; second.Remark = "科室绩效结果发生变更,需要重新提交";
second.NursingDeptStatus = 4;
second.NursingDeptRemark = "科室绩效结果发生变更,需要重新提交";
} }
updSecond.Add(second); updSecond.Add(second);
} }
......
...@@ -1308,6 +1308,7 @@ public bool AuditSubmit(ag_secondallot second, int userId) ...@@ -1308,6 +1308,7 @@ public bool AuditSubmit(ag_secondallot second, int userId)
} }
second.UseTempId = temp.UseTempId; second.UseTempId = temp.UseTempId;
second.Status = 2; second.Status = 2;
second.NursingDeptStatus = 2;
second.SubmitType = temp.UseTempId == 6 ? 2 : 1; second.SubmitType = temp.UseTempId == 6 ? 2 : 1;
second.SubmitTime = DateTime.Now; second.SubmitTime = DateTime.Now;
//second.Remark = "已提交审核,等待审核中"; //second.Remark = "已提交审核,等待审核中";
......
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