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
34eb0f7e
Commit
34eb0f7e
authored
Mar 26, 2021
by
lcx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
院领导可查看医院其他绩效
parent
6cd82cd5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
performance/Performance.Api/Controllers/ComputeController.cs
+6
-6
performance/Performance.Services/EmployeeService.cs
+2
-2
No files found.
performance/Performance.Api/Controllers/ComputeController.cs
View file @
34eb0f7e
...
...
@@ -257,7 +257,7 @@ public ApiResponse AllComputeAvg([FromBody] ComputerRequest request)
// ? 0 : Math.Round(gc.Sum(s => s.RealGiveFee) / gc.Select(p => new { p.JobNumber, p.EmployeeName }).Distinct().Count() ?? 0)
// }));
return
new
ApiResponse
(
ResponseType
.
OK
,
"ok"
,
avgs
.
Select
(
w
=>
new
{
w
.
ID
,
w
.
PositionName
,
w
.
TotelNumber
,
w
.
TotelValue
,
w
.
AvgValue
}));
return
new
ApiResponse
(
ResponseType
.
OK
,
"ok"
,
avgs
.
Select
(
w
=>
new
{
w
.
ID
,
w
.
PositionName
,
w
.
TotelNumber
,
w
.
TotelValue
,
w
.
AvgValue
}));
}
/// <summary>
...
...
@@ -388,7 +388,7 @@ public ApiResponse<res_baiscnorm> EditHospitalAvg([FromBody] ComputerAvgRequest
var
result
=
_computeService
.
EditHospitalAvg
(
request
);
return
new
ApiResponse
<
res_baiscnorm
>(
ResponseType
.
OK
,
result
);
return
new
ApiResponse
<
res_baiscnorm
>(
ResponseType
.
OK
,
result
);
}
#
endregion
...
...
@@ -397,16 +397,16 @@ public ApiResponse<res_baiscnorm> EditHospitalAvg([FromBody] ComputerAvgRequest
/// <summary>
/// 其他医院绩效统计
/// </summary>
/// <param name="
request
"></param>
/// <param name="
allotId
"></param>
/// <returns></returns>
[
Route
(
"OtherPerStats/{allotId}"
)]
[
HttpPost
]
public
ApiResponse
OtherPerStats
(
int
allotId
)
{
var
employee
=
_employeeService
.
GetAprList
(
allotId
,
_claim
.
GetUserId
());
var
relust
=
_computeService
.
GetOtherPerStats
(
employee
);
return
new
ApiResponse
(
ResponseType
.
OK
,
relust
);
var
relust
=
_computeService
.
GetOtherPerStats
(
employee
);
return
new
ApiResponse
(
ResponseType
.
OK
,
relust
);
}
#
endregion
...
...
performance/Performance.Services/EmployeeService.cs
View file @
34eb0f7e
...
...
@@ -392,7 +392,7 @@ public List<per_apr_amount> GetAprList(int allotId, int userId)
if
(
userrole
==
null
)
throw
new
PerformanceException
(
"用户未绑定角色"
);
var
list
=
new
List
<
per_apr_amount
>();
if
(
new
int
[]
{
1
,
2
,
5
}.
Contains
(
userrole
.
RoleID
))
// 绩效管理员、医院管理员、绩效核算办
查看所有科室的数据
if
(
new
int
[]
{
1
,
2
,
5
,
6
}.
Contains
(
userrole
.
RoleID
))
// 绩效管理员、医院管理员、绩效核算办、院领导
查看所有科室的数据
list
=
perapramountRepository
.
GetEntities
(
t
=>
t
.
AllotId
==
allotId
&&
(
t
.
Amount
??
0
)
!=
0
);
else
list
=
perapramountRepository
.
GetEntities
(
t
=>
t
.
AllotId
==
allotId
&&
(
t
.
Amount
??
0
)
!=
0
&&
t
.
CreateUser
==
userId
);
...
...
@@ -650,7 +650,7 @@ public List<TitleValue> GetPerforTypeDict(int allotId)
return
new
List
<
Dictionary
<
string
,
string
>>();
var
imData
=
perforImdataRepository
.
GetEntities
(
t
=>
t
.
AllotID
==
allotId
&&
t
.
SheetID
==
sheet
.
ID
);
var
headers
=
imData
.
OrderByDescending
(
c
=>
c
.
IsTotal
).
Select
(
t
=>
t
.
TypeName
).
Distinct
();
var
headers
=
imData
.
OrderByDescending
(
c
=>
c
.
IsTotal
).
Select
(
t
=>
t
.
TypeName
).
Distinct
();
var
dataNum
=
imData
.
Select
(
t
=>
t
.
RowNumber
)?.
OrderBy
(
c
=>
c
.
Value
).
Distinct
().
ToList
();
if
(!
dataNum
.
Any
())
return
new
List
<
Dictionary
<
string
,
string
>>();
...
...
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