Skip to content

Fixed some hibernate-query parameter errors, enabled the echart. #14

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

Merged
yingbull merged 1 commit into from
Nov 11, 2024
Merged

Fixed some hibernate-query parameter errors, enabled the echart. #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 23 additions & 23 deletions src/main/java/org/oscarehr/casemgmt/dao/CaseManagementNoteDAOImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ public List<CaseManagementNote> getCPPNotes(String demoNo, long issueId, String
d = cal.getTime();
}

String hql = "select distinct cmn from CaseManagementNote cmn join cmn.issues i where i.issue_id = ? and cmn.demographic_no = ? and cmn.observation_date >= ? and cmn.id in (select max(cmn.id) from cmn where cmn.demographic_no = ? GROUP BY uuid) ORDER BY cmn.observation_date asc";
String hql = "select distinct cmn from CaseManagementNote cmn join cmn.issues i where i.issue_id = ?0 and cmn.demographic_no = ?1 and cmn.observation_date >= ?2 and cmn.id in (select max(cmn.id) from cmn where cmn.demographic_no = ?3 GROUP BY uuid) ORDER BY cmn.observation_date asc";

@SuppressWarnings("unchecked")
List<CaseManagementNote> result = (List<CaseManagementNote>) getHibernateTemplate().find(hql,
Expand Down Expand Up @@ -218,7 +218,7 @@ public List<CaseManagementNote> getNotesByDemographic(String demographic_no, Str
MiscUtils.getLogger().error("Error", e);
}
String hql = "select distinct cmn from CaseManagementNote cmn join cmn.issues i where i.issue_id in (" + list
+ ") and cmn.demographic_no = ? and cmn.id in (select max(cmn.id) from cmn where cmn.observation_date >= ? GROUP BY uuid) ORDER BY cmn.observation_date asc";
+ ") and cmn.demographic_no = ?0 and cmn.id in (select max(cmn.id) from cmn where cmn.observation_date >= ?1 GROUP BY uuid) ORDER BY cmn.observation_date asc";

@SuppressWarnings("unchecked")
List<CaseManagementNote> result = (List<CaseManagementNote>) getHibernateTemplate().find(hql,
Expand Down Expand Up @@ -247,7 +247,7 @@ public List<CaseManagementNote> getNotesByDemographic(String demographic_no) {
return (List<CaseManagementNote>) getHibernateTemplate().findByNamedQuery("mostRecentOra",
new Object[]{demographic_no});
} else {
String hql = "select cmn from CaseManagementNote cmn where cmn.demographic_no = ? and cmn.id = (select max(cmn2.id) from CaseManagementNote cmn2 where cmn2.uuid = cmn.uuid) order by cmn.observation_date";
String hql = "select cmn from CaseManagementNote cmn where cmn.demographic_no = ?0 and cmn.id = (select max(cmn2.id) from CaseManagementNote cmn2 where cmn2.uuid = cmn.uuid) order by cmn.observation_date";
return (List<CaseManagementNote>) getHibernateTemplate().find(hql, demographic_no);
// return getHibernateTemplate().findByNamedQuery("mostRecent", new Object[] {
// demographic_no });
Expand All @@ -258,34 +258,34 @@ public List<CaseManagementNote> getNotesByDemographic(String demographic_no) {
@Override
public List<CaseManagementNote> getNotesByDemographicSince(String demographic_no, Date date) {

String hql = "select cmn from CaseManagementNote cmn where cmn.demographic_no = ? and cmn.update_date > ? and cmn.locked != '1' and cmn.id = (select max(cmn2.id) from CaseManagementNote cmn2 where cmn2.uuid = cmn.uuid) order by cmn.observation_date";
String hql = "select cmn from CaseManagementNote cmn where cmn.demographic_no = ?0 and cmn.update_date > ?1 and cmn.locked != '1' and cmn.id = (select max(cmn2.id) from CaseManagementNote cmn2 where cmn2.uuid = cmn.uuid) order by cmn.observation_date";
return (List<CaseManagementNote>) getHibernateTemplate().find(hql, demographic_no, date);
}

@Override
public long getNotesCountByDemographicId(String demographic_no) {
String hql = "select count(*) from CaseManagementNote cmm where cmm.demographic_no = ?";
String hql = "select count(*) from CaseManagementNote cmm where cmm.demographic_no = ?0";
return ((Long) getHibernateTemplate().find(hql, demographic_no).get(0)).longValue();
}

@SuppressWarnings("unchecked")
@Override
public List<Object[]> getRawNoteInfoByDemographic(String demographic_no) {
String hql = "select cmn.id,cmn.observation_date,cmn.providerNo,cmn.program_no,cmn.reporter_caisi_role,cmn.uuid from CaseManagementNote cmn where cmn.demographic_no = ? order by cmn.update_date DESC";
String hql = "select cmn.id,cmn.observation_date,cmn.providerNo,cmn.program_no,cmn.reporter_caisi_role,cmn.uuid from CaseManagementNote cmn where cmn.demographic_no = ?0 order by cmn.update_date DESC";
return (List<Object[]>) getHibernateTemplate().find(hql, demographic_no);
}

@SuppressWarnings("unchecked")
@Override
public List<Map<String, Object>> getRawNoteInfoMapByDemographic(String demographic_no) {
String hql = "select new map(cmn.id as id,cmn.observation_date as observation_date,cmn.providerNo as providerNo,cmn.program_no as program_no,cmn.reporter_caisi_role as reporter_caisi_role,cmn.uuid as uuid, cmn.update_date as update_date) from CaseManagementNote cmn where cmn.demographic_no = ? order by cmn.update_date DESC";
String hql = "select new map(cmn.id as id,cmn.observation_date as observation_date,cmn.providerNo as providerNo,cmn.program_no as program_no,cmn.reporter_caisi_role as reporter_caisi_role,cmn.uuid as uuid, cmn.update_date as update_date) from CaseManagementNote cmn where cmn.demographic_no = ?0 order by cmn.update_date DESC";
return (List<Map<String, Object>>) getHibernateTemplate().find(hql, demographic_no);
}

@SuppressWarnings("unchecked")
@Override
public List<Map<String, Object>> getUnsignedRawNoteInfoMapByDemographic(String demographic_no) {
String hql = "select new map(cmn.id as id,cmn.observation_date as observation_date,cmn.providerNo as providerNo,cmn.program_no as program_no,cmn.reporter_caisi_role as reporter_caisi_role,cmn.uuid as uuid, cmn.update_date as update_date) from CaseManagementNote cmn where cmn.demographic_no = ? and cmn.signed=? and cmn.id = (select max(cmn2.id) from CaseManagementNote cmn2 where cmn2.uuid = cmn.uuid) order by cmn.update_date DESC";
String hql = "select new map(cmn.id as id,cmn.observation_date as observation_date,cmn.providerNo as providerNo,cmn.program_no as program_no,cmn.reporter_caisi_role as reporter_caisi_role,cmn.uuid as uuid, cmn.update_date as update_date) from CaseManagementNote cmn where cmn.demographic_no = ?0 and cmn.signed=?1 and cmn.id = (select max(cmn2.id) from CaseManagementNote cmn2 where cmn2.uuid = cmn.uuid) order by cmn.update_date DESC";
return (List<Map<String, Object>>) getHibernateTemplate().find(hql, new Object[]{demographic_no, false});
}

Expand All @@ -296,7 +296,7 @@ public List<CaseManagementNote> getNotesByDemographic(String demographic_no, Int
return (List<CaseManagementNote>) getHibernateTemplate().findByNamedQuery("mostRecentOra",
new Object[]{demographic_no});
} else {
String hql = "select cmn from CaseManagementNote cmn where cmn.demographic_no = ? and cmn.id = (select max(cmn2.id) from CaseManagementNote cmn2 where cmn2.uuid = cmn.uuid) order by cmn.observation_date desc";
String hql = "select cmn from CaseManagementNote cmn where cmn.demographic_no = ?0 and cmn.id = (select max(cmn2.id) from CaseManagementNote cmn2 where cmn2.uuid = cmn.uuid) order by cmn.observation_date desc";

HibernateTemplate Hibernatetemplate = getHibernateTemplate();
if (maxNotes != -1) {
Expand Down Expand Up @@ -339,18 +339,18 @@ public List<CaseManagementNote> getActiveNotesByDemographic(String demographic_n
list += issues[x];
}
hql = "select cmn from CaseManagementNote cmn join cmn.issues i where i.issue_id in (" + list
+ ") and cmn.demographic_no = ? and cmn.archived = 0 and cmn.id = (select max(cmn2.id) from CaseManagementNote cmn2 where cmn.uuid = cmn2.uuid) ORDER BY cmn.position, cmn.observation_date desc";
+ ") and cmn.demographic_no = ?0 and cmn.archived = 0 and cmn.id = (select max(cmn2.id) from CaseManagementNote cmn2 where cmn.uuid = cmn2.uuid) ORDER BY cmn.position, cmn.observation_date desc";
return (List<CaseManagementNote>) this.getHibernateTemplate().find(hql, demographic_no);

} else if (issues.length == 1) {
long id = Long.parseLong(issues[0]);

hql = "select cmn from CaseManagementNote cmn join cmn.issues i where i.issue_id = ? and cmn.demographic_no= ? and cmn.archived=0 order by cmn.position, cmn.observation_date desc";
hql = "select cmn from CaseManagementNote cmn join cmn.issues i where i.issue_id = ?0 and cmn.demographic_no= ?1 and cmn.archived=0 order by cmn.position, cmn.observation_date desc";

List<CaseManagementNote> issueList = (List<CaseManagementNote>) this.getHibernateTemplate().find(hql,
new Object[]{id, demographic_no});

hql = "select max(cmn.id) from CaseManagementNote cmn where cmn.demographic_no = ? group by cmn.uuid order by max(cmn.id)";
hql = "select max(cmn.id) from CaseManagementNote cmn where cmn.demographic_no = ?0 group by cmn.uuid order by max(cmn.id)";
List<Integer> currNoteList = (List<Integer>) this.getHibernateTemplate().find(hql,
new Object[]{demographic_no});

Expand Down Expand Up @@ -387,11 +387,11 @@ public List<CaseManagementNote> getNotesByDemographic(String demographic_no, Str
list += issueIds[x];
}
hql = "select cmn from CaseManagementNote cmn join cmn.issues i where i.issue_id in (" + list
+ ") and cmn.demographic_no = ? and cmn.id = (select max(cmn2.id) from CaseManagementNote cmn2 where cmn.uuid = cmn2.uuid) order by cmn.observation_date desc ";
+ ") and cmn.demographic_no = ?0 and cmn.id = (select max(cmn2.id) from CaseManagementNote cmn2 where cmn.uuid = cmn2.uuid) order by cmn.observation_date desc ";
retList = (List<CaseManagementNote>) this.getHibernateTemplate().find(hql, demographic_no);

} else if (issueIds.length == 1) {
hql = "select cmn from CaseManagementNote cmn join cmn.issues i where i.issue_id = ? and cmn.demographic_no = ? and cmn.id = (select max(cmn2.id) from CaseManagementNote cmn2 where cmn.uuid = cmn2.uuid) order by cmn.observation_date desc";
hql = "select cmn from CaseManagementNote cmn join cmn.issues i where i.issue_id = ?0 and cmn.demographic_no = ?1 and cmn.id = (select max(cmn2.id) from CaseManagementNote cmn2 where cmn.uuid = cmn2.uuid) order by cmn.observation_date desc";
long id = Long.parseLong(issueIds[0]);
retList = (List<CaseManagementNote>) this.getHibernateTemplate().find(hql,
new Object[]{id, demographic_no});
Expand Down Expand Up @@ -421,11 +421,11 @@ public List<CaseManagementNote> getNotesByDemographic(String demographic_no, Str
list += issueIds[x];
}
hql = "select cmn from CaseManagementNote cmn join cmn.issues i where i.issue_id in (" + list
+ ") and cmn.demographic_no = ? and cmn.id = (select max(cmn2.id) from CaseManagementNote cmn2 where cmn.uuid = cmn2.uuid)";
+ ") and cmn.demographic_no = ?0 and cmn.id = (select max(cmn2.id) from CaseManagementNote cmn2 where cmn.uuid = cmn2.uuid)";
return (List<CaseManagementNote>) this.getHibernateTemplate().find(hql, demographic_no);

} else if (issueIds.length == 1) {
hql = "select cmn from CaseManagementNote cmn join cmn.issues i where i.issue_id = ? and cmn.demographic_no = ? and cmn.id = (select max(cmn2.id) from CaseManagementNote cmn2 where cmn.uuid = cmn2.uuid)";
hql = "select cmn from CaseManagementNote cmn join cmn.issues i where i.issue_id = ?0 and cmn.demographic_no = ?1 and cmn.id = (select max(cmn2.id) from CaseManagementNote cmn2 where cmn.uuid = cmn2.uuid)";
long id = Long.parseLong(issueIds[0]);
return (List<CaseManagementNote>) this.getHibernateTemplate().find(hql,
new Object[]{id, demographic_no});
Expand Down Expand Up @@ -667,7 +667,7 @@ public int getNoteCountForProviderForDateRange(String providerNo, Date startDate
Connection c = null;
try {
c = DbConnectionFilter.getThreadLocalDbConnection();
String sqlCommand = "select count(distinct uuid) from casemgmt_note where provider_no = ? and observation_date >= ? and observation_date <= ?";
String sqlCommand = "select count(distinct uuid) from casemgmt_note where provider_no = ?1 and observation_date >= ?2 and observation_date <= ?3";
PreparedStatement ps = c.prepareStatement(sqlCommand);
ps.setString(1, providerNo);
ps.setTimestamp(2, new Timestamp(startDate.getTime()));
Expand Down Expand Up @@ -706,7 +706,7 @@ public int getNoteCountForProviderForDateRangeWithIssueId(String providerNo, Dat

log.debug("issue Code " + issueCode + " id :" + id);

String sqlCommand = "select count(distinct uuid) from casemgmt_issue c, casemgmt_issue_notes cin, casemgmt_note cn where c.issue_id = ? and c.id = cin.id and cin.note_id = cn.note_id and cn.provider_no = ? and observation_date >= ? and observation_date <= ?";
String sqlCommand = "select count(distinct uuid) from casemgmt_issue c, casemgmt_issue_notes cin, casemgmt_note cn where c.issue_id = ?1 and c.id = cin.id and cin.note_id = cn.note_id and cn.provider_no = ?2 and observation_date >= ?3 and observation_date <= ?4";
log.debug(sqlCommand);
ps = c.prepareStatement(sqlCommand);
ps.setString(1, id);
Expand All @@ -727,7 +727,7 @@ public int getNoteCountForProviderForDateRangeWithIssueId(String providerNo, Dat
// used by decision support to search through the notes for a string
@Override
public List<CaseManagementNote> searchDemographicNotes(String demographic_no, String searchString) {
String hql = "select distinct cmn from CaseManagementNote cmn where cmn.id in (select max(cmn.id) from cmn where cmn.demographic_no = ? GROUP BY uuid) and cmn.demographic_no = ? and cmn.note like ? and cmn.archived = 0";
String hql = "select distinct cmn from CaseManagementNote cmn where cmn.id in (select max(cmn.id) from cmn where cmn.demographic_no = ?0 GROUP BY uuid) and cmn.demographic_no = ?1 and cmn.note like ?2 and cmn.archived = 0";

@SuppressWarnings("unchecked")
List<CaseManagementNote> result = (List<CaseManagementNote>) getHibernateTemplate().find(hql,
Expand All @@ -738,7 +738,7 @@ public List<CaseManagementNote> searchDemographicNotes(String demographic_no, St
@Override
public List<CaseManagementNote> getCaseManagementNoteByProgramIdAndObservationDate(Integer programId,
Date minObservationDate, Date maxObservationDate) {
String queryStr = "FROM CaseManagementNote x WHERE x.program_no=? and x.observation_date>=? and x.observation_date<=?";
String queryStr = "FROM CaseManagementNote x WHERE x.program_no=?0 and x.observation_date>=?1 and x.observation_date<=?2";

@SuppressWarnings("unchecked")
List<CaseManagementNote> rs = (List<CaseManagementNote>) getHibernateTemplate().find(queryStr,
Expand All @@ -749,7 +749,7 @@ public List<CaseManagementNote> getCaseManagementNoteByProgramIdAndObservationDa

@Override
public List<CaseManagementNote> getMostRecentNotesByAppointmentNo(int appointmentNo) {
String hql = "select distinct cmn.uuid from CaseManagementNote cmn where cmn.appointmentNo = ?";
String hql = "select distinct cmn.uuid from CaseManagementNote cmn where cmn.appointmentNo = ?0";
@SuppressWarnings("unchecked")
List<String> tmp = (List<String>) this.getHibernateTemplate().find(hql, appointmentNo);
List<CaseManagementNote> mostRecents = new ArrayList<CaseManagementNote>();
Expand All @@ -761,7 +761,7 @@ public List<CaseManagementNote> getMostRecentNotesByAppointmentNo(int appointmen

@Override
public List<CaseManagementNote> getMostRecentNotes(Integer demographicNo) {
String hql = "select distinct cmn.uuid from CaseManagementNote cmn where cmn.demographic_no = ?";
String hql = "select distinct cmn.uuid from CaseManagementNote cmn where cmn.demographic_no = ?0";
@SuppressWarnings("unchecked")
List<String> tmp = (List<String>) this.getHibernateTemplate().find(hql,
new Object[]{String.valueOf(demographicNo)});
Expand Down Expand Up @@ -795,7 +795,7 @@ public List<Integer> getNotesByFacilitySince(Date date, List<Program> programs)
}
String hql = "select distinct cmn.demographic_no from CaseManagementNote cmn where cmn.program_no in ("
+ sb.toString()
+ ") and cmn.update_date > ? and cmn.locked != '1' and cmn.id = (select max(cmn2.id) from CaseManagementNote cmn2 where cmn2.uuid = cmn.uuid) order by cmn.observation_date";
+ ") and cmn.update_date > ?0 and cmn.locked != '1' and cmn.id = (select max(cmn2.id) from CaseManagementNote cmn2 where cmn2.uuid = cmn.uuid) order by cmn.observation_date";
List<String> results = (List<String>) getHibernateTemplate().find(hql, date);

List<Integer> results2 = new ArrayList<Integer>();
Expand Down