Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
performance
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zry
performance
Commits
346ed792
Commit
346ed792
authored
Oct 13, 2020
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
护理部审核调整
parent
0090cfe6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
2 deletions
+6
-2
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
+1
-1
performance/Performance.EntityModels/Entity/ag_secondallot.cs
+1
-1
performance/Performance.Services/AllotCompute/ResultComputeService.cs
+3
-0
performance/Performance.Services/SecondAllotService.cs
+1
-0
No files found.
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
View file @
346ed792
...
...
@@ -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
View file @
346ed792
...
...
@@ -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
View file @
346ed792
...
...
@@ -545,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.5
m
)
...
...
@@ -554,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
View file @
346ed792
...
...
@@ -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 = "已提交审核,等待审核中";
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment