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
4ca549ea
Commit
4ca549ea
authored
Jan 15, 2021
by
lcx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
特殊科室关联数据时由科室更改为核算单元进行匹配
parent
54469dfb
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletions
+2
-1
performance/Performance.Services/ExtractExcelService/SheetDataWrite/SpecialUnitDataWrite.cs
+2
-1
No files found.
performance/Performance.Services/ExtractExcelService/SheetDataWrite/SpecialUnitDataWrite.cs
View file @
4ca549ea
...
...
@@ -36,6 +36,7 @@ public void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType sheetTyp
if
(
exSpecials
==
null
||
!
exSpecials
.
Any
())
return
;
var
extractDto
=
(
data
as
List
<
ExtractTransDto
>)
??
new
List
<
ExtractTransDto
>();
logger
.
LogInformation
(
"特殊科室数据1:"
+
JsonHelper
.
Serialize
(
extractDto
));
var
mergedRegions
=
new
List
<
SpecialCellRange
>();
RemoveMergedRegion
(
sheet
,
ref
mergedRegions
);
...
...
@@ -44,7 +45,7 @@ public void WriteSheetData(ISheet sheet, PerSheetPoint point, SheetType sheetTyp
var
index
=
columns
.
IndexOf
(
SpecialUnitColumns
.
Department
);
var
needMergedRegions
=
mergedRegions
.
Where
(
t
=>
t
.
FirstColumn
==
index
&&
t
.
LastColumn
==
index
)?.
ToList
()
??
new
List
<
SpecialCellRange
>();
var
specials
=
exSpecials
.
GroupJoin
(
extractDto
,
outer
=>
new
{
outer
.
Department
,
outer
.
Target
},
inner
=>
new
{
inner
.
Department
,
Target
=
inner
.
Category
},
var
specials
=
exSpecials
.
GroupJoin
(
extractDto
,
outer
=>
new
{
outer
.
Department
,
outer
.
Target
},
inner
=>
new
{
Department
=
inner
.
InpatDoctorAccounting
,
Target
=
inner
.
Category
},
(
outer
,
inner
)
=>
new
SpecialDto
{
Department
=
outer
.
Department
,
...
...
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