Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -293,16 +293,16 @@ public ArrayList<LabResultData> populateDocumentResultsData(String providerNo, S
+ (dateSearchType.equals("receivedCreated") ? "doc.contentdatetime" : "doc.observationdate") + ", plr.lab_type as doctype, doc.doctype as description, date(doc.updatedatetime) "
+ " FROM demographic d, providerLabRouting plr, document doc, "
+ " (SELECT * FROM "
+ " (SELECT DISTINCT plr.id, plr.lab_type FROM providerLabRouting plr, ctl_document cd "
+ " (SELECT DISTINCT plr.id, plr.lab_type FROM providerLabRouting plr, ctl_document cd "
+ " WHERE " + " (cd.module_id = :demographicNo "
+ " AND cd.document_no = plr.lab_no"
+ " AND plr.lab_type = 'DOC' "
+ " AND plr.status " + ("".equals(status) ? " IS NOT NULL " : " = :status ")
+ (searchProvider ? " AND plr.provider_no = :providerNo " : " )")
+ (searchProvider ? " AND plr.provider_no = :providerNo )" : " )")
+ " ORDER BY id DESC) AS Y"
+ " UNION"
+ " SELECT * FROM"
+ " (SELECT DISTINCT plr.id, plr.lab_type FROM providerLabRouting plr, patientLabRouting plr2"
+ " (SELECT DISTINCT plr.id, plr.lab_type FROM providerLabRouting plr, patientLabRouting plr2"
+ " WHERE"
+ " plr.lab_type = 'HL7' AND plr2.lab_type = 'HL7'"
+ " AND plr.status " + ("".equals(status) ? " IS NOT NULL " : " = :status ")
Expand Down Expand Up @@ -642,7 +642,7 @@ public ArrayList<LabResultData> populateDocumentResultsData(String providerNo, S

lbData.lastUpdateDate = getStringValue(r[updateDateLoc]);

lbData.finalResultsCount = 0;//rs.getInt("final_result_count");
lbData.finalResultsCount = 0;
labResults.add(lbData);
}

Expand Down
Loading