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
a10db34d
Commit
a10db34d
authored
Mar 24, 2021
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'v20201230yubei' into v2020morge-graphql
parents
d3cb8581
1f5649ee
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
2 deletions
+11
-2
performance/Performance.Services/ComputeService.cs
+11
-2
No files found.
performance/Performance.Services/ComputeService.cs
View file @
a10db34d
...
...
@@ -1142,7 +1142,7 @@ public DeptDataDetails<DetailModuleExtend> DeptDetail(int accountId)
sheettype
=
5
;
amount
=
basicData
?.
Where
(
t
=>
t
.
SheetID
==
sheet
.
ID
&&
t
.
UnitType
==
(
int
)
type
&&
t
.
IsTotal
==
1
)?.
FirstOrDefault
()?.
CellValue
??
0
;
if
(
sheet
.
SheetType
!=
(
int
)
SheetType
.
BudgetRatio
)
amount
=
Math
.
Round
(
amount
,
0
);
amount
=
GetDecimal
(
amount
,
0
);
}
return
(
sheettype
,
amount
);
}
...
...
@@ -1532,7 +1532,7 @@ public DeptDataDetails GetDoctorDetail(int computeId)
OtherManagePerfor
=
resCompute
.
OtherManagePerfor
??
0
,
//其他管理绩效
ShouldGiveFee
=
resCompute
.
ShouldGiveFee
??
0
,
//考核前管理绩效
ScoringAverage
=
resCompute
.
ScoreAverageRate
??
1
,
//考核得分率
AssessLaterManagementFee
=
Math
.
Round
(
resCompute
.
ShouldGiveFee
*
resCompute
.
ScoreAverageRate
*
resCompute
.
Attendance
+
resCompute
.
Punishment
??
0
),
//考核后管理绩效
AssessLaterManagementFee
=
GetDecimal
(
resCompute
.
ShouldGiveFee
*
resCompute
.
ScoreAverageRate
*
resCompute
.
Attendance
+
resCompute
.
Punishment
??
0
),
//考核后管理绩效
RealGiveFee
=
resCompute
.
RealGiveFee
//绩效合计
},
Detail
=
new
List
<
DetailDtos
>()
...
...
@@ -1637,5 +1637,14 @@ public res_baiscnorm EditHospitalAvg(ComputerAvgRequest request)
return
others
;
}
private
decimal
GetDecimal
(
decimal
?
value
,
decimal
_
=
0
)
{
if
(!
value
.
HasValue
)
return
_
;
int
decimals
=
Math
.
Abs
(
value
.
Value
)
>
100
?
0
:
2
;
return
Math
.
Round
(
value
.
Value
,
decimals
,
MidpointRounding
.
AwayFromZero
);
}
}
}
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