Commit 6c5a93fc authored by 卜远杰's avatar 卜远杰

报表整改

parent a0367b59
......@@ -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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment