From c5a759ea8e74baf6e523a580de33ab9faa452b46 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Wed, 3 Sep 2025 13:03:39 -0700 Subject: [PATCH 1/2] Remove unmatched query parameter from visit summary query --- .../src/org/labkey/study/visitmanager/SequenceVisitManager.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/study/src/org/labkey/study/visitmanager/SequenceVisitManager.java b/study/src/org/labkey/study/visitmanager/SequenceVisitManager.java index d5d2da038f2..b7fed8a9513 100644 --- a/study/src/org/labkey/study/visitmanager/SequenceVisitManager.java +++ b/study/src/org/labkey/study/visitmanager/SequenceVisitManager.java @@ -144,7 +144,7 @@ protected SQLFragment getVisitSummarySql(StudyQuerySchema sqs, CohortFilter coho sql.append("SELECT ").append(selectCols); sql.append("\nFROM ").append(studyData.getFromSQL(alias)); sql.append(" INNER JOIN study.ParticipantVisit PV ON (") - .append(container.getValueSql(alias)).append(" = ? AND \n\tPV.ParticipantId = ").append(participant.getValueSql(alias)).append(" AND \n\tPV.SequenceNum = ") + .append("PV.ParticipantId = ").append(participant.getValueSql(alias)).append(" AND \n\tPV.SequenceNum = ") .append(sequencenum.getValueSql(alias)).append(" AND\n\t").append(container.getValueSql(alias)).append("=PV.Container AND \n" + "\tPV.CohortID = ?)\n"); sql.add(cohortFilter.getCohortId()); sql.append(" LEFT OUTER JOIN (").append(sqlSequenceVisitMap).append(") AS SVM ON ") From a69352345259b43a99a94d67a8ea8a6b598d7b17 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Wed, 3 Sep 2025 15:17:08 -0700 Subject: [PATCH 2/2] Re-add missing query parameter value --- .../org/labkey/study/visitmanager/SequenceVisitManager.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/study/src/org/labkey/study/visitmanager/SequenceVisitManager.java b/study/src/org/labkey/study/visitmanager/SequenceVisitManager.java index b7fed8a9513..18dcb9144c1 100644 --- a/study/src/org/labkey/study/visitmanager/SequenceVisitManager.java +++ b/study/src/org/labkey/study/visitmanager/SequenceVisitManager.java @@ -144,8 +144,9 @@ protected SQLFragment getVisitSummarySql(StudyQuerySchema sqs, CohortFilter coho sql.append("SELECT ").append(selectCols); sql.append("\nFROM ").append(studyData.getFromSQL(alias)); sql.append(" INNER JOIN study.ParticipantVisit PV ON (") - .append("PV.ParticipantId = ").append(participant.getValueSql(alias)).append(" AND \n\tPV.SequenceNum = ") + .append(container.getValueSql(alias)).append(" = ? AND \n\tPV.ParticipantId = ").append(participant.getValueSql(alias)).append(" AND \n\tPV.SequenceNum = ") .append(sequencenum.getValueSql(alias)).append(" AND\n\t").append(container.getValueSql(alias)).append("=PV.Container AND \n" + "\tPV.CohortID = ?)\n"); + sql.add(getStudy().getContainer()); sql.add(cohortFilter.getCohortId()); sql.append(" LEFT OUTER JOIN (").append(sqlSequenceVisitMap).append(") AS SVM ON ") .append(sequencenum.getValueSql(alias)).append(" = SVM.SequenceNum AND ")