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
0656f781
Commit
0656f781
authored
Sep 20, 2019
by
李承祥
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
科室详情收入支出添加类型
parent
0033c1fc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
0 deletions
+13
-0
performance/Performance.DtoModels/Response/DeptDetailResponse.cs
+12
-0
performance/Performance.Services/ComputeService.cs
+1
-0
No files found.
performance/Performance.DtoModels/Response/DeptDetailResponse.cs
View file @
0656f781
...
...
@@ -20,28 +20,40 @@ public class DeptDetail
public
class
DeptDataDetails
{
/// <summary> 概览</summary>
public
PerDataAccountBaisc
Pandect
{
get
;
set
;
}
/// <summary> 收入明细 </summary>
public
List
<
DetailDtos
>
Detail
{
get
;
set
;
}
}
public
class
DetailDtos
{
/// <summary> 收入项名称 </summary>
public
string
ItemName
{
get
;
set
;
}
/// <summary> 1、收入 2、支出 3、工作量 </summary>
public
int
IncomeType
{
get
;
set
;
}
/// <summary> 金额 </summary>
public
decimal
Amount
{
get
;
set
;
}
/// <summary> 详情 </summary>
public
List
<
DetailModule
>
Items
{
get
;
set
;
}
}
public
class
DetailModule
{
/// <summary> 明细项 </summary>
public
string
ItemName
{
get
;
set
;
}
/// <summary> 原始值 </summary>
public
decimal
?
CellValue
{
get
;
set
;
}
/// <summary> 系数 </summary>
public
decimal
?
Factor
{
get
;
set
;
}
/// <summary> 结算值 </summary>
public
decimal
?
ItemValue
{
get
;
set
;
}
}
}
performance/Performance.Services/ComputeService.cs
View file @
0656f781
...
...
@@ -323,6 +323,7 @@ public DeptDataDetails DeptDetail(int allotId, int accountId, int type)
var
item
=
new
DetailDtos
{
ItemName
=
sheetName
,
IncomeType
=
sheet
.
SheetType
==
(
int
)
SheetType
.
Expend
?
2
:
sheet
.
SheetType
==
(
int
)
SheetType
.
Workload
?
3
:
1
,
Amount
=
(
sheetName
.
Contains
(
"工作量"
)
?
doctor
.
WorkloadFee
:
economic
.
FirstOrDefault
(
t
=>
t
.
ItemName
.
Contains
(
sheetName
))?.
ItemValue
)
??
0
m
,
Items
=
sheetData
?.
Select
(
t
=>
new
DetailModule
{
...
...
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