Merge branch 'dev' of https://rav.triplestart.com/jmudaka/stagfe2 into dev

app/Http/Controllers/PracticeManagementController.php

@@ -326,6 +326,9 @@ SELECT effective_date, count(*), sum(number_of_units) as units FROM bill WHERE c
         $status = $request->get('status');
         if($status){
             if($status == 'CANCELLED') $query = $query->where('is_cancelled', true);
+            if($status == 'NOT_YET_SIGNED') $query = $query->where('is_signed_by_hcp', false);
+            if($status == 'NOT_YET_SIGNED_BUT_ALLY_SIGNED') $query = $query->where('is_signed_by_hcp', false)->where('is_signed_by_ally', true);
+            if($status == 'WITHOUT_BILLS') $query = $query->where('is_signed_by_hcp', true)->where('is_cancelled', false)->whereDoesntHave('bills');
         }
 
         

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

@@ -0,0 +1,58 @@
+<div moe>
+	<a start show><i class="fas fa-edit"></i></a>
+	<form url="/api/careMonth/putRmReasons" class="mcp-theme-1">
+		<input type="hidden" name="uid" value="{{$careMonth->uid}}">
+		<div class="bg-light p-3 mb-2">
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Icd 1</label>
+				<input type="text" class="form-control form-control-sm" icd-autocomplete-code data-target="input[name=rmReasonIcd1Description]" name="rmReasonIcd1" value="{{ $careMonth->rm_reason_icd1 }}" />
+			</div>
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Icd 1 Description</label>
+				<input id="" type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd1Description" value="{{ $careMonth->rm_reason_icd1description }}">
+			</div>
+		</div>
+
+		<div class="bg-light p-3 mb-2">
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Icd 2</label>
+				<input type="text" class="form-control form-control-sm" icd-autocomplete-code name="rmReasonIcd2" data-target="input[name=rmReasonIcd2Description]" value="{{ $careMonth->rm_reason_icd2 }}" />
+			</div>
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Icd 2 Description</label>
+				<input type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd2Description" value="{{ $careMonth->rm_reason_icd2description }}">
+			</div>
+		</div>
+
+		<div class="bg-light p-3 mb-2">
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Icd 3</label>
+				<input type="text" class="form-control form-control-sm" icd-autocomplete-code name="rmReasonIcd3" data-target="input[name=rmReasonIcd3Description]" value="{{ $careMonth->rm_reason_icd3 }}" />
+			</div>
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Icd 3 Description</label>
+				<input type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd3Description" value="{{ $careMonth->rm_reason_icd3description }}">
+			</div>
+		</div>
+		<div class="bg-light p-3 mb-2">
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Icd 4</label>
+				<input type="text" class="form-control form-control-sm" icd-autocomplete-code name="rmReasonIcd4" data-target="input[name=rmReasonIcd4Description]" value="{{ $careMonth->rm_reason_icd4 }}" />
+			</div>
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Icd 4 Description</label>
+				<input type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd4Description" value="{{ $careMonth->rm_reason_icd4description }}">
+			</div>
+		</div>
+		<div class="bg-light p-3 mb-2">
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Memo</label>
+				<input type="text" class="form-control form-control-sm" name="rmReasonMemo" value="{{ $careMonth->rm_reason_memo }}">
+			</div>
+		</div>
+		<div>
+			<button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+			<button cancel class="btn btn-sm btn-default border">Cancel</button>
+		</div>
+	</form>
+</div>

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

@@ -1,62 +1,50 @@
+<div class="d-flex align-items-center mb-1">
+    <span class="mr-2">RM Reasons:</span>
+    @include('app.patient.care-month.put-rm-reasons')
+</div>
 <div class="">
-    <div class="">
-        <div class="d-flex align-items-center mb-2 border-bottom pb-2">
-            <p class="font-weight-bold text-secondary m-0 mr-2">RM Reasons</p>
-        </div>
-        @if(!$careMonth->rmReasons || !count($careMonth->rmReasons))
-            <span class="text-secondary">None</span>
-        @else
-            <div>
-                @foreach($careMonth->rmReasons as $reason)
-                    <div class="border-bottom pb-1 mb-1 d-flex align-items-start">
-                        <b class="width-90px">{{$reason->code}}</b>
-                        <span class="width-200px">{{$reason->description}}</span>
-                        <div moe class="ml-3">
-                            <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
-                            <form url="/api/careMonthCmRmReason/updateBasic" class="mcp-theme-1">
-                                <input type="hidden" name="uid" value="{{$reason->uid}}">
-                                <div class="mb-2">
-                                    <label class="text-sm mb-1 text-secondary">Code *</label>
-                                    <input type="text" class="form-control form-control-sm"
-                                           name="code" value="{{$reason->code}}" required>
-                                </div>
-                                <div class="mb-2">
-                                    <label class="text-sm mb-1 text-secondary">Description</label>
-                                    <input type="text" class="form-control form-control-sm"
-                                           name="description" value="{{$reason->description}}">
-                                </div>
-                                <div>
-                                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                </div>
-                            </form>
-                        </div>
+    <table class="table table-sm table-striped table-bordered">
+        <tbody>
+            <tr>
+                <td class="text-nowrap">RM Reason Icd 1</td>
+                <td>
+                    <div class="d-flex flex-column">
+                        <span class="font-weight-bold">{{ $careMonth->rm_reason_icd1 }}</span>
+                        <small class="text-muted">{{ $careMonth->rm_reason_icd1description }}</small>
                     </div>
-                @endforeach
-            </div>
-        @endif
-        <div>
-            <div moe>
-                <a start show>+ Add</a>
-                <form url="/api/careMonthCmRmReason/create" class="mcp-theme-1">
-                    <input type="hidden" name="careMonthUid" value="{{$careMonth->uid}}">
-                    <input type="hidden" name="cmOrRm" value="RM">
-                    <div class="mb-2">
-                        <label class="text-sm mb-1 text-secondary">Code *</label>
-                        <input type="text" class="form-control form-control-sm"
-                               name="code" value="" required>
+                </td>
+            </tr>
+            <tr>
+                <td class="text-nowrap">RM Reason Icd 2</td>
+                <td>
+                    <div class="d-flex flex-column">
+                        <span class="font-weight-bold">{{ $careMonth->rm_reason_icd2 }}</span>
+                        <small class="text-muted">{{ $careMonth->rm_reason_icd2description }}</small>
                     </div>
-                    <div class="mb-2">
-                        <label class="text-sm mb-1 text-secondary">Description</label>
-                        <input type="text" class="form-control form-control-sm"
-                               name="description" value="">
+                </td>
+            </tr>
+            <tr>
+                <td class="text-nowrap">RM Reason Icd 3</td>
+                <td>
+                    <div class="d-flex flex-column">
+                        <span class="font-weight-bold">{{ $careMonth->rm_reason_icd3 }}</span>
+                        <small class="text-muted">{{ $careMonth->rm_reason_icd3description }}</small>
                     </div>
-                    <div>
-                        <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                        <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                </td>
+            </tr>
+            <tr>
+                <td class="text-nowrap">RM Reason Icd 4</td>
+                <td>
+                    <div class="d-flex flex-column">
+                        <span class="font-weight-bold">{{ $careMonth->rm_reason_icd4 }}</span>
+                        <small class="text-muted">{{ $careMonth->rm_reason_icd4description }}</small>
                     </div>
-                </form>
-            </div>
-        </div>
-    </div>
+                </td>
+            </tr>
+            <tr>
+                <td class="text-nowrap">RM Reason Memo</td>
+                <td>{{ $careMonth->rm_reason_memo }}</td>
+            </tr>
+        </tbody>
+    </table>
 </div>

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

@@ -0,0 +1,62 @@
+<div class="">
+    <div class="">
+        <div class="d-flex align-items-center mb-2 border-bottom pb-2">
+            <p class="font-weight-bold text-secondary m-0 mr-2">RM Reasons</p>
+        </div>
+        @if(!$careMonth->rmReasons || !count($careMonth->rmReasons))
+            <span class="text-secondary">None</span>
+        @else
+            <div>
+                @foreach($careMonth->rmReasons as $reason)
+                    <div class="border-bottom pb-1 mb-1 d-flex align-items-start">
+                        <b class="width-90px">{{$reason->code}}</b>
+                        <span class="width-200px">{{$reason->description}}</span>
+                        <div moe class="ml-3">
+                            <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
+                            <form url="/api/careMonthCmRmReason/updateBasic" class="mcp-theme-1">
+                                <input type="hidden" name="uid" value="{{$reason->uid}}">
+                                <div class="mb-2">
+                                    <label class="text-sm mb-1 text-secondary">Code *</label>
+                                    <input type="text" class="form-control form-control-sm"
+                                           name="code" value="{{$reason->code}}" required>
+                                </div>
+                                <div class="mb-2">
+                                    <label class="text-sm mb-1 text-secondary">Description</label>
+                                    <input type="text" class="form-control form-control-sm"
+                                           name="description" value="{{$reason->description}}">
+                                </div>
+                                <div>
+                                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                @endforeach
+            </div>
+        @endif
+        <div>
+            <div moe>
+                <a start show>+ Add</a>
+                <form url="/api/careMonthCmRmReason/create" class="mcp-theme-1">
+                    <input type="hidden" name="careMonthUid" value="{{$careMonth->uid}}">
+                    <input type="hidden" name="cmOrRm" value="RM">
+                    <div class="mb-2">
+                        <label class="text-sm mb-1 text-secondary">Code *</label>
+                        <input type="text" class="form-control form-control-sm"
+                               name="code" value="" required>
+                    </div>
+                    <div class="mb-2">
+                        <label class="text-sm mb-1 text-secondary">Description</label>
+                        <input type="text" class="form-control form-control-sm"
+                               name="description" value="">
+                    </div>
+                    <div>
+                        <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                        <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>

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

@@ -47,7 +47,7 @@
 		<div class="bg-light p-3 mb-2">
 			<div class="mb-2">
 				<label class="text-sm mb-1 text-secondary">RM Reason Memo</label>
-				<input type="text" class="form-control form-control-sm" name="rmResonMemo" value="{{ $patient->rm_reason_memo }}">
+				<input type="text" class="form-control form-control-sm" name="rmReasonMemo" value="{{ $patient->rm_reason_memo }}">
 			</div>
 		</div>
 		<div>

resources/views/app/patient/partials/rm-setup.blade.php

@@ -104,14 +104,9 @@
                 </div>
             </div>
         </div>
-        <div class="d-flex align-items-baseline mb-1">
-            <span class="width-200px">RM Reasons:</span>
-            <div class="ml-3">
-                <div>
-                    <span class="text-secondary mr-1">None</span>
-                    @include('app.patient.partials.put-rm-reasons')
-                </div>
-            </div>
+        <div class="d-flex align-items-center mb-1">
+            <span class="mr-2">RM Reasons:</span>
+            @include('app.patient.partials.put-rm-reasons')
         </div>
         <div class="pl-3" style="width: 400px;">
             <table class="table table-sm table-striped table-bordered">

resources/views/app/practice-management/notes_filters.blade.php

@@ -22,6 +22,7 @@
 	.filter-container>div:not(:last-child) {
 		margin-right: 15px;
 	}
+
 	.select2-container {
 		width: 100% !important;
 	}
@@ -87,7 +88,7 @@
 			<select multiple class="form-control form-control-sm mr-2" name="patients[]" v-model="filters.patients">
 				<option value="">All Patients</option>
 				@foreach($allPatientsWithNotes as $notePatient)
-					<option value="{{ $notePatient->id }}">{{ $notePatient->displayName() }}</option>
+				<option value="{{ $notePatient->id }}">{{ $notePatient->displayName() }}</option>
 				@endforeach
 			</select>
 		</div>
@@ -99,6 +100,9 @@
 			<select class="form-control form-control-sm mr-2" name="status" v-model="filters.status">
 				<option value="">All Notes</option>
 				<option value="CANCELLED">Cancelled</option>
+				<option value="NOT_YET_SIGNED">Notes not yet signed</option>
+				<option value="NOT_YET_SIGNED_BUT_ALLY_SIGNED">Notes not yet signed (but ally signed)</option>
+				<option value="WITHOUT_BILLS">Without Bills</option>
 			</select>
 		</div>
 	</div>