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
c6da600d
Commit
c6da600d
authored
Apr 22, 2019
by
李承祥
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
部分实发绩效数据为0修改
parent
03a803ff
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
1 deletions
+8
-1
performance/Performance.Services/AllotCompute/ProcessComputService.cs
+7
-0
performance/Performance.Services/AllotService.cs
+1
-1
No files found.
performance/Performance.Services/AllotCompute/ProcessComputService.cs
View file @
c6da600d
...
...
@@ -231,10 +231,17 @@ private List<PerSheet> MergeCompute(PerExcel excel)
doctorSheet
.
PerData
.
Add
(
doctor
);
var
nurse
=
Mapper
.
Map
<
PerDataAccountNurse
>(
dept
);
if
(
nurse
.
AdjustFactor
==
0
m
)
nurse
.
AdjustFactor
=
1
;
if
(
nurse
.
ScoringAverage
==
0
m
)
nurse
.
ScoringAverage
=
1
;
var
econNurse
=
twiceEconomicResult
.
PerData
.
FirstOrDefault
(
t
=>
t
.
UnitType
==
"护理组"
&&
t
.
AccountingUnit
==
dept
.
AccountingUnit
);
nurse
.
Income
=
econNurse
?.
CellValue
??
0
;
var
workNurse
=
twiceWorkloadResult2
.
PerData
.
FirstOrDefault
(
t
=>
t
.
UnitType
==
"护理组"
&&
t
.
AccountingUnit
==
dept
.
AccountingUnit
);
nurse
.
WorkloadFee
=
workNurse
?.
CellValue
??
0
;
if
(
nurse
.
PerforTotal
==
0
m
&&
nurse
.
Extra
==
0
m
&&
nurse
.
OtherPerfor2
==
0
m
&&
nurse
.
ScoringAverage
==
1
m
&&
nurse
.
AdjustFactor
==
1
m
)
{
nurse
.
AdjustFactor
=
0
;
nurse
.
ScoringAverage
=
0
;
}
nurseSheet
.
PerData
.
Add
(
nurse
);
}
perSheet
.
Add
(
doctorSheet
);
...
...
performance/Performance.Services/AllotService.cs
View file @
c6da600d
...
...
@@ -221,7 +221,7 @@ public void Generate(per_allot allot, UserIdentity user)
_allotRepository
.
UpdateAllotStates
(
allot
.
ID
,
(
int
)
AllotStates
.
GenerateFail
,
EnumHelper
.
GetDescription
(
AllotStates
.
GenerateFail
));
SendEmail
(
allot
,
user
.
Mail
,
"绩效生成失败"
,
ex
.
ToString
());
logdbug
.
Add
(
allot
.
ID
,
"绩效开始执行"
,
ex
.
ToString
());
throw
ex
;
//
throw ex;
}
}
...
...
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