소스 검색

Merge branch 'master' of rav.triplestart.com:jmudaka/stagfe2

root 3 년 전
부모
커밋
41da25d418
22개의 변경된 파일514개의 추가작업 그리고 138개의 파일을 삭제
  1. 1 1
      app/Http/Controllers/DnaController.php
  2. 4 1
      app/Http/Controllers/NoteController.php
  3. 7 1
      app/Http/Controllers/PracticeManagementController.php
  4. 1 0
      resources/views/app/admin/patients_filters.blade.php
  5. 4 6
      resources/views/app/generic-bills/inline.blade.php
  6. 4 2
      resources/views/app/patient/coverage_column_renderer.blade.php
  7. 50 2
      resources/views/app/patient/note/dashboard.blade.php
  8. 7 0
      resources/views/app/patient/note/note-section-list-print.blade.php
  9. 128 31
      resources/views/app/patient/note/note-segment-list-print.blade.php
  10. 0 45
      resources/views/app/patient/note/print.blade.php
  11. 24 0
      resources/views/app/patient/note/print/print-legacy.blade.php
  12. 24 0
      resources/views/app/patient/note/print/print.blade.php
  13. 33 0
      resources/views/app/patient/note/section-print.blade.php
  14. 3 31
      resources/views/app/patient/note/segment-print.blade.php
  15. 1 1
      resources/views/app/patient/notes.blade.php
  16. 1 1
      resources/views/app/patient/partials/coverage-information.blade.php
  17. 3 3
      resources/views/app/patient/prescriptions/pdf/DRUG.blade.php
  18. 7 7
      resources/views/app/patient/prescriptions/pdf/pdf-preview.blade.php
  19. 0 1
      resources/views/app/practice-management/rpm-matrix-by-pro-type-table.blade.php
  20. 11 4
      resources/views/layouts/patient-header.blade.php
  21. 200 0
      resources/views/layouts/print-note.blade.php
  22. 1 1
      resources/views/layouts/template.blade.php

+ 1 - 1
app/Http/Controllers/DnaController.php

@@ -132,7 +132,7 @@ class DnaController extends Controller
         $filters = $request->all();
         $financialTransactions = ProTransaction::select('pro_transaction.*')
                                 ->join('bill', 'bill.id', '=', 'pro_transaction.bill_id')
-                                ->where('bill.na_pro_id', $this->performer->pro->id);
+                                ->where('bill.generic_pro_id', $this->performer->pro->id);
         $financialTransactions = $financialTransactions->orderBy('created_at', 'DESC')->paginate(20);
         return view('app.dna.financial-transactions', compact('financialTransactions', 'filters'));
     }

+ 4 - 1
app/Http/Controllers/NoteController.php

@@ -115,7 +115,10 @@ class NoteController extends Controller
     }
 
     public function print(Request $request, Client $patient, Note $note) {
-        return view("app.patient.note.print", compact('patient', 'note'));
+        if($note->visitTemplate) {
+            return view("app.patient.note.print.print", compact('patient', 'note'));
+        }
+        return view("app.patient.note.print.print-legacy", compact('patient', 'note'));
     }
 
     public function resolve(Request $request, Client $patient, Note $note) {

+ 7 - 1
app/Http/Controllers/PracticeManagementController.php

@@ -1573,7 +1573,13 @@ WHERE care_month.uid = '{$careMonthUid}' AND client.uid = '{$clientUid}'
                 $genericBillJoinClause = 'left join bill on care_month.rmm_rm_generic_bill_id = bill.id';
                 break;
             case 'rme':
-                $proTypeCondition = "left join bill on care_month.rme_pro_id = {$performer->pro->id}";
+                $proTypeCondition = "care_month.rmm_pro_id = {$performer->pro->id}";
+                $genericBillIdColumns = "care_month.rmm_rm_generic_bill_id,
+                   bill.uid as rmm_rm_generic_bill_uid,
+                   bill.generic_pro_id as rmm_rm_generic_bill_generic_pro_id,
+                   bill.generic_pro_expected_payment_amount as rmm_rm_generic_bill_expected_payment_amount,
+                   bill.is_signed_by_generic_pro as rmm_rm_generic_bill_signed";
+                $genericBillJoinClause = 'left join bill on care_month.rmm_rm_generic_bill_id = bill.id';
                 break;
         }
 

+ 1 - 0
resources/views/app/admin/patients_filters.blade.php

@@ -19,6 +19,7 @@
 	}
 	.sm-section {
 		width: 125px !important;
+		margin-bottom: 10px;
 	}
 </style>
 <form id="admin-patients-filters" method="GET" action="{{ route('admin.patients') }}" class="filter-container" v-cloak>

+ 4 - 6
resources/views/app/generic-bills/inline.blade.php

@@ -17,16 +17,14 @@ $genericBills = genericBills($pro, @$patient, @$entityType, @$entityUid);
 @if(!count($genericBills))
     <div class="{{@$class ? $class : ''}} d-flex align-items-center">
         <p class="font-weight-bold mb-0">No {{@$label ? $label : 'Admin.'}} Bills</p>
-        @if($pro->is_arbitrary_generic_bill_enabled)
             <span class="mx-2 text-secondary">|</span>
             @include('app.generic-bills.create_generic-bill')
-        @endif
     </div>
 @else
     <div class="{{@$class ? $class : ''}}">
         <div class="d-flex align-items-center mb-2">
             <p class="font-weight-bold m-0">{{@$label ? $label : 'Admin.'}} Bills</p>
-            @if(!@$noCreate && $pro->is_arbitrary_generic_bill_enabled)
+            @if(!@$noCreate)
                 <span class="mx-2 text-secondary">|</span>
                 @include('app.generic-bills.create_generic-bill')
             @endif
@@ -130,16 +128,16 @@ $genericBills = genericBills($pro, @$patient, @$entityType, @$entityUid);
                                 @if($bill->is_signed_by_generic_pro)
                                     <div class="d-block text-secondary text-nowrap">
                                         <i class="fa fa-check"></i>
-                                        Pro Signed
+                                        Signed
                                     </div>
                                 @else
                                     <div moe
                                           class="d-block {{ $bill->generic_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
                                           title="{{ $bill->generic_pro_id !== $pro->id ? 'Only the bill\'s pro can sign' : '' }}">
-                                        <a class="text-nowrap" href="" show start>Sign As Pro</a>
+                                        <a class="text-nowrap" href="" show start>Sign</a>
                                         <form url="/api/bill/signAsGenericPro">
                                             <input type="hidden" name="uid" value="{{$bill->uid}}">
-                                            <p>Sign this bill as pro?</p>
+                                            <p>Sign this bill?</p>
                                             <div class="mb-0">
                                                 <button class="btn btn-success btn-sm" submit>Sign</button>
                                                 <button class="btn btn-default border btn-sm" cancel>Cancel</button>

+ 4 - 2
resources/views/app/patient/coverage_column_renderer.blade.php

@@ -36,6 +36,8 @@
         <small class="ml-2 text-muted">(No insurance)</small>
     @endif
 </div>
-@if(@$patient->mpb_remaining)
-    <small class="text-muted d-block ml-3">Deductible: {{format_number(@$patient->mpb_remaining)}} </small>
+@if($coverage->plan_type === 'MEDICARE')
+    @if(@$patient->mpb_remaining)
+        <small class="text-muted d-block ml-3">Deductible: {{format_number(@$patient->mpb_remaining)}} </small>
+    @endif
 @endif

+ 50 - 2
resources/views/app/patient/note/dashboard.blade.php

@@ -149,7 +149,7 @@ use App\Models\Handout;
             <div class="pr-2">
                 {{$note->title}}
                 @if(!$note->is_signed_by_hcp || $pro->pro_type === 'ADMIN')
-                    <div moe class="d-block" relative id="note-edit-title">
+                    <div moe class="d-inline" relative id="note-edit-title">
                         <a href="" show start></a>
                         <form url="/api/note/putTitle">
                             <input type="hidden" name="uid" value="{{$note->uid}}">
@@ -164,6 +164,47 @@ use App\Models\Handout;
                         </form>
                     </div>
                 @endif
+                @if($pro->pro_type === 'ADMIN')
+                    <div moe relative class="d-inline" id="note-clone">
+                        <a start show></a>
+                        <form url="/api/visit/clone" class="mcp-theme-1" left
+                              redir="/patients/view/{{$patient->uid}}/notes/view/[data]">
+                            <p class="text-secondary mb-2 font-weight-bold">Clone Note</p>
+                            <input type="hidden" name="visitToCloneUid" value="{{$note->uid}}">
+                            <div class="mb-2">
+                                <label for="" class="text-sm text-secondary mb-1">Effective Date</label>
+                                <input type="date" name="effectiveDate" class="form-control input-sm" value="{{get_current_date($pro->display_timezone)}}">
+                            </div>
+                            <div class="mb-2">
+                                <label for="" class="text-secondary text-sm mb-1">New/Follow-up</label>
+                                <div class="d-flex align-items-baseline py-1">
+                                    <label class="mr-3 my-0 d-inline-flex align-items-center c-pointer">
+                                        <input type="radio" name="newOrFuOrNa" value="NEW" required>
+                                        <span class="ml-1 text-dark">New</span>
+                                    </label>
+                                    <label class="my-0 d-inline-flex align-items-center c-pointer">
+                                        <input type="radio" name="newOrFuOrNa" value="FU" required checked>
+                                        <span class="ml-1 text-dark">Follow-Up</span>
+                                    </label>
+                                </div>
+                            </div>
+
+                            <div class="mb-2">
+                                <label for="" class="text-sm text-secondary mb-1">Method</label>
+                                <select name="noteContactMethod" id="" class="form-control input-sm">
+                                    <option value="">--select--</option>
+                                    <option value="VIDEO">Video</option>
+                                    <option value="AUDIO">Audio</option>
+                                    <option value="IN_CLINIC">In Clinic</option>
+                                    <option value="HOUSE_CALL">House Call</option>
+                                </select>
+                            </div>
+                            <div class="m-0">
+                                <button submit class="btn btn-primary btn-sm">submit</button>
+                            </div>
+                        </form>
+                    </div>
+                @endif
             </div>
             <div class="pl-2 pr-3">
                 <div class="d-flex">
@@ -357,10 +398,16 @@ use App\Models\Handout;
                            onclick="$(this).closest('.on-click-menu').find('[menu]').hide(); $('#note-edit-type>a:first').trigger('click'); return false;">
                             Edit Type
                         </a>
-                        <a native target="_blank" href="#" class="pl-2 pr-3 py-1 d-block text-nowrap text-sm"
+                        <a native target="_blank" href="#" class="pl-2 pr-3 pt-1 d-block text-nowrap text-sm"
                            onclick="$(this).closest('.on-click-menu').find('[menu]').hide(); $('#note-edit-method>a:first').trigger('click'); return false;">
                             Edit Method
                         </a>
+                        @if($note->visitTemplate && $note->visitTemplate->internal_name == 'omega_soap_visit')
+                            <a native target="_blank" href="#" class="pl-2 pr-3 py-1 d-block text-nowrap text-sm"
+                               onclick="$(this).closest('.on-click-menu').find('[menu]').hide(); $('#note-clone>a:first').trigger('click'); return false;">
+                                Clone
+                            </a>
+                        @endif
                     </div>
                 </div>
             @endif
@@ -515,6 +562,7 @@ use App\Models\Handout;
                         Suggestion Mode
                     </a>
                 @endif
+                <a href="{{route('practice-management.notes-resolution-center-v2')}}?uid={{$note->uid}}" class="ml-3">NRC</a>
             @endif
 
             <div class="ml-auto d-flex align-items-start">

+ 7 - 0
resources/views/app/patient/note/note-section-list-print.blade.php

@@ -0,0 +1,7 @@
+<div id="note-section-list">
+	<?php $canvasData = json_decode($patient->canvas_data, true); ?>
+	<?php $previousHeading = null; ?>
+	@foreach($note->sections as $section)
+		@include('app.patient.note.section-print')
+	@endforeach
+</div>

+ 128 - 31
resources/views/app/patient/note/note-segment-list-print.blade.php

@@ -1,39 +1,136 @@
-<div class="segments-list" id="note-segments-list">
+<div class="segments-list note-segments-print-list {{ $note->is_signed_by_hcp ? 'note-signed-by-hcp' : '' }}" id="note-segments-list">
     <?php
     $previousHeading = null;
     $previousSubHeading = null;
 	$segments = $note->segments->filter(function($_x) {
-		return !!$_x->is_active;
-	});
-    ?>
-    @foreach($segments as $segment)
-		@if($segment->segmentTemplate->internal_name !== 'medrisk_vigilence' && $segment->left_or_right !== 'RIGHT')
-		<?php
-        if ($segment->heading !== $previousHeading) {
-            if (!empty($previousHeading)) {
-                echo '</div></div>'; // <!-- end the previous parent section -->
+		$ok = !!$_x->is_active && $_x->segmentTemplate->internal_name !== 'medrisk_vigilence' && strpos($_x->segmentTemplate->internal_name, 'lifestyle_') !== 0;
+        if($ok) {
+            $content = $_x->summary_html;
+            if ($_x->accepted_suggestion_summary_html) {
+                $content = $_x->accepted_suggestion_summary_html;
             }
-            if (!empty($segment->heading)) {
-
-	?>
-	<div class="note-content-node note-content-heading">
-		<div class="py-2 px-3 border-bottom font-size-16 font-weight-bold bg-light text-secondary {{ $previousHeading ? 'mt-4 border-top' : '' }}">
-			{{ $segment->heading }}
-		</div>
-		<div class="note-content-children ml-5 border-left">
-			<!-- open new node -->
-        <?php
-	    }
-            $previousHeading = $segment->heading;
+            $trimmed = trim(strip_tags($content));
+            $ok = ($trimmed !== '' && $trimmed !== '-');
         }
-        ?>
-        @include('app.patient.note.segment-print')
-		@endif
-    @endforeach
-    <?php
-    if (!empty($previousHeading)) {
-        echo '</div></div>'; // <!-- close any open parent section -->
-    }
+        return $ok;
+	});
+	$printSegments = [];
+	foreach($segments as $segment) {
+		if($segment->left_or_right !== 'RIGHT') {
+			$printSegments[] = $segment;
+		}
+	}
+	foreach($segments as $segment) {
+		if($segment->left_or_right === 'RIGHT') {
+			$printSegments[] = $segment;
+		}
+	}
     ?>
+    @foreach($printSegments as $segment)
+		@include('app.patient.note.segment-print')
+    @endforeach
 </div>
-
+<script>
+    $(document).ready(function() {
+        $('.note-segments-print-list table.point-table').each(function() {
+            if(!$(this).find('tbody>tr').length) {
+                $(this).closest('.visit-segment').remove();
+            }
+            if($(this).closest('.note_template_soap_visit').length) {
+                if(['nutrition', 'exercise', 'behavior'].indexOf($(this).closest('.visit-segment').attr('data-segment-template-name')) === -1) {
+                    convertPointTableToSimpleParas($(this));
+                }
+                else {
+                    convertNEBTables($(this));
+                }
+            }
+        });
+        $('.note-segments-print-list table.table-cage').each(function() {
+            if($(this).closest('.note_template_omega_soap_visit').length) {
+                if(['omega_allergies', 'omega_medications', 'omega_goals', 'omega_care_team', 'omega_subjective_system'].indexOf($(this).closest('.visit-segment').attr('data-segment-template-name')) !== -1) {
+                    convertCageTableToSimpleParas($(this), 'Subjective');
+                }
+                else if(['omega_plan_system'].indexOf($(this).closest('.visit-segment').attr('data-segment-template-name')) !== -1) {
+                    convertCageTableToSimpleParas($(this), 'Plan');
+                }
+            }
+        });
+        if(isEmpty($('[data-segment-template-name="nutrition"] .summary-container'))) $('[data-segment-template-name="nutrition"]').remove();
+        if(isEmpty($('[data-segment-template-name="exercise"] .summary-container'))) $('[data-segment-template-name="exercise"]').remove();
+        if(isEmpty($('[data-segment-template-name="behavior"] .summary-container'))) $('[data-segment-template-name="behavior"]').remove();
+        function isEmpty(_el) {
+            return $.trim(_el.text().replaceAll('-', '')) === '';
+        }
+        function convertPointTableToSimpleParas(_table) {
+            let parent = _table.parent();
+            parent.find('[if-edit-mode]').remove();
+            $(_table).find('tbody>tr').each(function() {
+                if($(this).find('>td').length > 1) {
+                    let newD = $('<div class="mb-2"/>');
+                    $('<p class=""/>').html($(this).find('td:eq(1)').html()).appendTo(newD);
+                    $('<p class="pl-3 remove-if-empty-parent"/>').append('<b class="text-secondary">Subjective:</b>').append('<div class="d-inline-block pl-2 remove-if-empty">' + $(this).find('td:eq(2)').html() + '</div>').appendTo(newD);
+                    $('<p class="pl-3 remove-if-empty-parent"/>').append('<b class="text-secondary">Plan:</b>').append('<div class="d-inline-block pl-2 remove-if-empty">' + $(this).find('td:eq(3)').html() + '</div>').appendTo(newD);
+                    newD.appendTo(parent)
+                    newD.find('.text-sm.text-secondary, [if-edit-mode], i.fa').remove();
+                    newD.find('[if-read-mode]').show().addClass('d-inline-block');
+                    newD.find('.bg-warning-mellow.p-2.rounded').removeClass('bg-warning-mellow p-2 rounded');
+                    newD.find('.inline-html-container+.text-sm').remove();
+                    newD.find('.remove-if-empty').each(function() {
+                        if(isEmpty($(this))) {
+                            $(this).closest('.remove-if-empty-parent').remove();
+                        }
+                    });
+                }
+            });
+            $(_table).remove();
+        }
+        function convertCageTableToSimpleParas(_table, _label = 'Subjective') {
+            let parent = _table.parent();
+            parent.find('[if-edit-mode]').remove();
+            $(_table).find('tbody>tr').each(function() {
+                if($(this).find('>td').length > 1) {
+                    let newD = $('<div class="mb-2"/>');
+                    $('<p class=""/>').html($(this).find('td:eq(1)').html()).appendTo(newD);
+                    $('<p class="pl-3 remove-if-empty-parent"/>').append('<b class="text-secondary">' + _label + ':</b>').append('<div class="d-inline-block pl-2 remove-if-empty">' + $(this).find('td:eq(2)').html() + '</div>').appendTo(newD);
+                    newD.appendTo(parent)
+                    newD.find('.text-sm.text-secondary, [if-edit-mode], i.fa').remove();
+                    newD.find('[if-read-mode]').show().addClass('d-inline-block');
+                    newD.find('.bg-warning-mellow.p-2.rounded').removeClass('bg-warning-mellow p-2 rounded');
+                    newD.find('.grow-till-300px').removeClass('grow-till-300px');
+                    // newD.find('.text-sm.text-info').remove();
+                    newD.find('.inline-html-container+.text-sm').remove();
+                    newD.find('.remove-if-empty').each(function() {
+                        if(isEmpty($(this))) {
+                            $(this).closest('.remove-if-empty-parent').remove();
+                        }
+                    });
+                }
+            });
+            $(_table).remove();
+        }
+        function convertNEBTables(_table) {
+            let parent = _table.parent();
+            parent.find('[if-edit-mode]').remove();
+            $(_table).find('tbody>tr').each(function() {
+                if(!isEmpty($(this).find('td:eq(1)')) || !isEmpty($(this).find('td:eq(2)'))) {
+                    let newD = $('<div class="mb-2"/>');
+                    $('<p class=""/>').html($(this).find('td:eq(0)').html())
+                        .append($('<p class="remove-if-empty-parent"/>').append('<b class="text-secondary">Current:</b>').append('<div class="d-inline-block pl-2 remove-if-empty">' + $(this).find('td:eq(1)').html() + '</div>'))
+                        .append($('<p class="remove-if-empty-parent"/>').append('<b class="text-secondary">Plan:</b>').append('<div class="d-inline-block pl-2 remove-if-empty">' + $(this).find('td:eq(2)').html() + '</div>'))
+                        .appendTo(newD);
+                    newD.appendTo(parent)
+                    newD.find('.text-sm.text-secondary, [if-edit-mode], i.fa').remove();
+                    newD.find('[if-read-mode]').show().addClass('d-inline-block');
+                    newD.find('.bg-warning-mellow.p-2.rounded').removeClass('bg-warning-mellow p-2 rounded');
+                    newD.find('.inline-html-container+.text-sm').remove();
+                    newD.find('.remove-if-empty').each(function() {
+                        if(isEmpty($(this))) {
+                            $(this).closest('.remove-if-empty-parent').remove();
+                        }
+                    });
+                }
+            });
+            $(_table).remove();
+        }
+    });
+</script>

+ 0 - 45
resources/views/app/patient/note/print.blade.php

@@ -1,45 +0,0 @@
-<?php
-/** @var App\Models\Note $note */
-/** @var App\Models\Pro $pro */
-/** @var App\Models\Section $section */
-/** @var $allSections */
-?>
-@extends ('layouts.print')
-
-@section('content')
-
-    <div id="note-single-header" class="pb-3 d-flex align-items-start note_template_{{$note->visitTemplate ? $note->visitTemplate->internal_name : ''}}">
-
-        <div class="p-2">
-            <div class="mb-2 d-flex align-items-baseline">
-                <div class="mr-2 font-weight-bold text-secondary">Name:</div>
-                <div>{{$patient->displayName()}}</div>
-            </div>
-            <div class="mb-2 d-flex align-items-baseline">
-                <div class="mr-2 font-weight-bold text-secondary">DOB:</div>
-                <div>{{$patient->dob}}</div>
-            </div>
-            <div class="mb-2 d-flex align-items-baseline">
-                <div class="mr-2 font-weight-bold text-secondary">Visit Date:</div>
-                <div>{{friendly_date($note->effective_dateest)}}</div>
-            </div>
-            <div class="mb-2 d-flex align-items-baseline">
-                <div class="mr-2 font-weight-bold text-secondary">Signed By:</div>
-                <div class="mr-2">{{$note->hcpPro->displayName()}}</div>
-                <div class="mr-2">on</div>
-                <div class="mr-2">{{$note->signed_by_hcp_at}}</div>
-            </div>
-        </div>
-
-    </div>
-
-    <div class="card mb-0 {{ $note->is_cancelled ? 'cancelled-item' : '' }} border-0 rounded-0">
-
-        <div class="card-body p-0">
-            <div class="note_template_{{$note->visitTemplate ? $note->visitTemplate->internal_name : ''}}">
-                @include('app.patient.note.note-segment-list-print')
-            </div>
-        </div>
-    </div>
-
-@endsection

+ 24 - 0
resources/views/app/patient/note/print/print-legacy.blade.php

@@ -0,0 +1,24 @@
+<?php
+/** @var App\Models\Note $note */
+/** @var App\Models\Pro $pro */
+/** @var App\Models\Section $section */
+/** @var $allSections */
+?>
+@extends ('layouts.print-note')
+
+@section('content')
+
+    <div class="note-print print-width">
+
+        <div class="card mb-0 {{ $note->is_cancelled ? 'cancelled-item' : '' }} border-0 rounded-0">
+
+            <div class="card-body p-0">
+                <div class="note_template_legacy">
+                    @include('app.patient.note.note-section-list-print')
+                </div>
+            </div>
+        </div>
+
+    </div>
+
+@endsection

+ 24 - 0
resources/views/app/patient/note/print/print.blade.php

@@ -0,0 +1,24 @@
+<?php
+/** @var App\Models\Note $note */
+/** @var App\Models\Pro $pro */
+/** @var App\Models\Section $section */
+/** @var $allSections */
+?>
+@extends ('layouts.print-note')
+
+@section('content')
+
+    <div class="note-print print-width">
+
+        <div class="card mb-0 {{ $note->is_cancelled ? 'cancelled-item' : '' }} border-0 rounded-0">
+
+            <div class="card-body p-0">
+                <div class="note_template_{{$note->visitTemplate ? $note->visitTemplate->internal_name : ''}}">
+                    @include('app.patient.note.note-segment-list-print')
+                </div>
+            </div>
+        </div>
+
+    </div>
+
+@endsection

+ 33 - 0
resources/views/app/patient/note/section-print.blade.php

@@ -0,0 +1,33 @@
+<?php
+if (!$section->sectionTemplate->is_page_driven) {
+    $trimmed = trim(strip_tags($section->summary_html));
+}
+?>
+<?php
+if ($section->sectionTemplate->is_page_driven || ($trimmed !== '' && $trimmed !== '-')):
+?>
+<div class="p-3 note-section events-none">
+    <div class="d-flex align-items-start">
+        <span class="font-weight-bold mb-2 d-flex align-items-center">
+            {{$section->sectionTemplate->title}}
+        </span>
+        <?php $sectionInternalName = $section->sectionTemplate->internal_name; ?>
+    </div>
+
+    <div class="inset-comment summary-container">
+        <?php if ($section->sectionTemplate->is_page_driven): ?>
+            @include("app.patient.page-sections.{$sectionInternalName}.summary")
+        <?php else: ?>
+            <?php
+            if($trimmed !== '' && $trimmed !== '-'):
+                ?>
+                {!! $section->summary_html !!}
+                <?php
+            endif;
+            ?>
+        <?php endif; ?>
+    </div>
+
+</div>
+<?php endif; ?>
+

+ 3 - 31
resources/views/app/patient/note/segment-print.blade.php

@@ -1,41 +1,14 @@
 <?php $iName = $segment->segmentTemplate->internal_name; ?>
 <?php $isLSSegment = strpos($iName, 'lifestyle_') === 0; ?>
-
-<div class="border-bottom note-section visit-segment {{$note->is_signed_by_hcp ? '' : 'edit-trigger'}} {{strpos($iName, 'lifestyle_') === 0 && $iName !== 'lifestyle_general' ? 'zero-height' : ''}}"
+<div class="note-section visit-segment mb-3 {{strpos($iName, 'lifestyle_') === 0 && $iName !== 'lifestyle_general' ? 'zero-height' : ''}}"
      data-segment-uid="{{ $segment->uid }}"
      data-segment-template-uid="{{ $segment->segmentTemplate->uid }}"
      data-segment-template-name="{{ $segment->segmentTemplate->internal_name }}">
 
-    <div class="d-flex align-items-baseline bg-light text-secondary p-2" style="border-bottom: 1px solid #dee2e6;">
-
-    <!-- title -->
-
+    <div class="d-flex align-items-baseline">
         <span class="font-weight-bold d-flex align-items-center {{$isLSSegment || $iName === 'medrisk_vigilence' ? '' : 'xxxmb-2'}}" style="">
-            <span style="color: black; text-decoration: underline; font-size: 13px;">
-                {{$segment->display_title}}
-            </span>
+            {{$segment->display_title}}
         </span>
-
-        @if($isLSSegment)
-            @if($iName === 'lifestyle_general')
-                <a href="#" class="ls-segment-trigger ml-2" data-target="lifestyle_general">General</a>
-                <span class="mx-2 text-secondary text-sm">|</span>
-                <a href="#" class="ls-segment-trigger" data-target="lifestyle_nutrition">Nutrition</a>
-                <span class="mx-2 text-secondary text-sm">|</span>
-                <a href="#" class="ls-segment-trigger" data-target="lifestyle_physical_activity">Physical Act.</a>
-                <span class="mx-2 text-secondary text-sm">|</span>
-                <a href="#" class="ls-segment-trigger" data-target="lifestyle_sleep">Sleep</a>
-                <span class="mx-2 text-secondary text-sm">|</span>
-                <a href="#" class="ls-segment-trigger" data-target="lifestyle_social">Social Relns.</a>
-                <span class="mx-2 text-secondary text-sm">|</span>
-                <a href="#" class="ls-segment-trigger" data-target="lifestyle_substances">Subst. Use</a>
-                <span class="mx-2 text-secondary text-sm">|</span>
-                <a href="#" class="ls-segment-trigger" data-target="lifestyle_stress">Stress</a>
-            @else
-                <span class="text-info ml-auto font-weight-normal">(click to view)</span>
-            @endif
-        @endif
-
     </div>
 
     <?php if(!$isLSSegment): ?>
@@ -51,4 +24,3 @@
     <?php endif ?>
 
 </div>
-

+ 1 - 1
resources/views/app/patient/notes.blade.php

@@ -328,7 +328,7 @@
                 <td>
                     <div class="d-flex align-items-center">
                         <a href="/patients/view/{{ $patient->uid }}/notes/view/{{ $note->uid }}" class="font-weight-bold">Open</a>
-                        @if($note->visitTemplate && $note->visitTemplate->internal_name == 'omega_soap_visit' &&  $note->new_or_fu_or_na !== 'NEW')
+                        @if($note->visitTemplate && $note->visitTemplate->internal_name == 'omega_soap_visit')
                             <span class="px-2 text-secondary">|</span>
                             @if(!$note->visit_template_id)
                                 <a href="#" class="text-primary trigger-clone" data-uid="{{$note->uid}}">Clone</a>

+ 1 - 1
resources/views/app/patient/partials/coverage-information.blade.php

@@ -76,7 +76,7 @@
                     </a>
                 @endif
             @endif
-            <span class="mx-2">Created At: {{ friendly_date_time($cpc->created_at) }} by {{ $cpc->createdByPro->displayName() }}</span>
+            <span class="mx-2">Created At: {{ friendly_date_time($cpc->created_at) }} by {{ $cpc->createdByPro ? $cpc->createdByPro->displayName() : '---' }}</span>
         </div>
 
         <div class="mt-4 {{ $cpc->is_cancelled ? 'cpc-cancelled':'' }}">

+ 3 - 3
resources/views/app/patient/prescriptions/pdf/DRUG.blade.php

@@ -31,9 +31,9 @@ if($coverage) {
       <tr>
         <td style="vertical-align:top;padding: 5px;">
           <h4 style="line-height:20px;margin:0;text-transform:uppercase;">{{ $patient->displayName() }}</h4>
-          <span style="font-size:13px;line-height:20px;display:block">{{$addressParts ?: ''}}</span>
-          <span style="font-size:13px;line-height:20px;display:block">{{$addressPart2 ?: ''}} {{$patient->mailing_address_zip}}</span>
-          <span style="font-size:13px;line-height:20px;display:block">Phone: {{$patient->cell_number}}</span>
+          @if($addressParts)<span style="font-size:13px;line-height:20px;display:block">{{$addressParts ?: ''}}</span>@endif
+          @if($addressPart2)<span style="font-size:13px;line-height:20px;display:block">{{$addressPart2 ?: ''}} {{$patient->mailing_address_zip}}</span>@endif
+          @if($patient->cell_number)<span style="font-size:13px;line-height:20px;display:block">Phone: {{$patient->cell_number}}</span>@endif
         </td>
         <td style="vertical-align:top;padding: 5px;">
           <h4 style="line-height:20px;margin:0;">PATIENT INFORMATION</h4>

+ 7 - 7
resources/views/app/patient/prescriptions/pdf/pdf-preview.blade.php

@@ -31,13 +31,13 @@
     <title>{{$companyName}}</title>
 </head>
 <body>
-<div style="margin: 0; padding: 1rem; font-family: sans-serif">
+<div style="margin: 0; padding: .3rem; font-family: sans-serif">
     <header style="padding: 0; border: 0; margin: 0">
         <div style="text-align: center">
             <h3 style="margin-bottom:1px;line-height:5px;">{{ $prescription->hcpPro->displayName() }}</h3>
             <h4 style="margin-bottom:1px;line-height:5px;">{{$companyName}}</h4>
-            <h5 style="margin-bottom:1px;line-height:3px;">{{$addressLine1}}, {{$addressLine2}}</h5>
-            <h5 style="margin-bottom: 2rem;line-height:3px;">{{$city}}, {{$state}} {{$zip}}</h5>
+            <h4 style="margin-bottom:1px;line-height:3px;font-weight:400;">{{$addressLine1}}, {{$addressLine2}}</h4>
+            <h4 style="margin-bottom:1rem;line-height:3px;font-weight:400;">{{$city}}, {{$state}} {{$zip}}</h4>
         </div>
         <div style="text-align:center;">
           <span style="width:33.33%; display:inline-block;">Phone: (800) 707-9705</span>
@@ -46,13 +46,13 @@
         </div>
     </header>
 
-    <hr style="border-top: 2px solid #5ca4e8; border-bottom: 0; margin-top:0; margin-bottom: .5rem;">
+    <hr style="border-top: 2px solid #5ca4e8; border-bottom: 0; margin-top:-5px; margin-bottom:.5rem;">
 
     @include('app.patient.prescriptions.pdf.' . $prescription->erx_category)
 
     <?php if($prescription->logistics_detail_json): ?>
         <?php $logistics = json_decode($prescription->logistics_detail_json); ?>
-        <hr style="margin: 0.5rem 0; border-top-width: 0; border-bottom-width: 1px; border-color: #bbb">
+        <hr style="margin: 0 0 0.5rem 0; border-top-width: 0; border-bottom-width: 1px; border-color: #bbb">
         <div style="font-size: 14px; opacity: 0.75; ">
             <p style="margin: 0.5rem 0;"><b>{{ $logistics->facilityName }}</b></p>
             <p style="margin: 0.5rem 0;">{{$logistics->facilityCity}} {{$logistics->facilityState}} {{$logistics->facilityZip}}</p>
@@ -64,9 +64,9 @@
     <table cellpadding="0" cellspacing="0" border="0" style="width: 100%;padding-left:20%;margin-top:1rem;">
         <tr>
           <td style="vertical-align: bottom;padding-right:.2rem;">Signature:</td>
-          <td style="vertical-align: middle;border-bottom:1px solid #aaa;width:100%;padding-bottom:.2rem;padding-left:.5rem;">
+          <td style="vertical-align: middle;border-bottom:1px solid #aaa;width:100%;padding-bottom:.2rem;padding-left:5rem;">
               @if($prescription->hcpPro->signature_base_64)
-                  <img src="{{$prescription->hcpPro->signature_base_64}}" style="max-width: 180px;">
+                  <img src="{{$prescription->hcpPro->signature_base_64}}" style="max-width: 100px;">
               @endif
           </td>
         </tr>

+ 0 - 1
resources/views/app/practice-management/rpm-matrix-by-pro-type-table.blade.php

@@ -31,7 +31,6 @@
                                 <th class="border-0">Interacted?</th>
                                 <th class="border-0">#Meas. Days</th>
                                 <th class="border-0">#Unstamped</th>
-                                <th class="border-0 {{$strategy === 'X16_DAYS_20_MINS_ON_OWN_MCP_COM_DURING_CM' ? '' : 'd-nonex'}}">#RPM Mins.</th>
                                 <th class="border-0">Billable</th>-->
 
                 <th class="border-0 pl-2">@include('app.practice-management._sort_header', ['route' => route("practice-management.rpm-matrix-" . $mode), 'label' => 'Name', 'key' => 'client_name'])</th>

+ 11 - 4
resources/views/layouts/patient-header.blade.php

@@ -337,7 +337,7 @@ $addressParts .= implode(", ", $addressPart2);
           <div>DOB: {{friendly_date($patient->dob, false,null, true)}} </div>
           @if($_cpc && $patient->getPrimaryCoverageStatus() === 'YES')
             <div class="text-nowrap screen-only ml-2 pl-2 border-left">
-              {{$_cpc->insuranceDisplayPayerName()}}
+              <a href="{{ route('patients.view.primary-coverage', $patient) }}">{{$_cpc->insuranceDisplayPayerName()}}</a>
               <span class="on-hover-show d-inline-block on-hover-opaque">
                 <i class="fa fa-check-circle text-success"></i>
                 <div class="on-hover-content py-2 pl-3 text-nowrap">
@@ -345,12 +345,19 @@ $addressParts .= implode(", ", $addressPart2);
                 </div>
               </span> 
                 @if($_cpc->is_manually_determined)
-                  <i class="ml-1 fas fa-code-branch text-info" title="Manually determined at {{ friendly_date($_cpc->created_at) }}"></i>
+                <a href="{{ route('patients.view.primary-coverage', $patient) }}" class="on-hover-show">
+                  <i class="ml-1 fas fa-code-branch text-info"></i>
+                  <div class="on-hover-content py-2 pl-3 text-nowrap">
+                    Manually determined at {{ friendly_date($_cpc->created_at) }}
+                </div>
+                </a>
                 @endif
             </div>
             @if($performer->pro->pro_type == 'ADMIN')
-              @if(@$patient->mpb_remaining)
-                <div class="ml-2">Deductible: {{format_number(@$patient->mpb_remaining)}} </div>
+              @if($_cpc->plan_type === 'MEDICARE')
+                @if(@$patient->mpb_remaining)
+                  <div class="ml-2">Deductible: {{format_number(@$patient->mpb_remaining)}} </div>
+                @endif
               @endif
             @endif 
           @endif

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 200 - 0
resources/views/layouts/print-note.blade.php


+ 1 - 1
resources/views/layouts/template.blade.php

@@ -145,7 +145,6 @@
                             <a class="dropdown-item" href="{{ route('practice-management.myTextShortcuts') }}">My Text Shortcuts</a>
                             <a class="dropdown-item" href="{{ route('practice-management.myFavorites') }}">My Favorites</a>
                             <a class="dropdown-item" href="{{ route('practice-management.my-flyers') }}">My Flyers</a>
-                            <a class="dropdown-item" href="{{ route('practice-management.notes-pending-physician-supervisor-stamping') }}">Notes Pending Physician Supervisor Stamping</a>
                         @else 
                             <a class="dropdown-item" href="{{ route('ps.client-review-requests') }}">My Patient Chart Review Requests</a>
                             <a class="dropdown-item" href="{{ route('practice-management.myTickets') }}">My Bills</a>
@@ -184,6 +183,7 @@
                             <a class="dropdown-item" href="{{ route('dna.myClinicalTeams') }}">My Clinical Teams</a>
                         @endif
                         @if($pro->pro_type === 'ADMIN' || $pro->is_considered_for_supervising_physician)
+                        <a class="dropdown-item" href="{{ route('practice-management.notes-pending-physician-supervisor-stamping') }}">Notes Pending Physician Supervisor Stamping</a>
                         <a class="dropdown-item" href="{{ route('practice-management.client-review-requests') }}">Client Review Requests</a>
                         @endif
                     </div>

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.