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
b6d905e6
Commit
b6d905e6
authored
Aug 26, 2022
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
夜班绩效识别字段,增加识别字段
parent
686f9f95
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
performance/Performance.Services/AllotCompute/ProcessComputService.cs
+4
-2
performance/Performance.Services/AllotCompute/ResultComputeService.cs
+2
-1
No files found.
performance/Performance.Services/AllotCompute/ProcessComputService.cs
View file @
b6d905e6
...
@@ -306,7 +306,8 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet, per_allot
...
@@ -306,7 +306,8 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet, per_allot
if
(
UnitType
.
医技组
==
unitType
&&
workDoctor
==
null
)
if
(
UnitType
.
医技组
==
unitType
&&
workDoctor
==
null
)
workDoctor
=
info
.
Data
.
FirstOrDefault
(
t
=>
t
.
UnitType
==
UnitType
.
医生组
.
ToString
()
&&
t
.
AccountingUnit
==
dept
.
AccountingUnit
);
workDoctor
=
info
.
Data
.
FirstOrDefault
(
t
=>
t
.
UnitType
==
UnitType
.
医生组
.
ToString
()
&&
t
.
AccountingUnit
==
dept
.
AccountingUnit
);
// 夜班绩效 从医院奖罚的明细项中获取
// 夜班绩效 从医院奖罚的明细项中获取
var
nightShift
=
adjustLaterOtherFee
?.
FirstOrDefault
(
w
=>
w
.
UnitType
==
dept
.
UnitType
&&
w
.
AccountingUnit
==
dept
.
AccountingUnit
&&
w
.
TypeName
?.
Trim
()
==
"夜班绩效"
)?.
CellValue
??
0
;
var
names
=
new
string
[]
{
"夜班绩效"
,
"夜班工作量"
,
"夜班工作量奖励"
};
var
nightShift
=
adjustLaterOtherFee
?.
FirstOrDefault
(
w
=>
w
.
UnitType
==
dept
.
UnitType
&&
w
.
AccountingUnit
==
dept
.
AccountingUnit
&&
names
.
Contains
(
w
.
TypeName
?.
Trim
()))?.
CellValue
??
0
;
dept
.
NightShiftWorkPerforFee
=
nightShift
;
dept
.
NightShiftWorkPerforFee
=
nightShift
;
//dept.MedicineFactor = workDoctor?.MedicineFactor;
//dept.MedicineFactor = workDoctor?.MedicineFactor;
...
@@ -388,7 +389,8 @@ public void ComputeOffice(per_allot allot, PerExcel excel)
...
@@ -388,7 +389,8 @@ public void ComputeOffice(per_allot allot, PerExcel excel)
if
(
UnitTypeUtil
.
IsOffice
(
resAccount
?.
UnitType
)
&&
dept
.
NeedSecondAllot
==
"是"
)
if
(
UnitTypeUtil
.
IsOffice
(
resAccount
?.
UnitType
)
&&
dept
.
NeedSecondAllot
==
"是"
)
{
{
// 夜班绩效 从医院奖罚的明细项中获取
// 夜班绩效 从医院奖罚的明细项中获取
var
nightShift
=
adjustLaterOtherFee
?.
FirstOrDefault
(
w
=>
w
.
UnitType
==
resAccount
?.
UnitType
&&
w
.
AccountingUnit
==
dept
.
AccountingUnit
&&
w
.
TypeName
?.
Trim
()
==
"夜班绩效"
)?.
CellValue
??
0
;
var
names
=
new
string
[]
{
"夜班绩效"
,
"夜班工作量"
,
"夜班工作量奖励"
};
var
nightShift
=
adjustLaterOtherFee
?.
FirstOrDefault
(
w
=>
w
.
UnitType
==
dept
.
UnitType
&&
w
.
AccountingUnit
==
dept
.
AccountingUnit
&&
names
.
Contains
(
w
.
TypeName
?.
Trim
()))?.
CellValue
??
0
;
dept
.
NightShiftWorkPerforFee
=
nightShift
;
dept
.
NightShiftWorkPerforFee
=
nightShift
;
dept
.
ScoringAverage
=
resAccount
?.
ScoringAverage
==
null
?
0
:
resAccount
.
ScoringAverage
;
dept
.
ScoringAverage
=
resAccount
?.
ScoringAverage
==
null
?
0
:
resAccount
.
ScoringAverage
;
...
...
performance/Performance.Services/AllotCompute/ResultComputeService.cs
View file @
b6d905e6
...
@@ -179,7 +179,8 @@ public void SpecialUnitCompute(PerExcel excel, per_allot allot, List<res_baiscno
...
@@ -179,7 +179,8 @@ public void SpecialUnitCompute(PerExcel excel, per_allot allot, List<res_baiscno
//var scoreAverage = accountScoreAverages?.FirstOrDefault(w => w.UnitType == UnitType.特殊核算组.ToString() && w.AccountingUnit == dept?.AccountingUnit)?.TotelValue;
//var scoreAverage = accountScoreAverages?.FirstOrDefault(w => w.UnitType == UnitType.特殊核算组.ToString() && w.AccountingUnit == dept?.AccountingUnit)?.TotelValue;
// 夜班绩效 从医院奖罚的明细项中获取
// 夜班绩效 从医院奖罚的明细项中获取
var
nightShift
=
adjustLaterOtherFee
?.
FirstOrDefault
(
w
=>
w
.
UnitType
==
dept
?.
UnitType
&&
w
.
AccountingUnit
==
dept
?.
AccountingUnit
&&
w
.
TypeName
?.
Trim
()
==
"夜班绩效"
)?.
CellValue
??
0
;
var
names
=
new
string
[]
{
"夜班绩效"
,
"夜班工作量"
,
"夜班工作量奖励"
};
var
nightShift
=
adjustLaterOtherFee
?.
FirstOrDefault
(
w
=>
w
.
UnitType
==
dept
.
UnitType
&&
w
.
AccountingUnit
==
dept
.
AccountingUnit
&&
names
.
Contains
(
w
.
TypeName
?.
Trim
()))?.
CellValue
??
0
;
decimal
?
headcount
=
null
;
decimal
?
headcount
=
null
;
if
(
typeList
.
Any
(
o
=>
o
.
Description
==
item
.
QuantitativeIndicators
))
if
(
typeList
.
Any
(
o
=>
o
.
Description
==
item
.
QuantitativeIndicators
))
...
...
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