浏览代码

added support for suggestion mode

= 3 年之前
父节点
当前提交
9bcdee7d5a

+ 3 - 28
app/Http/Controllers/NoteController.php

@@ -107,33 +107,8 @@ class NoteController extends Controller
             $pro = $performer->pro;
 
             $segment = Segment::where('uid', $segmentUid)->first();
-            $segmentTemplate = $segment->segmentTemplate;
 
-            $note = $segment->note;
-            $patient = $note->client;
-
-            $data = compact('performer', 'pro', 'segment', 'segmentTemplate', 'note', 'patient');
-
-
-            $summaryHtml = view('app.patient.segment-templates.' . $segmentTemplate->internal_name . '/summary', $data)->render();
-
-            $wizardPowered = [
-                'intake_medications',
-                'plan_medications',
-                'intake_problems',
-                'plan_problems',
-                'intake_goals',
-                'plan_goals',
-                'intake_allergies',
-                'plan_allergies',
-                'intake_care_team',
-                'plan_care_team',
-                'intake_supplements',
-                'plan_supplements'
-            ];
-            if(!in_array($segmentTemplate->internal_name, $wizardPowered)) {
-                $editHtml = view('app.patient.segment-templates.' . $segmentTemplate->internal_name . '/edit', $data)->render();
-            }
+            $recalculatedHtml = $segment->getRecalculatedHtml($performer);
 
         } catch (\Throwable $e) {
             return response()->json([
@@ -144,8 +119,8 @@ class NoteController extends Controller
 
         return response()->json([
             'success'=>true,
-            'summaryHtml' => $summaryHtml,
-            'editHtml' => $editHtml
+            'summaryHtml' => $recalculatedHtml['summaryHtml'],
+            'editHtml' => $recalculatedHtml['editHtml'],
         ]);
     }
 

+ 37 - 0
app/Models/Segment.php

@@ -34,4 +34,41 @@ class Segment extends Model
         return $this->hasMany(SegmentSummaryUpdate::class, 'segment_id', 'id');
     }
 
+    public function getRecalculatedHtml($performer){
+        $pro = $performer->pro;
+        $segment = $this; 
+        $segmentTemplate = $this->segmentTemplate;
+
+        $note = $this->note;
+        $patient = $note->client;
+
+        $data = compact('performer', 'pro', 'segment', 'segmentTemplate', 'note', 'patient');
+
+
+        $summaryHtml = view('app.patient.segment-templates.' . $segmentTemplate->internal_name . '/summary', $data)->render();
+
+        $wizardPowered = [
+            'intake_medications',
+            'plan_medications',
+            'intake_problems',
+            'plan_problems',
+            'intake_goals',
+            'plan_goals',
+            'intake_allergies',
+            'plan_allergies',
+            'intake_care_team',
+            'plan_care_team',
+            'intake_supplements',
+            'plan_supplements'
+        ];
+        if(!in_array($segmentTemplate->internal_name, $wizardPowered)) {
+            $editHtml = view('app.patient.segment-templates.' . $segmentTemplate->internal_name . '/edit', $data)->render();
+        }
+
+        return [
+            'summaryHtml'=> $summaryHtml ,
+            'editHtml' => $editHtml
+        ];
+    }
+
 }

+ 7 - 1
resources/views/app/patient/note/note-segment-list.blade.php

@@ -39,7 +39,13 @@
                                     <a class="text-nowrap" href="" show start>Create Suggestion</a>
                                     <form url="/api/segment/putSegmentSummarySuggestion">
                                         <input type="hidden" name="uid" value="{{$segment->uid}}">
-                                        <textarea name="suggestedSummaryHtml">{!! $segment->summary_html !!}</textarea>
+                                        <textarea name="suggestedSummaryHtml">
+                                            @if(request()->get('suggestion_mode') == 'on')
+                                             {!! $segment->getRecalculatedHtml($performer)['summaryHtml'] !!}
+                                            @else
+                                             {!! $segment->summary_html !!}
+                                            @endif
+                                        </textarea>
                                         <div class="mb-0">
                                             <button class="btn btn-primary btn-sm" submit>Submit</button>
                                             <button class="btn btn-default border btn-sm" cancel>Cancel</button>