Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
A
Aidea
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sa_aidea
Aidea
Commits
6c5a93fc
Commit
6c5a93fc
authored
Feb 26, 2021
by
卜远杰
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
报表整改
parent
a0367b59
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
ReportJob.java
...module/src/main/java/com/cftech/report/job/ReportJob.java
+4
-2
No files found.
aidea-modules/reportform-module/src/main/java/com/cftech/report/job/ReportJob.java
View file @
6c5a93fc
...
...
@@ -94,9 +94,10 @@ public class ReportJob implements Job {
String
regionOrgIds
=
SystemConfig
.
p
.
getProperty
(
"REGION_LONG_ID"
);
if
(
orgParentIds
.
contains
(
regionOrgIds
)
&&
orgParentIdArray
.
length
>
regionOrgIds
.
split
(
","
).
length
)
{
//若果医生组织id在区域组织下面 则根据大区长编码获取下面所有组织信息
String
areIds
=
regionOrgIds
+
regionOrgIds
.
split
(
","
)
[
4
];
String
areIds
=
regionOrgIds
+
orgParentIdArray
[
3
]
+
","
+
orgParentIdArray
[
4
];
Conds
condOrg
=
new
Conds
();
condOrg
.
rightLike
(
"t.parent_ids"
,
areIds
);
condOrg
.
equalOr
(
"t.parent_ids"
,
regionOrgIds
+
orgParentIdArray
[
3
]+
","
);
Sort
sortOrg
=
new
Sort
(
"t.parent_id"
,
OrderType
.
ASC
);
List
<
OrgUnit
>
orgUnits
=
orgUnitService
.
fetchSearchByPage
(
0L
,
condOrg
,
sortOrg
,
0
,
0
);
if
(
orgUnits
.
size
()
>
0
)
{
...
...
@@ -144,9 +145,10 @@ public class ReportJob implements Job {
String
regionOrgIds
=
SystemConfig
.
p
.
getProperty
(
"REGION_LONG_ID"
);
if
(
orgParentIds
.
contains
(
regionOrgIds
)
&&
orgParentIdArray
.
length
>
regionOrgIds
.
split
(
","
).
length
)
{
//若果医生组织id在区域组织下面 则根据大区长编码获取下面所有组织信息
String
areIds
=
regionOrgIds
+
orgParentIdArray
[
3
];
String
areIds
=
regionOrgIds
+
orgParentIdArray
[
3
]
+
","
+
orgParentIdArray
[
4
]
;
Conds
condOrg
=
new
Conds
();
condOrg
.
rightLike
(
"t.parent_ids"
,
areIds
);
condOrg
.
equalOr
(
"t.parent_ids"
,
regionOrgIds
+
orgParentIdArray
[
3
]+
","
);
Sort
sortOrg
=
new
Sort
(
"t.parent_id"
,
OrderType
.
ASC
);
List
<
OrgUnit
>
orgUnits
=
orgUnitService
.
fetchSearchByPage
(
0L
,
condOrg
,
sortOrg
,
0
,
0
);
if
(
orgUnits
.
size
()
>
0
)
{
...
...
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