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
ebb2ac24
Commit
ebb2ac24
authored
Nov 17, 2020
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
医院奖罚
parent
d7874bfa
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
performance/Performance.Services/AllotCompute/ProcessComputService.cs
+2
-2
performance/Performance.Services/PerExcelService/ExcelReadConfig.cs
+1
-0
No files found.
performance/Performance.Services/AllotCompute/ProcessComputService.cs
View file @
ebb2ac24
...
...
@@ -310,7 +310,7 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet)
//dept.Extra = (extra ?? 0);
//dept.MedicineExtra = (drugExtra ?? 0);
//dept.MaterialsExtra = (materialsExtra ?? 0);
dept
.
Extra
=
0
;
dept
.
Extra
=
dept
?.
Extra
??
0
;
dept
.
MedicineExtra
=
dept
.
MedicineExtra
??
0
;
dept
.
MaterialsExtra
=
dept
.
MaterialsExtra
??
0
;
...
...
@@ -375,7 +375,7 @@ public void ComputeOffice(per_allot allot, PerExcel excel)
//dept.Extra = (extra ?? 0);
//dept.MedicineExtra = 0;// (drugExtra ?? 0);
//dept.MaterialsExtra = 0;//(materialsExtra ?? 0);
dept
.
Extra
=
0
;
dept
.
Extra
=
resAccount
?.
Extra
??
0
;
dept
.
MedicineExtra
=
resAccount
?.
MedicineExtra
??
0
;
// (drugExtra ?? 0);
dept
.
MaterialsExtra
=
resAccount
?.
MaterialsExtra
??
0
;
//(materialsExtra ?? 0);
...
...
performance/Performance.Services/PerExcelService/ExcelReadConfig.cs
View file @
ebb2ac24
...
...
@@ -81,6 +81,7 @@ public class ExcelReadConfig
new
ColumnInfo
(
nameof
(
PerDataAccountBaisc
.
Number
),
"核算单元人员数量"
,
true
),
new
ColumnInfo
(
nameof
(
PerDataAccountBaisc
.
BasicFactor
),
"预算比例"
,
true
),
//new ColumnInfo(nameof(PerDataAccountBaisc.OtherPerfor1), "其他绩效1", true),
new
ColumnInfo
(
nameof
(
PerDataAccountBaisc
.
Extra
),
"医院奖罚"
,
true
),
new
ColumnInfo
(
nameof
(
PerDataAccountBaisc
.
AssessBeforeOtherFee
),
"考核前其他绩效"
,
true
),
new
ColumnInfo
(
nameof
(
PerDataAccountBaisc
.
MedicineExtra
),
"药占比奖罚"
,
true
),
new
ColumnInfo
(
nameof
(
PerDataAccountBaisc
.
MaterialsExtra
),
"材料占比奖罚"
,
true
),
...
...
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