Переглянути джерело

Dx logic fix - reload patient after saving canvasData

Vijayakrishnan 4 роки тому
батько
коміт
dc1893e7db

+ 6 - 0
app/Http/Controllers/NoteController.php

@@ -117,6 +117,12 @@ class NoteController extends Controller
             $response = $this->calljava($request, '/client/updateCanvasData', $data, $guestAccessCode);
             //TODO: handle $response->success == false
 
+            if($note){
+                $client = Client::where('id', $note->client_id)->first();
+            }else{
+                $client = Client::where('id', $section->client_id)->first();
+            }
+
             $patient = $client;
             if (file_exists(resource_path("views/app/patient/canvas-sections/{$sectionInternalName}/processor.php"))) {
                 include(resource_path("views/app/patient/canvas-sections/{$sectionInternalName}/processor.php"));

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

@@ -1,28 +1,18 @@
 <?php
 
-if(isset($contentData) && !!$contentData) {
-    $dxContentData = $contentData;
-}
-else {
-    $dxContentData = false;
-}
-
-if(!$dxContentData && $patient->canvas_data) {
+$contentData = [
+    "items" => []
+];
+if($patient->canvas_data) {
     $canvasData = json_decode($patient->canvas_data, true);
     if(isset($canvasData["dx"])) {
-        $dxContentData = $canvasData["dx"];
+        $contentData = $canvasData["dx"];
     }
 }
 
-if(!$dxContentData) {
-    $dxContentData = [
-        "items" => []
-    ];
-}
-
-if(count($dxContentData['items'])) {
-    for ($i = 0; $i < count($dxContentData['items']); $i++) {
-        $item = $dxContentData['items'][$i];
+if(count($contentData['items'])) {
+    for ($i = 0; $i < count($contentData['items']); $i++) {
+        $item = $contentData['items'][$i];
 ?>
         <div class="mb-2 <?= @$item["included"] ? '' : 'hide-if-note' ?>">
             <div class="">