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
f0ac9d6c
Commit
f0ac9d6c
authored
Mar 18, 2021
by
lcx
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
绩效文件生成失败,缺少奖罚数据
parent
cdbe954e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
49 additions
and
4 deletions
+49
-4
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
+45
-0
performance/Performance.Services/AllotCompute/ProcessComputService.cs
+3
-3
performance/Performance.Services/AllotCompute/ResultComputeService.cs
+1
-1
No files found.
performance/Performance.Api/wwwroot/Performance.EntityModels.xml
View file @
f0ac9d6c
...
...
@@ -1493,6 +1493,11 @@
</summary>
</member>
<member
name=
"P:Performance.EntityModels.cof_drugtype.HospitalId"
>
<summary>
</summary>
</member>
<member
name=
"P:Performance.EntityModels.cof_drugtype.AllotID"
>
<summary>
...
...
@@ -5033,6 +5038,46 @@
预算
</summary>
</member>
<member
name=
"T:Performance.EntityModels.report_performance_category"
>
<summary>
</summary>
</member>
<member
name=
"P:Performance.EntityModels.report_performance_category.Id"
>
<summary>
</summary>
</member>
<member
name=
"P:Performance.EntityModels.report_performance_category.HospitalId"
>
<summary>
</summary>
</member>
<member
name=
"P:Performance.EntityModels.report_performance_category.Year"
>
<summary>
</summary>
</member>
<member
name=
"P:Performance.EntityModels.report_performance_category.Month"
>
<summary>
</summary>
</member>
<member
name=
"P:Performance.EntityModels.report_performance_category.Category"
>
<summary>
</summary>
</member>
<member
name=
"P:Performance.EntityModels.report_performance_category.Original"
>
<summary>
</summary>
</member>
<member
name=
"P:Performance.EntityModels.report_performance_category.ItemName"
>
<summary>
</summary>
</member>
<member
name=
"T:Performance.EntityModels.report_performance_person_tags"
>
<summary>
...
...
performance/Performance.Services/AllotCompute/ProcessComputService.cs
View file @
f0ac9d6c
...
...
@@ -293,17 +293,17 @@ public List<PerSheet> Compute(PerExcel excel, List<PerSheet> perSheet, per_allot
//var materialsExtra = materialsExtras?.FirstOrDefault(w => w.UnitType == unitType.ToString() && w.AccountingUnit == dept.AccountingUnit)?.TotelValue;
//var scoreAverage = accountScoreAverages?.FirstOrDefault(w => w.UnitType == unitType.ToString() && w.AccountingUnit == dept.AccountingUnit)?.TotelValue;
var
econDoctor
=
economicData
.
FirstOrDefault
(
t
=>
t
.
UnitType
==
unitType
.
ToString
()
&&
t
.
AccountingUnit
==
dept
.
AccountingUnit
);
var
econDoctor
=
economicData
?
.
FirstOrDefault
(
t
=>
t
.
UnitType
==
unitType
.
ToString
()
&&
t
.
AccountingUnit
==
dept
.
AccountingUnit
);
var
workDoctor
=
info
.
Data
.
FirstOrDefault
(
t
=>
t
.
UnitType
==
unitType
.
ToString
()
&&
t
.
AccountingUnit
==
dept
.
AccountingUnit
);
if
(
UnitType
.
专家组
==
unitType
||
UnitType
.
其他医技组
==
unitType
||
UnitType
.
其他医生组
==
unitType
||
UnitType
.
其他护理组
==
unitType
)
{
econDoctor
=
economicData
.
FirstOrDefault
(
t
=>
t
.
AccountingUnit
==
dept
.
AccountingUnit
);
econDoctor
=
economicData
?
.
FirstOrDefault
(
t
=>
t
.
AccountingUnit
==
dept
.
AccountingUnit
);
workDoctor
=
info
.
Data
.
FirstOrDefault
(
t
=>
t
.
AccountingUnit
==
dept
.
AccountingUnit
);
}
if
(
UnitType
.
医技组
==
unitType
&&
workDoctor
==
null
)
workDoctor
=
info
.
Data
.
FirstOrDefault
(
t
=>
t
.
UnitType
==
UnitType
.
医生组
.
ToString
()
&&
t
.
AccountingUnit
==
dept
.
AccountingUnit
);
// 夜班绩效 从医院奖罚的明细项中获取
var
nightShift
=
accountExtraData
.
FirstOrDefault
(
w
=>
w
.
UnitType
==
dept
.
UnitType
&&
w
.
AccountingUnit
==
dept
.
AccountingUnit
&&
w
.
TypeName
?.
Trim
()
==
"夜班绩效"
)?.
CellValue
??
0
;
var
nightShift
=
accountExtraData
?
.
FirstOrDefault
(
w
=>
w
.
UnitType
==
dept
.
UnitType
&&
w
.
AccountingUnit
==
dept
.
AccountingUnit
&&
w
.
TypeName
?.
Trim
()
==
"夜班绩效"
)?.
CellValue
??
0
;
dept
.
NightShiftWorkPerforFee
=
nightShift
;
//dept.MedicineFactor = workDoctor?.MedicineFactor;
...
...
performance/Performance.Services/AllotCompute/ResultComputeService.cs
View file @
f0ac9d6c
...
...
@@ -175,7 +175,7 @@ public void SpecialUnitCompute(PerExcel excel, per_allot allot, List<res_baiscno
//var scoreAverage = accountScoreAverages?.FirstOrDefault(w => w.UnitType == UnitType.特殊核算组.ToString() && w.AccountingUnit == dept?.AccountingUnit)?.TotelValue;
// 夜班绩效 从医院奖罚的明细项中获取
var
nightShift
=
accountExtraData
.
FirstOrDefault
(
w
=>
w
.
UnitType
==
dept
.
UnitType
&&
w
.
AccountingUnit
==
dept
.
AccountingUnit
&&
w
.
TypeName
?.
Trim
()
==
"夜班绩效"
)?.
CellValue
??
0
;
var
nightShift
=
accountExtraData
?
.
FirstOrDefault
(
w
=>
w
.
UnitType
==
dept
.
UnitType
&&
w
.
AccountingUnit
==
dept
.
AccountingUnit
&&
w
.
TypeName
?.
Trim
()
==
"夜班绩效"
)?.
CellValue
??
0
;
decimal
?
headcount
=
null
;
if
(
typeList
.
Any
(
o
=>
o
.
Description
==
item
.
QuantitativeIndicators
))
...
...
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