Merge branch 'master' into dev-vj

resources/views/app/patient/canvas-sections/dx/summary.php

@@ -7,6 +7,9 @@ if($patient->canvas_data) {
     $canvasData = json_decode($patient->canvas_data, true);
     if(isset($canvasData["dx"])) {
         $contentData = $canvasData["dx"];
+        if(!isset($contentData['items'])){
+            $contentData['items'] = [];
+        }
     }
 }
 

resources/views/app/patient/canvas-sections/fhx/summary.php

@@ -9,6 +9,9 @@ if($patient->canvas_data) {
     $canvasData = json_decode($patient->canvas_data, true);
     if(isset($canvasData["fhx"])) {
         $contentData = $canvasData["fhx"];
+        if(!isset($contentData['items'])){
+            $contentData['items'] = [];
+        }
     }
 }
 

resources/views/app/patient/canvas-sections/rx/summary.php

@@ -7,6 +7,9 @@ if($patient->canvas_data) {
     $canvasData = json_decode($patient->canvas_data, true);
     if(isset($canvasData["rx"])) {
         $contentData = $canvasData["rx"];
+        if(!isset($contentData['items'])){
+            $contentData['items'] = [];
+        }
     }
 }