Merge branch 'master' into dev-vj

public/css/style.css

@@ -3438,3 +3438,26 @@ table.v-top td,
 table.v-top th {
     vertical-align:top;
 }
+
+.icd-input {
+    width: 95px;
+    height: calc(1.5em + 0.5rem + 2px);
+    padding: 0.25rem 0.5rem;
+    font-size: 12px;
+    line-height: 1.5;
+    border-radius: 0.2rem;
+    font-weight: 400;
+    color: #495057;
+    background-color: #fff;
+    background-clip: padding-box;
+    border: 1px solid #ced4da;
+    border-radius: 0.25rem;
+    transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out;
+}
+.icd-input:focus {
+    color: #495057;
+    background-color: #fff;
+    border-color: #80bdff;
+    outline: 0;
+    box-shadow: 0 0 0 0.2rem rgb(0 123 255 / 25%);
+}

resources/views/app/patient/care-month/put-rm-reasons.blade.php

@@ -13,7 +13,7 @@
 				<tbody>
 					<tr>
 						<td>
-							<input type="text" class="form-control form-control-sm" icd-autocomplete-code data-target="input[name=rmReasonIcd1Description]" name="rmReasonIcd1" value="{{ $careMonth->rm_reason_icd1 }}" placeholder="ICD 1" />
+							<input type="text" class="icd-input" icd-autocomplete-code data-target="input[name=rmReasonIcd1Description]" name="rmReasonIcd1" value="{{ $careMonth->rm_reason_icd1 }}" placeholder="ICD 1" />
 						</td>
 						<td>
 							<input id="" type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd1Description" value="{{ $careMonth->rm_reason_icd1description }}">
@@ -21,7 +21,7 @@
 					</tr>
 					<tr>
 						<td>
-							<input type="text" class="form-control form-control-sm" icd-autocomplete-code name="rmReasonIcd2" data-target="input[name=rmReasonIcd2Description]" value="{{ $careMonth->rm_reason_icd2 }}" placeholder="ICD 2" />
+							<input type="text" class="icd-input" icd-autocomplete-code name="rmReasonIcd2" data-target="input[name=rmReasonIcd2Description]" value="{{ $careMonth->rm_reason_icd2 }}" placeholder="ICD 2" />
 						</td>
 						<td>
 							<input type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd2Description" value="{{ $careMonth->rm_reason_icd2description }}">
@@ -29,15 +29,15 @@
 					</tr>
 					<tr>
 						<td>
-							<input type="text" class="form-control form-control-sm" icd-autocomplete-code name="rmReasonIcd3" data-target="input[name=rmReasonIcd3Description]" value="{{ $careMonth->rm_reason_icd3 }}" placeholder="ICD 3" />
+							<input type="text" class="icd-input" icd-autocomplete-code name="rmReasonIcd3" data-target="input[name=rmReasonIcd3Description]" value="{{ $careMonth->rm_reason_icd3 }}" placeholder="ICD 3" />
 						</td>
 						<td>
-							<input type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd3Description" value="{{ $careMonth->rm_reason_icd3description }}">
+							<input type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd3Description" value="{{ $careMonth->rm_reason_icd3description }}" >
 						</td>
 					</tr>
 					<tr>
 						<td>
-							<input type="text" class="form-control form-control-sm" icd-autocomplete-code name="rmReasonIcd4" data-target="input[name=rmReasonIcd4Description]" value="{{ $careMonth->rm_reason_icd4 }}" />
+							<input type="text" class="icd-input" icd-autocomplete-code name="rmReasonIcd4" data-target="input[name=rmReasonIcd4Description]" value="{{ $careMonth->rm_reason_icd4 }}" placeholder="ICD 4"/>
 						</td>
 						<td>
 							<input type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd4Description" value="{{ $careMonth->rm_reason_icd4description }}">

resources/views/app/patient/care-month/rm-reasons.blade.php

@@ -6,7 +6,7 @@
     <table class="table table-sm table-striped table-bordered">
         <tbody>
             <tr>
-                <td class="text-nowrap">RM Reason Icd 1</td>
+                <td class="text-nowrap">ICD 1</td>
                 <td>
                     <div class="d-flex">
                         <span class="font-weight-bold text-sm mr-2" style="min-width:60px;">{{ $careMonth->rm_reason_icd1 ? $careMonth->rm_reason_icd1 . ':' : '' }}</span>
@@ -15,7 +15,7 @@
                 </td>
             </tr>
             <tr>
-                <td class="text-nowrap">RM Reason Icd 2</td>
+                <td class="text-nowrap">ICD 2</td>
                 <td>
                     <div class="d-flex">
                         <span class="font-weight-bold text-sm mr-2" style="min-width:60px;">{{ $careMonth->rm_reason_icd2 ? $careMonth->rm_reason_icd2 . ':' :'' }}</span>
@@ -24,7 +24,7 @@
                 </td>
             </tr>
             <tr>
-                <td class="text-nowrap">RM Reason Icd 3</td>
+                <td class="text-nowrap">ICD 3</td>
                 <td>
                     <div class="d-flex">
                         <span class="font-weight-bold text-sm mr-2" style="min-width:60px;">{{ $careMonth->rm_reason_icd3 ? $careMonth->rm_reason_icd3 . ':' : '' }}</span>
@@ -33,7 +33,7 @@
                 </td>
             </tr>
             <tr>
-                <td class="text-nowrap">RM Reason Icd 4</td>
+                <td class="text-nowrap">ICD 4</td>
                 <td>
                     <div class="d-flex">
                         <span class="font-weight-bold text-sm mr-2" style="min-width:60px;">{{ $careMonth->rm_reason_icd4 ? $careMonth->rm_reason_icd4 . ':' : '' }}</span>
@@ -42,7 +42,7 @@
                 </td>
             </tr>
             <tr>
-                <td class="text-nowrap">RM Reason Memo</td>
+                <td class="text-nowrap">Memo</td>
                 <td class="text-muted text-sm">{{ $careMonth->rm_reason_memo }}</td>
             </tr>
         </tbody>

resources/views/app/patient/partials/client_bp_weight_phone_number_status.blade.php

@@ -1,7 +1,7 @@
 <div class="mb-1">
     <div class="border-bottom mb-2">
         <div>
-            Please ask the client to save the following numbers for receiving measurement sms messages.
+            Please ask the client to save the following numbers for receiving measurement SMS messages.
         </div>
         <div>
             Cardio1st BP sms number: {{config('app.bpSmsNumber')}}   

resources/views/app/patient/partials/put-rm-reasons.blade.php

@@ -13,7 +13,7 @@
 				<tbody>
 					<tr>
 						<td>
-							<input type="text" class="form-control form-control-sm" icd-autocomplete-code data-target="input[name=rmReasonIcd1Description]" name="rmReasonIcd1" value="{{ $patient->rm_reason_icd1 }}" placeholder="ICD 1" />
+							<input type="text" class="icd-input" icd-autocomplete-code data-target="input[name=rmReasonIcd1Description]" name="rmReasonIcd1" value="{{ $patient->rm_reason_icd1 }}" placeholder="ICD 1" />
 						</td>
 						<td>
 							<input id="" type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd1Description" value="{{ $patient->rm_reason_icd1description }}">
@@ -21,7 +21,7 @@
 					</tr>
 					<tr>
 						<td>
-							<input type="text" class="form-control form-control-sm" icd-autocomplete-code name="rmReasonIcd2" data-target="input[name=rmReasonIcd2Description]" value="{{ $patient->rm_reason_icd2 }}" placeholder="ICD 2" />
+							<input type="text" class="icd-input" icd-autocomplete-code name="rmReasonIcd2" data-target="input[name=rmReasonIcd2Description]" value="{{ $patient->rm_reason_icd2 }}" placeholder="ICD 2" />
 						</td>
 						<td>
 							<input type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd2Description" value="{{ $patient->rm_reason_icd2description }}">
@@ -29,7 +29,7 @@
 					</tr>
 					<tr>
 						<td>
-							<input type="text" class="form-control form-control-sm" icd-autocomplete-code name="rmReasonIcd3" data-target="input[name=rmReasonIcd3Description]" value="{{ $patient->rm_reason_icd3 }}" placeholder="ICD 3" />
+							<input type="text" class="icd-input" icd-autocomplete-code name="rmReasonIcd3" data-target="input[name=rmReasonIcd3Description]" value="{{ $patient->rm_reason_icd3 }}" placeholder="ICD 3" />
 						</td>
 						<td>
 							<input type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd3Description" value="{{ $patient->rm_reason_icd3description }}">
@@ -37,7 +37,7 @@
 					</tr>
 					<tr>
 						<td>
-							<input type="text" class="form-control form-control-sm" icd-autocomplete-code name="rmReasonIcd4" data-target="input[name=rmReasonIcd4Description]" value="{{ $patient->rm_reason_icd4 }}" placeholder="ICD 4" />
+							<input type="text" class="icd-input" icd-autocomplete-code name="rmReasonIcd4" data-target="input[name=rmReasonIcd4Description]" value="{{ $patient->rm_reason_icd4 }}" placeholder="ICD 4" />
 						</td>
 						<td>
 							<input type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd4Description" value="{{ $patient->rm_reason_icd4description }}">

resources/views/app/patient/partials/rm-reasons-display.blade.php

@@ -1,7 +1,7 @@
 <table class="table table-sm table-striped table-bordered mb-0">
 	<tbody>
 		<tr>
-			<td class="text-nowrap">RM Reason Icd 1</td>
+			<td class="text-nowrap">ICD 1</td>
 			<td>
 				<div class="d-flex">
 					<span class="font-weight-bold text-sm mr-2" style="min-width: 60px;">{{ $patient->rm_reason_icd1 ? $patient->rm_reason_icd1. ':':'' }}</span>
@@ -10,7 +10,7 @@
 			</td>
 		</tr>
 		<tr>
-			<td class="text-nowrap">RM Reason Icd 2</td>
+			<td class="text-nowrap">ICD 2</td>
 			<td>
 				<div class="d-flex">
 					<span class="font-weight-bold text-sm mr-2" style="min-width: 60px;">{{ $patient->rm_reason_icd2 ? $patient->rm_reason_icd2 . ':':'' }}</span>
@@ -19,7 +19,7 @@
 			</td>
 		</tr>
 		<tr>
-			<td class="text-nowrap">RM Reason Icd 3</td>
+			<td class="text-nowrap">ICD 3</td>
 			<td>
 				<div class="d-flex">
 					<span class="font-weight-bold text-sm mr-2" style="min-width: 60px;">{{ $patient->rm_reason_icd3 ? $patient->rm_reason_icd3 . ':':'' }}</span>
@@ -28,7 +28,7 @@
 			</td>
 		</tr>
 		<tr>
-			<td class="text-nowrap">RM Reason Icd 4</td>
+			<td class="text-nowrap">ICD 4</td>
 			<td>
 				<div class="d-flex">
 					<span class="font-weight-bold text-sm mr-2" style="min-width: 60px;">{{ $patient->rm_reason_icd4 ? $patient->rm_reason_icd4. ':' : '' }}</span>
@@ -37,7 +37,7 @@
 			</td>
 		</tr>
 		<tr>
-			<td class="text-nowrap">RM Reason Memo</td>
+			<td class="text-nowrap">Memo</td>
 			<td class="text-muted text-sm">{{ $patient->rm_reason_memo }}</td>
 		</tr>
 	</tbody>

resources/views/app/patient/segment-templates/biopsychosocial_assessment/summary.blade.php

@@ -211,12 +211,18 @@ $labels = [
 ];
 ?>
 <div class="events-none form-read-mode">
-	<table class="table table-sm table-bordered table-striped">
-	@foreach($contents as $field => $content)
-		<tr>
-			<td>{{$labels[$field]}}:</td>
-			<td>{{$content['value']}}</td>
-		</tr>
-	@endforeach  
-	</table>	
+	<div class="row">
+		<div class="col-12">
+			<div class="table-responsive">
+				<table class="table table-sm table-bordered table-striped">
+					@foreach($contents as $field => $content)
+						<tr>
+							<td>{{$labels[$field]}}:</td>
+							<td>{{$content['value']}}</td>
+						</tr>
+					@endforeach  
+				</table>
+			</div>
+		</div>
+	</div>	
 </div>

resources/views/app/patient/segment-templates/omega_history_past_medical/summary.blade.php

@@ -77,12 +77,20 @@ if ($contentData) {
         </div>
     <?php }
 
+	$commonMap = [];
+
     for ($i = 0; $i < count($fields); $i++):
         foreach($fields[$i] as $head => $values):
             for($k = 0; $k < count($values); $k++):
+		$value = $values[$k];
                 $fName = $head . '_' . sanitize_field_name($values[$k]);
-                if(@$contentData['common'][$fName]): ?>
-                    <div>
+		if(@$contentData['common'][$fName]) {
+			if(!isset($commonMap[$head])) {
+				$commonMap[$head] = [];
+			}
+			$commonMap[$head][] = ['value' => $value, 'fName' => $fName, 'comments' => @$contentData['common'][$fName.'__comments']];
+		?>
+                    <div class="d-none">
                         <?= ucwords($head) ?>
                         <i class="fa fa-arrow-right text-sm text-secondary"></i>
                         <span class="font-weight-bold"><?= $values[$k] ?></span>
@@ -91,11 +99,28 @@ if ($contentData) {
                         <?php endif; ?>
                     </div>
                 <?php
-                endif;
+                }
             endfor;
         endforeach;
     endfor;
 
+	// var_dump(json_encode($commonMap));
+	?> <div> <?php
+	foreach($commonMap as $head => $set):
+		?>
+		<div>
+			<span class="font-weight-bold"><?= ucwords($head) ?>:</span>
+			<i class="fa fa-arrow-right d-none"></i>
+			<span class="">
+			<?php $out = []; foreach($set as $item) { $out[] = '<span class="__font-weight-bold">' . $item['value'] . '</span>' . ($item['comments'] ? ('<span class="text-sm ml-1 text-secondary">(' . $item['comments'] . ')</span>') : ''); } echo implode(', ', $out); ?>
+			</span>
+		</div>
+		<?php
+	endforeach;
+	?>
+
+	<?php
+
     // custom fields
 
     if(isset($contentData['customFields']) && count($contentData['customFields'])):
@@ -103,20 +128,24 @@ if ($contentData) {
         for ($i = 0; $i < count($contentData['customFields']); $i++):
             $item = $contentData['customFields'][$i];
             if($item['value']): ?>
-                <div>
-                    Custom
-                    <i class="fa fa-arrow-right text-sm text-secondary"></i>
-                    <span class="font-weight-bold"><?= $item['label'] ?></span>
+                <span>
+                    <span class="font-weight-bold">Other: </span>
+		    <i class="fa fa-arrow-right d-none"></i>
+                </span>
+		<span>
+		    <span class="__font-weight-bold"><?= $item['label'] ?></span>
                     <?php if($item['comments']): ?>
                         <span class="text-sm ml-1 text-secondary">(<?= $item['comments'] ?>)</span>
                     <?php endif; ?>
-                </div>
+                </span>
             <?php
             endif;
         endfor;
         ?> </div> <?php
     endif;
 
+	echo '</div>';
+
     if(isset($contentData['comments']) && !empty(trim($contentData['comments']))) { ?>
         <div class="mt-2 mb-1">
             <b>Comments: </b><?= $contentData['comments'] ?>

resources/views/app/patient/segment-templates/omega_history_past_medical/summary.blade.php_NEW

@@ -0,0 +1,159 @@
+<?php
+
+use App\Models\Client;
+use App\Models\Point;
+use App\Models\Note;
+/** @var Client $patient */
+/** @var Note $note */
+
+if(!@$note) {
+    $note = $patient->coreNote;
+}
+
+$fields = [
+    [
+        "Head" => ["Trauma"],
+        "Eyes" => ["Blindness", "Cataracts", "Glaucoma", "Wears glasses/contacts"],
+        "Ears" => ["Hearing aids"],
+        "Nose/Sinuses" => ["Allergic Rhinitis", "Sinus infections"],
+        "Mouth/Throat/Teeth" => ["Dentures"],
+        "Cardiovascular" => ["Aneurysm", "Angina", "DVT", "Dysrhythmia", "HTN", "Murmur", "Myocardial infarction", "Other heart disease"],
+    ],
+    [
+        "Respiratory" => ["Asthma", "Bronchitis", "COPD - Bronchitis/Emphysema", "Pleuritis", "Pneumonia"],
+        "Gastrointestinal" => ["Cirrhosis", "GERD", "Gallbladder disease", "Heartburn", "Hemorrhoids", "Hepatitis", "Hiatal hernia", "Jaundice", "Ulcer"],
+        "Genitourinary" => ["Hernia", "Incontinence", "Nephrolithiasis", "Other kidney disease", "STDs", "UTI(s)"],
+    ],
+    [
+        "Musculoskeletal" => ["Arthritis", "Gout", "M/S injury"],
+        "Skin" => ["Dermatitis", "Mole(s)", "Other skin condition(s)", "Psoriasis"],
+        "Neurological" => ["Epilepsy", "Seizures", "Severe headaches, migraines", "Stroke", "TIA"],
+        "Psychiatric" => ["Bipolar disorder", "Depression", "Hallucinations, delusions", "Suicidal ideation", "Suicide attempts"],
+    ],
+    [
+        "Endocrine" => ["Goiter", "Hyperlipidemia", "Hypothyroidism", "Thyroid disease", "Thyroiditis", "Type I DM", "Type II DM"],
+        "Heme/Onc" => ["Anemia", "Cancer"],
+        "Infectious" => ["HIV", "STDs", "Tuberculosis (dz)", "Tuberculosis (exposure)"],
+    ]
+];
+
+$contentData = [
+    "bloodType" => "",
+    "bloodRH" => "",
+    "common" => [],
+    "customFields" => [],
+    "comments" => "",
+];
+$isempty = false;
+
+if(!@$sessionKey) {
+    $sessionKey = request()->cookie('sessionKey');
+}
+
+$point = Point::getOrCreateOnlyTopLevelPointOfCategory($note, 'PAST_MEDICAL_HISTORY', $sessionKey, true);
+
+$contentData = $parsed = false;
+
+$rel = !!$point->relevanceToNote($note);
+
+if ($point->lastChildReview && $point->lastChildReview->data && ($rel || $point->lastChildReview->added_in_note_id === $note->id)) {
+    $point->lastChildReview->data = json_decode($point->lastChildReview->data, true);
+    $contentData = $parsed = $point->lastChildReview->data;
+}
+
+if ($contentData) {
+
+    $blood = [];
+    if(isset($contentData['bloodType'])) {
+        $blood[] = $contentData['bloodType'];
+    }
+    if(isset($contentData['bloodRH'])) {
+        $blood[] = $contentData['bloodRH'];
+    }
+    $blood = implode(" ", $blood);
+    if(!empty(trim($blood))) { ?>
+        <div class="mb-2">
+            <div>Blood Type &amp; RH: <b><?= $blood ?></b></div>
+        </div>
+    <?php }
+
+	$commonMap = [];
+
+    for ($i = 0; $i < count($fields); $i++):
+        foreach($fields[$i] as $head => $values):
+            for($k = 0; $k < count($values); $k++):
+		$value = $values[$k];
+                $fName = $head . '_' . sanitize_field_name($values[$k]);
+		if(@$contentData['common'][$fName]) {
+			if(!isset($commonMap[$head])) {
+				$commonMap[$head] = [];
+			}
+			$commonMap[$head][] = ['value' => $value, 'fName' => $fName, 'comments' => @$contentData['common'][$fName.'__comments']];
+		?>
+                    <div class="d-none">
+                        <?= ucwords($head) ?>
+                        <i class="fa fa-arrow-right text-sm text-secondary"></i>
+                        <span class="font-weight-bold"><?= $values[$k] ?></span>
+                        <?php if(@$contentData['common'][$fName . '__comments']): ?>
+                            <span class="text-sm ml-1 text-secondary">(<?= $contentData['common'][$fName . '__comments'] ?>)</span>
+                        <?php endif; ?>
+                    </div>
+                <?php
+                }
+            endfor;
+        endforeach;
+    endfor;
+
+	// var_dump(json_encode($commonMap));
+	?> <table class="table-bordered table-xs table-cage mb-0"> <?php
+	foreach($commonMap as $head => $set):
+		?>
+		<tr>
+			<td class="font-weight-bold"><?= ucwords($head) ?></td>
+			<td class="px-2">
+			<?php $out = []; foreach($set as $item) { $out[] = '<span class="__font-weight-bold">' . $item['value'] . '</span>' . ($item['comments'] ? ('<span class="text-sm ml-1 text-secondary">(' . $item['comments'] . ')</span>') : ''); } echo implode(', ', $out); ?>
+			</td>
+			<td></td>
+		</tr>
+		<?php
+	endforeach;
+	?>
+
+	<?php
+
+    // custom fields
+
+    if(isset($contentData['customFields']) && count($contentData['customFields'])):
+        ?> <tr class=""> <?php
+        for ($i = 0; $i < count($contentData['customFields']); $i++):
+            $item = $contentData['customFields'][$i];
+            if($item['value']): ?>
+                <td>
+                    <span class="font-weight-bold">Other</span>
+                </td>
+		<td>
+		    <span class="__font-weight-bold"><?= $item['label'] ?></span>
+                    <?php if($item['comments']): ?>
+                        <span class="text-sm ml-1 text-secondary">(<?= $item['comments'] ?>)</span>
+                    <?php endif; ?>
+                </td>
+		<td></td>
+            <?php
+            endif;
+        endfor;
+        ?> </tr> <?php
+    endif;
+
+	echo '</table>';
+
+    if(isset($contentData['comments']) && !empty(trim($contentData['comments']))) { ?>
+        <div class="mt-2 mb-1">
+            <b>Comments: </b><?= $contentData['comments'] ?>
+        </div>
+    <?php }
+
+} else {
+    echo '<div class="text-secondary">-</div>';
+}
+?>
+

resources/views/app/practice-management/process-claims.blade.php

@@ -53,7 +53,7 @@
                          v-on:click.prevent="setCurrentClaim(claimIndex)">
                         <div class="d-flex align-items-center c-pointer">
 
-                            <b class="p-2 border-right mr-1 bg-aliceblue" :class="claim.status === 'PICKED_UP' ? 'text-dark' : 'text-secondary'">@{{ claim.created }}</b>
+                            <b class="p-2 border-right mr-1 bg-aliceblue" :class="claim.status === 'PICKED_UP' ? 'text-dark' : 'text-secondary'">@{{ claim.claim_date }}</b>
 
                             <div v-if="claim.care_month_uid" class="rounded text-sm px-2 py-1 font-weight-bold bg-secondary text-white mr-1">
                                 <i class="fa fa-clock mr-1"></i>RM