From 3d51521634d949487e364b46b81ec59b84bb3d51 Mon Sep 17 00:00:00 2001 From: Umair Fayaz <59157924+umair-fayaz@users.noreply.github.com> Date: Tue, 12 Dec 2023 09:15:58 +0000 Subject: [PATCH] Resolves JOIN issue by excluding the common 'notes' column --- .github/workflows/build_publish.yaml | 2 +- package/.appversion | 2 +- .../resources/viewSql/patientOperationTheaterView.sql | 9 ++++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_publish.yaml b/.github/workflows/build_publish.yaml index 7716e7dc..f81d7951 100644 --- a/.github/workflows/build_publish.yaml +++ b/.github/workflows/build_publish.yaml @@ -2,7 +2,7 @@ name: Build and Publish bahmni-mart Image and Helm Chart on: push: branches: - - master + - 1.0.0-ipd tags: - '[0-9]+.[0-9]+.[0-9]+' diff --git a/package/.appversion b/package/.appversion index afaf360d..a9e04d3e 100644 --- a/package/.appversion +++ b/package/.appversion @@ -1 +1 @@ -1.0.0 \ No newline at end of file +1.0.0-ipd \ No newline at end of file diff --git a/src/main/resources/viewSql/patientOperationTheaterView.sql b/src/main/resources/viewSql/patientOperationTheaterView.sql index 97842413..c3a00744 100644 --- a/src/main/resources/viewSql/patientOperationTheaterView.sql +++ b/src/main/resources/viewSql/patientOperationTheaterView.sql @@ -15,7 +15,14 @@ SELECT sb.changed_by AS block_changed_by, sb.block_starttime AS block_start_time, sb.block_endtime AS block_end_time, - saa.*, + saa.surgical_appointment_id AS surgical_appointment_id, + saa.procedure AS procedure, + saa."estTimeHours" AS est_time_hours, + saa."estTimeMinutes" AS est_time_minutes, + saa."cleaningTime" AS cleaning_time, + saa."otherSurgeon" AS other_surgeon, + saa."anesthesic" AS anesthesic, + saa."patientWeight" AS patient_weight, sa.sort_weight AS surgery_sort_weight, sa.status AS surgery_status, sa.actual_start_datetime AS surgery_actual_start_time,