소스 검색

Note print - not showing overrides - fix

Vijayakrishnan 3 년 전
부모
커밋
32abacbbe3
3개의 변경된 파일8개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 1
      config/app.php
  2. 2 2
      public/css/style.css
  3. 5 1
      resources/views/app/patient/note/segment-print.blade.php

+ 1 - 1
config/app.php

@@ -65,7 +65,7 @@ return [
 
     'hrm2_url' => env('HRM2_URL'),
 
-    'asset_version' => 89,
+    'asset_version' => 90,
 
     'temp_dir' => env('TEMP_DIR'),
 

+ 2 - 2
public/css/style.css

@@ -3569,7 +3569,7 @@ table.v-top th {
 .note_template_psych_followup_visit .edit-container [visit-moe]>form>div:last-child>.d-inline-flex {
     display: flex !important;
 }
-.note-container .segments-list p>br:first-child:last-child,
-.note-container .segments-list p:empty {
+.segments-list p>br:first-child:last-child,
+.segments-list p:empty {
     display: none;
 }

+ 5 - 1
resources/views/app/patient/note/segment-print.blade.php

@@ -41,7 +41,11 @@
     <?php if(!$isLSSegment): ?>
 
     <div class="inset-comment summary-container {{$iName === 'medrisk_vigilence' ? 'px-0' : 'p-2 pl-4'}}">
-        {!! $segment->summary_html !!}
+        @if($note->is_signed_by_hcp && $segment->accepted_suggestion_summary_html)
+            {!! $segment->accepted_suggestion_summary_html !!}
+        @else
+            {!! $segment->summary_html !!}
+        @endif
     </div>
 
     <?php endif ?>