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
46cb74d8
Commit
46cb74d8
authored
Sep 22, 2020
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
东方细节调整
parent
8c7b0c16
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
46 additions
and
6 deletions
+46
-6
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
+16
-1
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
+5
-0
performance/Performance.DtoModels/PerExcel/ComputeEmployee.cs
+5
-0
performance/Performance.DtoModels/PerExcel/ComputeResult.cs
+5
-0
performance/Performance.DtoModels/PerExcel/PerDataClinicEmployee.cs
+1
-1
performance/Performance.DtoModels/Response/ResComputeResponse.cs
+5
-0
performance/Performance.EntityModels/Entity/im_employee_clinic.cs
+5
-0
performance/Performance.Services/AllotCompute/ResultComputeService.cs
+1
-1
performance/Performance.Services/PerExcelService/ComputeEmpolyee/ComputeDirector.cs
+2
-2
performance/Performance.Services/PerExcelService/ExcelReadConfig.cs
+1
-1
No files found.
performance/Performance.Api/wwwroot/Performance.DtoModels.xml
View file @
46cb74d8
...
@@ -373,6 +373,11 @@
...
@@ -373,6 +373,11 @@
核算基数
核算基数
</summary>
</summary>
</member>
</member>
<member
name=
"P:Performance.DtoModels.ComputeEmployee.OtherManagePerfor"
>
<summary>
其他管理绩效
</summary>
</member>
<member
name=
"P:Performance.DtoModels.ComputeEmployee.DoctorName"
>
<member
name=
"P:Performance.DtoModels.ComputeEmployee.DoctorName"
>
<summary>
<summary>
医生姓名
医生姓名
...
@@ -538,6 +543,11 @@
...
@@ -538,6 +543,11 @@
医院奖罚 来自5.2
医院奖罚 来自5.2
</summary>
</summary>
</member>
</member>
<member
name=
"P:Performance.DtoModels.ComputeResult.OtherManagePerfor"
>
<summary>
医院奖罚 来自5.2
</summary>
</member>
<member
name=
"P:Performance.DtoModels.ComputeResult.OtherPerfor"
>
<member
name=
"P:Performance.DtoModels.ComputeResult.OtherPerfor"
>
<summary>
<summary>
其他绩效(来自人员名单)
其他绩效(来自人员名单)
...
@@ -965,7 +975,7 @@
...
@@ -965,7 +975,7 @@
出勤率
出勤率
</summary>
</summary>
</member>
</member>
<member
name=
"P:Performance.DtoModels.PerDataClinicEmployee.Othe
Management
Perfor"
>
<member
name=
"P:Performance.DtoModels.PerDataClinicEmployee.Othe
rManage
Perfor"
>
<summary>
<summary>
其他管理绩效
其他管理绩效
</summary>
</summary>
...
@@ -2809,6 +2819,11 @@
...
@@ -2809,6 +2819,11 @@
规模绩效(需计算)
规模绩效(需计算)
</summary>
</summary>
</member>
</member>
<member
name=
"P:Performance.DtoModels.ResComputeResponse.OtherManagePerfor"
>
<summary>
其他管理绩效
</summary>
</member>
<member
name=
"P:Performance.DtoModels.ResComputeResponse.PostCoefficient"
>
<member
name=
"P:Performance.DtoModels.ResComputeResponse.PostCoefficient"
>
<summary>
<summary>
岗位系数
岗位系数
...
...
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
View file @
46cb74d8
...
@@ -2367,6 +2367,11 @@
...
@@ -2367,6 +2367,11 @@
管理绩效发放系数
管理绩效发放系数
</summary>
</summary>
</member>
</member>
<member
name=
"P:Performance.EntityModels.im_employee_clinic.OtherManagePerfor"
>
<summary>
其他管理绩效
</summary>
</member>
<member
name=
"P:Performance.EntityModels.im_employee_clinic.ScoreAverageRate"
>
<member
name=
"P:Performance.EntityModels.im_employee_clinic.ScoreAverageRate"
>
<summary>
<summary>
考核得分率
考核得分率
...
...
performance/Performance.DtoModels/PerExcel/ComputeEmployee.cs
View file @
46cb74d8
...
@@ -42,6 +42,11 @@ public class ComputeEmployee
...
@@ -42,6 +42,11 @@ public class ComputeEmployee
public
Nullable
<
decimal
>
BasicNorm
{
get
;
set
;
}
public
Nullable
<
decimal
>
BasicNorm
{
get
;
set
;
}
/// <summary>
/// <summary>
/// 其他管理绩效
/// </summary>
public
Nullable
<
decimal
>
OtherManagePerfor
{
get
;
set
;
}
/// <summary>
/// 医生姓名
/// 医生姓名
/// </summary>
/// </summary>
public
string
DoctorName
{
get
;
set
;
}
public
string
DoctorName
{
get
;
set
;
}
...
...
performance/Performance.DtoModels/PerExcel/ComputeResult.cs
View file @
46cb74d8
...
@@ -96,6 +96,11 @@ public class ComputeResult
...
@@ -96,6 +96,11 @@ public class ComputeResult
public
Nullable
<
decimal
>
Punishment
{
get
;
set
;
}
public
Nullable
<
decimal
>
Punishment
{
get
;
set
;
}
/// <summary>
/// <summary>
/// 医院奖罚 来自5.2
/// </summary>
public
Nullable
<
decimal
>
OtherManagePerfor
{
get
;
set
;
}
/// <summary>
/// 其他绩效(来自人员名单)
/// 其他绩效(来自人员名单)
/// </summary>
/// </summary>
public
Nullable
<
decimal
>
OtherPerfor
{
get
;
set
;
}
public
Nullable
<
decimal
>
OtherPerfor
{
get
;
set
;
}
...
...
performance/Performance.DtoModels/PerExcel/PerDataClinicEmployee.cs
View file @
46cb74d8
...
@@ -89,7 +89,7 @@ public class PerDataClinicEmployee : IPerData
...
@@ -89,7 +89,7 @@ public class PerDataClinicEmployee : IPerData
/// <summary>
/// <summary>
/// 其他管理绩效
/// 其他管理绩效
/// </summary>
/// </summary>
public
Nullable
<
decimal
>
Othe
Management
Perfor
{
get
;
set
;
}
public
Nullable
<
decimal
>
Othe
rManage
Perfor
{
get
;
set
;
}
/// <summary>
/// <summary>
/// 其他绩效
/// 其他绩效
...
...
performance/Performance.DtoModels/Response/ResComputeResponse.cs
View file @
46cb74d8
...
@@ -74,6 +74,11 @@ public class ResComputeResponse
...
@@ -74,6 +74,11 @@ public class ResComputeResponse
public
Nullable
<
decimal
>
Scale
{
get
;
set
;
}
public
Nullable
<
decimal
>
Scale
{
get
;
set
;
}
/// <summary>
/// <summary>
/// 其他管理绩效
/// </summary>
public
Nullable
<
decimal
>
OtherManagePerfor
{
get
;
set
;
}
/// <summary>
/// 岗位系数
/// 岗位系数
/// </summary>
/// </summary>
public
Nullable
<
decimal
>
PostCoefficient
{
get
;
set
;
}
public
Nullable
<
decimal
>
PostCoefficient
{
get
;
set
;
}
...
...
performance/Performance.EntityModels/Entity/im_employee_clinic.cs
View file @
46cb74d8
...
@@ -102,6 +102,11 @@ public class im_employee_clinic
...
@@ -102,6 +102,11 @@ public class im_employee_clinic
public
Nullable
<
decimal
>
Management
{
get
;
set
;
}
public
Nullable
<
decimal
>
Management
{
get
;
set
;
}
/// <summary>
/// <summary>
/// 其他管理绩效
/// </summary>
public
Nullable
<
decimal
>
OtherManagePerfor
{
get
;
set
;
}
/// <summary>
/// 考核得分率
/// 考核得分率
/// </summary>
/// </summary>
public
Nullable
<
decimal
>
ScoreAverageRate
{
get
;
set
;
}
public
Nullable
<
decimal
>
ScoreAverageRate
{
get
;
set
;
}
...
...
performance/Performance.Services/AllotCompute/ResultComputeService.cs
View file @
46cb74d8
...
@@ -194,7 +194,7 @@ public class ResultComputeService : IAutoInjection
...
@@ -194,7 +194,7 @@ public class ResultComputeService : IAutoInjection
QuantitativeFee
=
item
.
Quantity
*
item
.
QuantitativeIndicatorsValue
*
headcount
,
QuantitativeFee
=
item
.
Quantity
*
item
.
QuantitativeIndicatorsValue
*
headcount
,
//ScoringAverage = scoreAverage.HasValue ? scoreAverage : dept?.ScoringAverage,
//ScoringAverage = scoreAverage.HasValue ? scoreAverage : dept?.ScoringAverage,
ScoringAverage
=
dept
?.
ScoringAverage
,
ScoringAverage
=
dept
?.
ScoringAverage
,
//OtherPerfor = dept?.OtherPerfor
,
OtherPerfor
=
dept
?.
OtherPerfor1
,
Punishment
=
(
extra
??
0
),
Punishment
=
(
extra
??
0
),
MedicineExtra
=
(
drugExtra
??
0
),
MedicineExtra
=
(
drugExtra
??
0
),
MaterialsExtra
=
(
materialsExtra
??
0
),
MaterialsExtra
=
(
materialsExtra
??
0
),
...
...
performance/Performance.Services/PerExcelService/ComputeEmpolyee/ComputeDirector.cs
View file @
46cb74d8
...
@@ -381,7 +381,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<PerS
...
@@ -381,7 +381,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<PerS
ScoreAverageRate
=
empolyee
.
ScoreAverageRate
,
ScoreAverageRate
=
empolyee
.
ScoreAverageRate
,
OtherPerfor
=
empolyee
.
OtherPerfor
,
OtherPerfor
=
empolyee
.
OtherPerfor
,
OtherManagePerfor
=
empolyee
.
OtherManagePerfor
??
0
,
Number
=
resAccount
.
ManagerNumber
+
resAccount
.
Number
,
Number
=
resAccount
.
ManagerNumber
+
resAccount
.
Number
,
PerforTotal
=
resAccount
.
PerforTotal
,
PerforTotal
=
resAccount
.
PerforTotal
,
Avg
=
avg
,
Avg
=
avg
,
...
@@ -403,7 +403,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<PerS
...
@@ -403,7 +403,7 @@ public List<ComputeResult> Compute(List<ComputeEmployee> empolyeeList, List<PerS
compute
.
Punishment
=
extra
??
0
;
compute
.
Punishment
=
extra
??
0
;
//应发管理绩效
//应发管理绩效
compute
.
ShouldGiveFee
=
Math
.
Round
((
compute
.
Efficiency
+
compute
.
Scale
)
*
(
compute
.
Grant
??
0
)
??
0
);
compute
.
ShouldGiveFee
=
Math
.
Round
((
compute
.
Efficiency
+
compute
.
Scale
+
compute
.
OtherManagePerfor
)
*
(
compute
.
Grant
??
0
)
??
0
);
//绩效合计
//绩效合计
compute
.
PerforSumFee
=
Math
.
Round
((
compute
.
Avg
*
(
empolyee
.
Basics
??
0
))
+
compute
.
ShouldGiveFee
??
0
);
compute
.
PerforSumFee
=
Math
.
Round
((
compute
.
Avg
*
(
empolyee
.
Basics
??
0
))
+
compute
.
ShouldGiveFee
??
0
);
//应发绩效
//应发绩效
...
...
performance/Performance.Services/PerExcelService/ExcelReadConfig.cs
View file @
46cb74d8
...
@@ -42,7 +42,7 @@ public class ExcelReadConfig
...
@@ -42,7 +42,7 @@ public class ExcelReadConfig
new
ColumnInfo
(
nameof
(
PerDataClinicEmployee
.
Management
),
"管理绩效发放系数"
,
true
),
new
ColumnInfo
(
nameof
(
PerDataClinicEmployee
.
Management
),
"管理绩效发放系数"
,
true
),
new
ColumnInfo
(
nameof
(
PerDataClinicEmployee
.
ScoreAverageRate
),
"考核得分率"
,
true
),
new
ColumnInfo
(
nameof
(
PerDataClinicEmployee
.
ScoreAverageRate
),
"考核得分率"
,
true
),
new
ColumnInfo
(
nameof
(
PerDataClinicEmployee
.
Attendance
),
"出勤率"
,
true
),
new
ColumnInfo
(
nameof
(
PerDataClinicEmployee
.
Attendance
),
"出勤率"
,
true
),
new
ColumnInfo
(
nameof
(
PerDataClinicEmployee
.
Othe
Management
Perfor
),
"其他管理绩效"
),
new
ColumnInfo
(
nameof
(
PerDataClinicEmployee
.
Othe
rManage
Perfor
),
"其他管理绩效"
),
new
ColumnInfo
(
nameof
(
PerDataClinicEmployee
.
OthePerfor
),
"其他绩效"
),
new
ColumnInfo
(
nameof
(
PerDataClinicEmployee
.
OthePerfor
),
"其他绩效"
),
//new ColumnInfo(nameof(PerDataClinicEmployee.NightWorkPerfor), "夜班费"),
//new ColumnInfo(nameof(PerDataClinicEmployee.NightWorkPerfor), "夜班费"),
new
ColumnInfo
(
nameof
(
PerDataClinicEmployee
.
Adjust
),
"调节系数"
,
true
),
new
ColumnInfo
(
nameof
(
PerDataClinicEmployee
.
Adjust
),
"调节系数"
,
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