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
9f7e193b
Commit
9f7e193b
authored
Apr 25, 2021
by
lcx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
绩效抽取时,没有科室字典也进行数据分组求和
parent
f4ed88dc
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
8 deletions
+7
-8
performance/Performance.Services/ExtractExcelService/ExtractService.cs
+7
-8
No files found.
performance/Performance.Services/ExtractExcelService/ExtractService.cs
View file @
9f7e193b
...
...
@@ -209,14 +209,12 @@ private List<ExtractTransDto> StandDataFormat(int hospitalId, List<ex_result> re
var
dict
=
personService
.
GetDepartments
(
hospitalId
)?.
ToList
();
if
(
dict
==
null
||
!
dict
.
Any
())
return
results
.
Select
(
t
=>
new
ExtractTransDto
return
results
.
GroupBy
(
t
=>
new
{
t
.
Department
,
t
.
Category
,
t
.
Source
}).
Select
(
t
=>
new
ExtractTransDto
{
SheetName
=
t
.
Source
,
DoctorName
=
t
.
DoctorName
,
PersonnelNumber
=
t
.
PersonnelNumber
,
Department
=
t
.
Department
,
Category
=
t
.
Category
,
Value
=
t
.
Fee
??
0
SheetName
=
t
.
Key
.
Source
,
Department
=
t
.
Key
.
Department
,
Category
=
t
.
Key
.
Category
,
Value
=
t
.
Sum
(
group
=>
group
.
Fee
)
==
0
?
null
:
t
.
Sum
(
group
=>
group
.
Fee
),
}).
ToList
();
dict
.
ForEach
(
t
=>
...
...
@@ -244,7 +242,7 @@ private List<ExtractTransDto> StandDataFormat(int hospitalId, List<ex_result> re
InpatTechnicAccounting
=
t
.
inner
.
FirstOrDefault
(
f
=>
f
.
Department
==
dept
)?.
InpatTechnicAccounting
?.
AccountingUnit
,
};
});
logger
.
LogInformation
(
"************抽取结果1***************: "
+
JsonHelper
.
Serialize
(
data
.
Where
(
t
=>
t
.
Department
==
"一病区(外科一)"
&&
t
.
Category
==
"CT费"
)));
var
groupdata
=
data
.
GroupBy
(
t
=>
new
{
t
.
Department
,
t
.
Category
,
t
.
SheetName
}).
Select
(
t
=>
new
ExtractTransDto
{
SheetName
=
t
.
Key
.
SheetName
,
...
...
@@ -258,6 +256,7 @@ private List<ExtractTransDto> StandDataFormat(int hospitalId, List<ex_result> re
InpatNurseAccounting
=
t
.
First
().
InpatNurseAccounting
,
InpatTechnicAccounting
=
t
.
First
().
InpatTechnicAccounting
,
});
logger
.
LogInformation
(
"************抽取结果2***************: "
+
JsonHelper
.
Serialize
(
groupdata
.
Where
(
t
=>
t
.
Department
==
"一病区(外科一)"
&&
t
.
Category
==
"CT费"
)));
return
groupdata
.
ToList
();
}
...
...
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