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
9cc84c91
Commit
9cc84c91
authored
Nov 16, 2020
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
只获取审核后的医院其他绩效
parent
0221b62a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
performance/Performance.Services/ComputeService.cs
+2
-2
performance/Performance.Services/SecondAllotService.cs
+3
-3
No files found.
performance/Performance.Services/ComputeService.cs
View file @
9cc84c91
...
@@ -107,7 +107,7 @@ public List<ResComputeResponse> GetCompute(int allotId, int type)
...
@@ -107,7 +107,7 @@ public List<ResComputeResponse> GetCompute(int allotId, int type)
};
};
var
isShowManage
=
IsShowManage
(
allotId
);
var
isShowManage
=
IsShowManage
(
allotId
);
var
apramounts
=
perapramountRepository
.
GetEntities
(
t
=>
t
.
AllotId
==
allotId
);
var
apramounts
=
perapramountRepository
.
GetEntities
(
t
=>
t
.
AllotId
==
allotId
&&
t
.
Status
==
3
);
if
(
pairs
.
Keys
.
Any
(
t
=>
t
==
type
))
if
(
pairs
.
Keys
.
Any
(
t
=>
t
==
type
))
{
{
...
@@ -578,7 +578,7 @@ private List<ComputeResponse> AddAprAmount(int allotId, List<ComputeResponse> co
...
@@ -578,7 +578,7 @@ private List<ComputeResponse> AddAprAmount(int allotId, List<ComputeResponse> co
if
(
computes
==
null
||
!
computes
.
Any
())
if
(
computes
==
null
||
!
computes
.
Any
())
return
computes
;
return
computes
;
var
list
=
perapramountRepository
.
GetEntities
(
t
=>
t
.
AllotId
==
allotId
);
var
list
=
perapramountRepository
.
GetEntities
(
t
=>
t
.
AllotId
==
allotId
&&
t
.
Status
==
3
);
if
(
list
==
null
||
!
list
.
Any
())
if
(
list
==
null
||
!
list
.
Any
())
return
computes
;
return
computes
;
...
...
performance/Performance.Services/SecondAllotService.cs
View file @
9cc84c91
...
@@ -352,7 +352,7 @@ private void SupplementOtherPerfor(SecondResponse result, int allotId)
...
@@ -352,7 +352,7 @@ private void SupplementOtherPerfor(SecondResponse result, int allotId)
if
(
result
?.
BodyItems
!=
null
&&
result
.
BodyItems
.
Any
())
if
(
result
?.
BodyItems
!=
null
&&
result
.
BodyItems
.
Any
())
{
{
var
second
=
perforAgsecondallotRepository
.
GetEntity
(
t
=>
t
.
AllotId
==
allotId
);
var
second
=
perforAgsecondallotRepository
.
GetEntity
(
t
=>
t
.
AllotId
==
allotId
);
var
perapramounts
=
perapramountRepository
.
GetEntities
(
t
=>
t
.
AllotId
==
allotId
);
var
perapramounts
=
perapramountRepository
.
GetEntities
(
t
=>
t
.
AllotId
==
allotId
&&
t
.
Status
==
3
);
foreach
(
var
rownum
in
result
.
BodyItems
.
Where
(
w
=>
w
.
RowNumber
>
-
1
).
Select
(
w
=>
w
.
RowNumber
).
Distinct
())
foreach
(
var
rownum
in
result
.
BodyItems
.
Where
(
w
=>
w
.
RowNumber
>
-
1
).
Select
(
w
=>
w
.
RowNumber
).
Distinct
())
{
{
...
@@ -389,7 +389,7 @@ private List<BodyItem> GetEmployees(List<per_employee> employees, int allotId, i
...
@@ -389,7 +389,7 @@ private List<BodyItem> GetEmployees(List<per_employee> employees, int allotId, i
employees
=
employees
?.
Where
(
w
=>
!
string
.
IsNullOrEmpty
(
w
.
PersonnelNumber
)
&&
w
.
PersonnelNumber
==
jobNumber
.
Trim
()).
ToList
();
employees
=
employees
?.
Where
(
w
=>
!
string
.
IsNullOrEmpty
(
w
.
PersonnelNumber
)
&&
w
.
PersonnelNumber
==
jobNumber
.
Trim
()).
ToList
();
var
second
=
perforAgsecondallotRepository
.
GetEntity
(
t
=>
t
.
AllotId
==
allotId
);
var
second
=
perforAgsecondallotRepository
.
GetEntity
(
t
=>
t
.
AllotId
==
allotId
);
var
perapramounts
=
perapramountRepository
.
GetEntities
(
t
=>
t
.
AllotId
==
allotId
);
var
perapramounts
=
perapramountRepository
.
GetEntities
(
t
=>
t
.
AllotId
==
allotId
&&
t
.
Status
==
3
);
Func
<
per_employee
,
decimal
?>
getAprAmount
=
(
t
)
=>
perapramounts
Func
<
per_employee
,
decimal
?>
getAprAmount
=
(
t
)
=>
perapramounts
?.
Where
(
w
=>
w
.
AccountingUnit
?.
Trim
()
==
second
.
Department
?.
Trim
()
&&
w
.
DoctorName
?.
Trim
()
==
t
.
DoctorName
?.
Trim
()
&&
w
.
PersonnelNumber
?.
Trim
()
==
t
.
PersonnelNumber
?.
Trim
())
?.
Where
(
w
=>
w
.
AccountingUnit
?.
Trim
()
==
second
.
Department
?.
Trim
()
&&
w
.
DoctorName
?.
Trim
()
==
t
.
DoctorName
?.
Trim
()
&&
w
.
PersonnelNumber
?.
Trim
()
==
t
.
PersonnelNumber
?.
Trim
())
?.
Sum
(
w
=>
w
.
Amount
);
?.
Sum
(
w
=>
w
.
Amount
);
...
@@ -1562,7 +1562,7 @@ private void SupplementSecondDetail(ag_secondallot second, List<per_employee> em
...
@@ -1562,7 +1562,7 @@ private void SupplementSecondDetail(ag_secondallot second, List<per_employee> em
if
(
employees
==
null
||
!
employees
.
Any
(
t
=>
t
.
UnitType
==
second
.
UnitType
))
if
(
employees
==
null
||
!
employees
.
Any
(
t
=>
t
.
UnitType
==
second
.
UnitType
))
return
;
return
;
// 补充医院其他绩效 及 预留比例
// 补充医院其他绩效 及 预留比例
var
perapramounts
=
perapramountRepository
.
GetEntities
(
t
=>
t
.
AllotId
==
second
.
AllotId
);
var
perapramounts
=
perapramountRepository
.
GetEntities
(
t
=>
t
.
AllotId
==
second
.
AllotId
&&
t
.
Status
==
3
);
Func
<
per_employee
,
decimal
?>
getAprAmount
=
(
t
)
=>
perapramounts
Func
<
per_employee
,
decimal
?>
getAprAmount
=
(
t
)
=>
perapramounts
?.
Where
(
w
=>
w
.
AccountingUnit
?.
Trim
()
==
second
.
Department
?.
Trim
()
&&
w
.
DoctorName
?.
Trim
()
==
t
.
DoctorName
?.
Trim
()
&&
w
.
PersonnelNumber
?.
Trim
()
==
t
.
PersonnelNumber
?.
Trim
())
?.
Where
(
w
=>
w
.
AccountingUnit
?.
Trim
()
==
second
.
Department
?.
Trim
()
&&
w
.
DoctorName
?.
Trim
()
==
t
.
DoctorName
?.
Trim
()
&&
w
.
PersonnelNumber
?.
Trim
()
==
t
.
PersonnelNumber
?.
Trim
())
?.
Sum
(
w
=>
w
.
Amount
);
?.
Sum
(
w
=>
w
.
Amount
);
...
...
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