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
6c3fcf94
Commit
6c3fcf94
authored
Sep 23, 2020
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
行政科室测算考核前绩效
parent
04bdcd87
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
1 deletions
+6
-1
performance/Performance.Services/SecondAllotService.cs
+6
-1
No files found.
performance/Performance.Services/SecondAllotService.cs
View file @
6c3fcf94
...
...
@@ -143,6 +143,11 @@ public List<SecondListResponse> GetSecondList(int userId)
account
=
accountList
?.
FirstOrDefault
(
t
=>
t
.
AllotID
==
item
&&
t
.
UnitType
==
(
int
)
UnitType
.
行政后勤
);
if
(
account
==
null
&&
special
==
null
)
continue
;
// 医生组护理组特殊核算组
var
realGiveFee
=
role
.
Type
==
application
.
SpecialRole
?
special
.
RealGiveFee
:
account
.
RealGiveFee
;
// 行政后勤则取考核前绩效
if
(
role
.
Type
==
application
.
OfficeRole
)
realGiveFee
=
account
.
PerforTotal
;
var
second
=
new
ag_secondallot
{
...
...
@@ -151,7 +156,7 @@ public List<SecondListResponse> GetSecondList(int userId)
Month
=
allot
.
Month
,
Department
=
user
.
Department
,
UnitType
=
role
.
Type
==
application
.
SpecialRole
?
UnitType
.
特殊核算组
.
ToString
()
:
((
UnitType
)
account
.
UnitType
).
ToString
(),
RealGiveFee
=
r
ole
.
Type
==
application
.
SpecialRole
?
special
.
RealGiveFee
:
account
.
R
ealGiveFee
,
RealGiveFee
=
realGiveFee
,
Status
=
1
};
newSecond
.
Add
(
second
);
...
...
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