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
0abed487
Commit
0abed487
authored
Sep 20, 2019
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
显示调整
parent
3be1cf6c
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
2 deletions
+11
-2
performance/Performance.Api/wwwroot/Performance.Api.xml
+7
-0
performance/Performance.Services/AllotCompute/ProcessComputService.cs
+3
-1
performance/Performance.Services/ComputeService.cs
+1
-1
No files found.
performance/Performance.Api/wwwroot/Performance.Api.xml
View file @
0abed487
...
@@ -438,6 +438,13 @@
...
@@ -438,6 +438,13 @@
<param
name=
"request"
></param>
<param
name=
"request"
></param>
<returns></returns>
<returns></returns>
</member>
</member>
<member
name=
"M:Performance.Api.Controllers.ConfigController.WorkHeader(Performance.DtoModels.WorkItemRequest)"
>
<summary>
获取工作量绩效列头
</summary>
<param
name=
"request"
></param>
<returns></returns>
</member>
<member
name=
"M:Performance.Api.Controllers.EmployeeController.GetEmployeeList(Performance.DtoModels.EmployeeRequest)"
>
<member
name=
"M:Performance.Api.Controllers.EmployeeController.GetEmployeeList(Performance.DtoModels.EmployeeRequest)"
>
<summary>
<summary>
获取人员列表
获取人员列表
...
...
performance/Performance.Services/AllotCompute/ProcessComputService.cs
View file @
0abed487
...
@@ -83,6 +83,9 @@ private void SaveComputeAccount(PerSheet sheet, int allotId)
...
@@ -83,6 +83,9 @@ private void SaveComputeAccount(PerSheet sheet, int allotId)
perforPerSheetRepository
.
Add
(
imsheet
);
perforPerSheetRepository
.
Add
(
imsheet
);
var
dataList
=
sheet
.
PerData
.
Select
(
t
=>
(
PerDataAccountBaisc
)
t
);
var
dataList
=
sheet
.
PerData
.
Select
(
t
=>
(
PerDataAccountBaisc
)
t
);
if
(
sheet
.
ModuleName
==
"医生组临床科室单元核算表"
)
dataList
=
dataList
.
Where
(
t
=>
t
.
UnitType
==
UnitType
.
医生组
.
ToString
()).
ToList
();
List
<
res_account
>
addList
=
new
List
<
res_account
>();
List
<
res_account
>
addList
=
new
List
<
res_account
>();
foreach
(
var
data
in
dataList
)
foreach
(
var
data
in
dataList
)
{
{
...
@@ -151,7 +154,6 @@ public void Save(List<PerSheet> perSheets, int allotId)
...
@@ -151,7 +154,6 @@ public void Save(List<PerSheet> perSheets, int allotId)
logManageService
.
WriteMsg
(
"正在生成绩效"
,
$"保存核算数据 -
{
sheet
.
SheetName
}
"
,
1
,
allotId
,
"ReceiveMessage"
);
logManageService
.
WriteMsg
(
"正在生成绩效"
,
$"保存核算数据 -
{
sheet
.
SheetName
}
"
,
1
,
allotId
,
"ReceiveMessage"
);
if
(
sheet
.
SheetType
==
SheetType
.
ComputeDoctorAccount
||
sheet
.
SheetType
==
SheetType
.
ComputeNurseAccount
)
if
(
sheet
.
SheetType
==
SheetType
.
ComputeDoctorAccount
||
sheet
.
SheetType
==
SheetType
.
ComputeNurseAccount
)
{
{
if
(
sheet
.
ModuleName
!=
"专家核算表"
)
SaveComputeAccount
(
sheet
,
allotId
);
SaveComputeAccount
(
sheet
,
allotId
);
}
}
else
else
...
...
performance/Performance.Services/ComputeService.cs
View file @
0abed487
...
@@ -91,7 +91,7 @@ public List<res_specialunit> GetSpecial(int allotId)
...
@@ -91,7 +91,7 @@ public List<res_specialunit> GetSpecial(int allotId)
/// <returns></returns>
/// <returns></returns>
public
List
<
DeptResponse
>
GetDoctorPerformance
(
int
allotId
)
public
List
<
DeptResponse
>
GetDoctorPerformance
(
int
allotId
)
{
{
var
list
=
perforResaccountRepository
.
GetEntities
(
t
=>
t
.
UnitType
!=
(
int
)
UnitType
.
护理
组
&&
t
.
AllotID
==
allotId
)?.
OrderByDescending
(
t
=>
t
.
AccountingUnit
);
var
list
=
perforResaccountRepository
.
GetEntities
(
t
=>
t
.
UnitType
==
(
int
)
UnitType
.
医生
组
&&
t
.
AllotID
==
allotId
)?.
OrderByDescending
(
t
=>
t
.
AccountingUnit
);
List
<
DeptResponse
>
doctor
=
Mapper
.
Map
<
List
<
DeptResponse
>>(
list
);
List
<
DeptResponse
>
doctor
=
Mapper
.
Map
<
List
<
DeptResponse
>>(
list
);
doctor
?.
ForEach
(
t
=>
t
.
UnitName
=
((
UnitType
)
t
.
UnitType
).
ToString
());
doctor
?.
ForEach
(
t
=>
t
.
UnitName
=
((
UnitType
)
t
.
UnitType
).
ToString
());
return
doctor
;
return
doctor
;
...
...
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