From 6feb930c293a7c5d9727b12f0f2bad501eca7ebd Mon Sep 17 00:00:00 2001 From: SevKohler Date: Wed, 21 Aug 2024 14:06:45 +0200 Subject: [PATCH] fixed compose, app.yml and AQL order --- setup/compose.yaml | 2 +- src/main/java/org/bih/eos/services/EhrService.java | 2 +- src/main/resources/application.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/setup/compose.yaml b/setup/compose.yaml index 75edd48..03c9b23 100644 --- a/setup/compose.yaml +++ b/setup/compose.yaml @@ -50,7 +50,7 @@ services: - ehrbase image: ehrbase/ehrbase:next ports: - - 8090:8080 + - 8080:8080 networks: - ehrbase-net environment: diff --git a/src/main/java/org/bih/eos/services/EhrService.java b/src/main/java/org/bih/eos/services/EhrService.java index bf2a3c5..55da497 100644 --- a/src/main/java/org/bih/eos/services/EhrService.java +++ b/src/main/java/org/bih/eos/services/EhrService.java @@ -120,7 +120,7 @@ private NativeQuery> buildCompositionQueryEhr(long whereStatements.append(" e/ehr_id/value = '").append(ehrToPerson.getEhrId()).append("' OR"); } whereStatements = new StringBuilder(whereStatements.substring(0, whereStatements.length() - 2)); - return Query.buildNativeQuery("SELECT e/ehr_id/value, c from EHR e CONTAINS Composition c WHERE " + whereStatements + " LIMIT " + offsetLimit + " OFFSET " + offset + " ORDER BY e/ehr_id/value DESC", String.class, Composition.class); + return Query.buildNativeQuery("SELECT e/ehr_id/value, c from EHR e CONTAINS Composition c WHERE " + whereStatements + " ORDER BY e/ehr_id/value DESC" + " LIMIT " + offsetLimit + " OFFSET " + offset, String.class, Composition.class); } private List> executeAqlQuery(long offset, List ehrIds) { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 2aff87c..fc83e32 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -35,7 +35,7 @@ spring: datasource: password: postgres username: postgres - url: jdbc:postgresql://localhost:5433/postgres + url: jdbc:postgresql://localhost:5432/postgres logging: file: