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
88d2bab9
Commit
88d2bab9
authored
Apr 29, 2021
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
全院发放表核算单元与财务发放表区分开
parent
86cfe016
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
performance/Performance.Api/Controllers/ComputeController.cs
+1
-1
performance/Performance.Services/ComputeService.cs
+7
-4
No files found.
performance/Performance.Api/Controllers/ComputeController.cs
View file @
88d2bab9
...
...
@@ -290,7 +290,7 @@ public ApiResponse AllComputeByPM([FromBody] ComputerRequest request)
throw
new
PerformanceException
(
"当前绩效记录不存在"
);
var
isShowManage
=
_computeService
.
IsShowManage
(
request
.
AllotId
);
var
list
=
_computeService
.
AllCompute
(
request
.
AllotId
,
allot
.
HospitalId
,
isShowManage
);
var
list
=
_computeService
.
AllCompute
(
request
.
AllotId
,
allot
.
HospitalId
,
isShowManage
,
true
);
if
(
list
==
null
||
!
list
.
Any
())
return
new
ApiResponse
(
ResponseType
.
OK
,
"ok"
,
list
);
...
...
performance/Performance.Services/ComputeService.cs
View file @
88d2bab9
...
...
@@ -718,7 +718,7 @@ public DeptDetailResponse GetDepartmentDetail(int allotId, int accountId, int ty
/// <param name="hospitalId"></param>
/// <param name="isShowManage"> 仅显示管理绩效 isShowManage == 1 </param>
/// <returns></returns>
public
List
<
ComputeResponse
>
AllCompute
(
int
allotId
,
int
hospitalId
,
int
isShowManage
)
public
List
<
ComputeResponse
>
AllCompute
(
int
allotId
,
int
hospitalId
,
int
isShowManage
,
bool
isEmpDic
=
false
)
{
// 获取一次次绩效结果
var
list
=
GetAllotPerformance
(
allotId
,
hospitalId
,
isShowManage
);
...
...
@@ -762,9 +762,12 @@ public List<ComputeResponse> AllCompute(int allotId, int hospitalId, int isShowM
item
.
ReservedRatioFee
=
Math
.
Round
(
real
*
(
item
.
ReservedRatio
??
0
),
2
,
MidpointRounding
.
AwayFromZero
);
item
.
RealGiveFee
=
Math
.
Round
(
item
.
ShouldGiveFee
-
(
item
.
ReservedRatioFee
??
0
)
??
0
,
2
,
MidpointRounding
.
AwayFromZero
);
// 人员信息使用人员字典中数据
item
.
AccountingUnit
=
empDic
?.
FirstOrDefault
(
w
=>
w
.
PersonnelNumber
==
item
.
JobNumber
)?.
AccountingUnit
??
""
;
item
.
UnitType
=
empDic
?.
FirstOrDefault
(
w
=>
w
.
PersonnelNumber
==
item
.
JobNumber
)?.
UnitType
??
""
;
item
.
EmployeeName
=
empDic
?.
FirstOrDefault
(
w
=>
w
.
PersonnelNumber
==
item
.
JobNumber
)?.
DoctorName
??
""
;
if
(
isEmpDic
)
{
item
.
AccountingUnit
=
empDic
?.
FirstOrDefault
(
w
=>
w
.
PersonnelNumber
==
item
.
JobNumber
)?.
AccountingUnit
??
""
;
item
.
UnitType
=
empDic
?.
FirstOrDefault
(
w
=>
w
.
PersonnelNumber
==
item
.
JobNumber
)?.
UnitType
??
""
;
item
.
EmployeeName
=
empDic
?.
FirstOrDefault
(
w
=>
w
.
PersonnelNumber
==
item
.
JobNumber
)?.
DoctorName
??
""
;
}
}
}
...
...
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