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
be8b6961
Commit
be8b6961
authored
Oct 19, 2022
by
纪旭 韦
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
二次分配录入错误
parent
dc6dedd5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
performance/Performance.Services/RedistributionService.cs
+4
-4
No files found.
performance/Performance.Services/RedistributionService.cs
View file @
be8b6961
...
@@ -140,7 +140,7 @@ public SecondDetailDto Load(int secondId, ComputeMode computeMode, EmployeeSourc
...
@@ -140,7 +140,7 @@ public SecondDetailDto Load(int secondId, ComputeMode computeMode, EmployeeSourc
}
}
}
}
var
head
=
LoadHead
(
computeMode
,
allot
,
second
,
overrideMode
);
var
head
=
LoadHead
(
computeMode
,
allot
,
second
,
prevSecondAllot
,
overrideMode
);
var
dic
=
GetTableHeaderDictionary
(
computeMode
,
allot
,
second
,
loads
,
isAttachFactor
:
false
);
var
dic
=
GetTableHeaderDictionary
(
computeMode
,
allot
,
second
,
loads
,
isAttachFactor
:
false
);
return
new
SecondDetailDto
{
Head
=
head
,
Body
=
handson
,
Dic
=
dic
};
return
new
SecondDetailDto
{
Head
=
head
,
Body
=
handson
,
Dic
=
dic
};
}
}
...
@@ -426,9 +426,8 @@ public void RowsExpand(per_allot allot, List<SecondColumnDictionary> dic, List<D
...
@@ -426,9 +426,8 @@ public void RowsExpand(per_allot allot, List<SecondColumnDictionary> dic, List<D
/// <param name="second"></param>
/// <param name="second"></param>
/// <param name="allot"></param>
/// <param name="allot"></param>
/// <returns></returns>
/// <returns></returns>
private
Dictionary
<
string
,
object
>
LoadHead
(
ComputeMode
computeMode
,
per_allot
allot
,
ag_secondallot
second
,
EmployeeSource
overrideMode
=
0
)
private
Dictionary
<
string
,
object
>
LoadHead
(
ComputeMode
computeMode
,
per_allot
allot
,
ag_secondallot
second
,
ag_secondallot
prevSecondAllot
,
EmployeeSource
overrideMode
=
0
)
{
{
prevSecondAllot
=
_secondAllotDetails
.
GetPreviousSecondAllot
(
allot
.
HospitalId
,
second
);
/*
/*
此处数据需要额外注意,前端显示规则:接口返回则显示
此处数据需要额外注意,前端显示规则:接口返回则显示
避免额外返回造成前端错误显示
避免额外返回造成前端错误显示
...
@@ -1601,9 +1600,10 @@ public List<SecondComputeCheckResultDto> CheckData(per_allot allot, ag_secondall
...
@@ -1601,9 +1600,10 @@ public List<SecondComputeCheckResultDto> CheckData(per_allot allot, ag_secondall
/// <returns></returns>
/// <returns></returns>
public
(
Dictionary
<
string
,
object
>
head
,
List
<
Dictionary
<
string
,
object
>>
rows
)
RedistributionDetail
(
ComputeMode
computeMode
,
per_allot
allot
,
ag_secondallot
second
,
List
<
SecondWorkLoadDto
>
workloadGroups
)
public
(
Dictionary
<
string
,
object
>
head
,
List
<
Dictionary
<
string
,
object
>>
rows
)
RedistributionDetail
(
ComputeMode
computeMode
,
per_allot
allot
,
ag_secondallot
second
,
List
<
SecondWorkLoadDto
>
workloadGroups
)
{
{
var
prevSecondAllot
=
_secondAllotDetails
.
GetPreviousSecondAllot
(
allot
.
HospitalId
,
second
);
var
loadEmployees
=
_agbodysourceRepository
.
GetEntities
(
w
=>
w
.
SecondId
==
second
.
Id
);
var
loadEmployees
=
_agbodysourceRepository
.
GetEntities
(
w
=>
w
.
SecondId
==
second
.
Id
);
var
rows
=
LoadWorkload
(
allot
,
second
,
loadEmployees
);
var
rows
=
LoadWorkload
(
allot
,
second
,
loadEmployees
);
var
head
=
LoadHead
(
computeMode
,
allot
,
second
);
var
head
=
LoadHead
(
computeMode
,
allot
,
second
,
prevSecondAllot
);
if
(
computeMode
!=
ComputeMode
.
NotCalculate
)
if
(
computeMode
!=
ComputeMode
.
NotCalculate
)
{
{
overviewCalculate
(
head
,
rows
);
overviewCalculate
(
head
,
rows
);
...
...
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