Skip to content

removed unnecessary join of observation fact onto a subquery #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
namdets wants to merge 5 commits into
base: master
Choose a base branch
from
+15 −6
Open

removed unnecessary join of observation fact onto a subquery #13

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9b64588
removed unnecessary join of observation fact onto a subquery derived …
May 13, 2018
287030e
fixing spacing issue in prior fix
May 14, 2018
47545b3
Revert "fixing spacing issue in prior fix"
May 16, 2018
a3905e6
Revert "removed unnecessary join of observation fact onto a subquery …
May 16, 2018
32e650d
removed unnecessary join of observation fact onto a subquery derived …
May 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions ...rvard.i2b2.crc/src/server/edu/harvard/i2b2/crc/dao/pdo/input/FactRelatedQueryHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -690,8 +690,10 @@ public String buildQuery(PanelType panel, String pdoType)
// String mainQuerySql = "SELECT a.* " + mainSelectBlobClause + " FROM "
// + this.getDbSchemaName() + "observation_FACT obs ,( \n";

String mainQuerySql = "SELECT a.* " + mainSelectBlobClause + " FROM "
+ this.getDbSchemaName() + getFactTable() + " obs ,( \n";
String mainQuerySql = obsFactFactRelated.isSelectBlob() ?
"SELECT a.* " + mainSelectBlobClause + " FROM " + this.getDbSchemaName() + getFactTable() + " obs ,( \n"

: "( \n";

try {
if (panel != null) {
Expand Down Expand Up @@ -720,10 +722,17 @@ public String buildQuery(PanelType panel, String pdoType)
throw new I2B2DAOException(i2b2Ex.getMessage(), i2b2Ex);
}

mainQuerySql += " ) a ";

mainQuerySql += " where obs.encounter_num = a.obs_encounter_num and obs.patient_num = a.obs_patient_num ";
mainQuerySql += " and obs.concept_cd = a.obs_concept_cd and obs.provider_id = a.obs_provider_id and obs.start_date = a.obs_start_date and obs.modifier_cd = a.obs_modifier_cd and obs.instance_num = a.obs_instance_num ";
mainQuerySql += obsFactFactRelated.isSelectBlob() ?
" ) a "
+ " where obs.encounter_num = a.obs_encounter_num "
+ " and obs.patient_num = a.obs_patient_num "
+ " and obs.concept_cd = a.obs_concept_cd "
+ " and obs.provider_id = a.obs_provider_id "
+ " and obs.start_date = a.obs_start_date "
+ " and obs.modifier_cd = a.obs_modifier_cd "
+ " and obs.instance_num = a.obs_instance_num "

: " ) ";

if (panel != null) {
TotalItemOccurrences totOccurance = panel.getTotalItemOccurrences();
Expand Down