Resolves JOIN issue by excluding the common 'notes' column

Bahmni · Dec 12, 2023 · 3d51521 · 3d51521
1 parent 87f6127
commit 3d51521
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git 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
@@ -1 +1 @@
-1.0.0
+1.0.0-ipd
diff --git 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,