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
96ee9c1c
Commit
96ee9c1c
authored
Sep 25, 2019
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
暂时先去掉专家组过程表
parent
15b64912
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
6 deletions
+5
-6
performance/Performance.Services/AllotCompute/ProcessComputService.cs
+5
-6
No files found.
performance/Performance.Services/AllotCompute/ProcessComputService.cs
View file @
96ee9c1c
...
...
@@ -254,7 +254,6 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet, List<res_
{
new
{
Name
=
"医生组临床科室单元核算表"
,
Data
=
doctorWorkloadData
,
SheetType
=
SheetType
.
ComputeDoctorAccount
,
UnitTypes
=
new
List
<
UnitType
>
{
UnitType
.
医生组
,
UnitType
.
医技组
,
UnitType
.
专家组
,
UnitType
.
其他组
}
},
new
{
Name
=
"护理组临床科室单元核算表"
,
Data
=
nurseWorkloadData
,
SheetType
=
SheetType
.
ComputeNurseAccount
,
UnitTypes
=
new
List
<
UnitType
>
{
UnitType
.
护理组
}
},
new
{
Name
=
"专家核算表"
,
Data
=
doctorWorkloadData
,
SheetType
=
SheetType
.
ComputeDoctorAccount
,
UnitTypes
=
new
List
<
UnitType
>
{
UnitType
.
专家组
}
},
};
List
<
PerSheet
>
result
=
new
List
<
PerSheet
>();
foreach
(
var
info
in
pairs
)
...
...
@@ -301,6 +300,9 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet, List<res_
dept
.
RealGiveFee
=
(
dept
.
PerforTotal
*
dept
.
ScoringAverage
+
dept
.
Extra
+
dept
.
OtherPerfor2
)
*
dept
.
AdjustFactor
;
dept
.
Avg
=
dept
.
ManagerNumber
+
dept
.
Number
==
0
?
0
:
dept
.
PerforTotal
/
(
dept
.
ManagerNumber
+
dept
.
Number
);
}
#
region
共用核算单元算法调整
20190920
新都调整
var
multi
=
atDataList
.
GroupBy
(
t
=>
new
{
t
.
UnitType
,
t
.
AccountingUnit
})
.
Select
(
t
=>
new
{
t
.
Key
.
UnitType
,
t
.
Key
.
AccountingUnit
,
Count
=
t
.
Count
(),
})
.
Where
(
t
=>
t
.
Count
>
1
);
...
...
@@ -314,8 +316,6 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet, List<res_
}
}
//共用核算单元算法调整20190920新都调整
//var multi = atDataList.GroupBy(t => new { t.UnitType, t.AccountingUnit })
// .Select(t => new
// {
...
...
@@ -341,11 +341,10 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet, List<res_
// }
// }
//}
#
endregion
sheet
.
PerData
.
AddRange
(
atDataList
);
}
if
(
"专家核算表"
==
info
.
Name
&&
(
sheet
.
PerData
==
null
||
!
sheet
.
PerData
.
Any
()))
continue
;
result
.
Add
(
sheet
);
}
return
result
;
...
...
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