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
24246cc1
Commit
24246cc1
authored
May 21, 2021
by
ruyun.zhang@suvalue.com
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug修复
parent
eaefefc2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
performance/Performance.Services/ConfigService.cs
+2
-2
performance/Performance.Services/PersonService.cs
+1
-3
No files found.
performance/Performance.Services/ConfigService.cs
View file @
24246cc1
...
@@ -722,7 +722,7 @@ public HandsonTable GetBatchAccountingStructrue(int AllotId)
...
@@ -722,7 +722,7 @@ public HandsonTable GetBatchAccountingStructrue(int AllotId)
if
(
column
.
Data
==
"核算组别"
)
if
(
column
.
Data
==
"核算组别"
)
{
{
column
.
Type
=
"autocomplete"
;
column
.
Type
=
"autocomplete"
;
column
.
Source
=
new
[]
{
"医生组"
,
"护理组"
,
"医技组"
,
"特殊核算组"
,
"其他医生组"
,
"其他护理组"
,
"其他医技组"
,
"行政高层"
,
"行政中层"
,
"行政后勤"
}
;
column
.
Source
=
EnumHelper
.
GetItems
<
UnitType
>().
Select
(
w
=>
w
.
Description
.
Replace
(
"行政后勤"
,
"行政工勤"
)).
ToArray
()
;
column
.
Strict
=
true
;
column
.
Strict
=
true
;
}
}
}
}
...
@@ -734,7 +734,7 @@ public bool BatchSaveAccounting(int allotId, SaveCollectData request)
...
@@ -734,7 +734,7 @@ public bool BatchSaveAccounting(int allotId, SaveCollectData request)
{
{
var
dicData
=
CreateDataRow
(
0
,
allotId
,
request
,
Accounting
);
var
dicData
=
CreateDataRow
(
0
,
allotId
,
request
,
Accounting
);
var
getAccounts
=
cofaccountingRepository
.
GetEntities
();
var
getAccounts
=
cofaccountingRepository
.
GetEntities
();
var
unitType
=
new
[]
{
"医生组"
,
"护理组"
,
"医技组"
,
"特殊核算组"
,
"其他医生组"
,
"其他护理组"
,
"其他医技组"
,
"行政高层"
,
"行政中层"
,
"行政后勤"
}
;
var
unitType
=
EnumHelper
.
GetItems
<
UnitType
>().
Select
(
w
=>
w
.
Description
.
Replace
(
"行政后勤"
,
"行政工勤"
)).
ToArray
()
;
List
<
cof_accounting
>
accounts
=
new
List
<
cof_accounting
>();
List
<
cof_accounting
>
accounts
=
new
List
<
cof_accounting
>();
foreach
(
var
item
in
dicData
)
foreach
(
var
item
in
dicData
)
{
{
...
...
performance/Performance.Services/PersonService.cs
View file @
24246cc1
...
@@ -611,9 +611,7 @@ public HandsonTable GetBatchPersonStructrue(int hospitalId)
...
@@ -611,9 +611,7 @@ public HandsonTable GetBatchPersonStructrue(int hospitalId)
if
(
column
.
Data
==
"人员类别"
)
if
(
column
.
Data
==
"人员类别"
)
{
{
column
.
Type
=
"autocomplete"
;
column
.
Type
=
"autocomplete"
;
column
.
Source
=
deptdics
?
column
.
Source
=
EnumHelper
.
GetItems
<
UnitType
>().
Select
(
w
=>
w
.
Description
.
Replace
(
"行政后勤"
,
"行政工勤"
)).
ToArray
();
.
Where
(
t
=>
!
new
string
[]
{
UnitType
.
专家组
.
ToString
()
}.
Contains
(
t
.
UnitType
))
.
Select
(
t
=>
t
.
UnitType
).
Distinct
().
ToArray
();
column
.
Strict
=
true
;
column
.
Strict
=
true
;
}
}
else
if
(
new
[]
{
"出勤天数"
,
"预留比例"
}.
Contains
(
column
.
Data
))
else
if
(
new
[]
{
"出勤天数"
,
"预留比例"
}.
Contains
(
column
.
Data
))
...
...
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