next_fu ==> cc_hpi data travel fix

resources/views/app/patient/canvas-sections/cc_hpi/default.php

@@ -17,16 +17,17 @@ if(!@$sectionPro) {
 $canvasData = [];
 if ($patient->canvas_data) {
     $canvasData = json_decode($patient->canvas_data, true);
-    if (isset($canvasData["cc_hpi"])) {
-        $canvasData = $canvasData["cc_hpi"];
-    }
+
+    if(!isset($canvasData["cc_hpi"])) $canvasData["cc_hpi"] = [];
 
     // if next_fu->next_cc available, prefill with that
-    if (isset($canvasData["next_fu"]) && isset($canvasData["next_fu"][$sectionPro])) {
-        $nextFU = $canvasData["next_fu"][$sectionPro];
-        if(isset($nextFU['list']) && count($nextFU['list'])) {
-            if(!isset($canvasData[$sectionPro])) {
-                $canvasData[$sectionPro] = [];
+    if (isset($canvasData["next_fu"]) && isset($canvasData["next_fu"][$sectionPro->uid])) {
+
+        $nextFU = $canvasData["next_fu"][$sectionPro->uid];
+        if(isset($nextFU['next_cc']) && isset($nextFU['next_cc']['list']) && count($nextFU['next_cc']['list'])) {
+
+            if(!isset($canvasData["cc_hpi"][$sectionPro->uid])) {
+                $canvasData["cc_hpi"][$sectionPro->uid] = [];
             }
             $prefillData = array_map(function($_x) {
                 if(!isset($_x['icd'])) $_x['icd'] = '';
@@ -35,12 +36,13 @@ if ($patient->canvas_data) {
                     'free_text' => ''
                 ];
                 return $_x;
-            }, $nextFU['list']);
-            $canvasData[$sectionPro]['current_cch'] = [
+            }, $nextFU['next_cc']['list']);
+            $canvasData["cc_hpi"][$sectionPro->uid]['current_cch'] = [
                 'list' => $prefillData
             ];
         }
     }
+    $canvasData = $canvasData['cc_hpi'];
 
 }
 $contentData = $canvasData;

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

@@ -13,11 +13,14 @@ if(!@$sectionPro) {
     }
 }
 
-$contentData = false;
-if ($patient->canvas_data) {
-    $canvasData = json_decode($patient->canvas_data, true);
-    if(isset($canvasData["cc_hpi"])) {
-        $contentData = $canvasData["cc_hpi"];
+// HUMONGOUS FIX! This CRITICAL "if" was never there till now!
+if(!$contentData) {
+    $contentData = false;
+    if ($patient->canvas_data) {
+        $canvasData = json_decode($patient->canvas_data, true);
+        if(isset($canvasData["cc_hpi"])) {
+            $contentData = $canvasData["cc_hpi"];
+        }
     }
 }