Merge branch 'master' into dev-vj

app/Http/Controllers/HomeController.php

@@ -217,7 +217,7 @@ class HomeController extends Controller
             ->count();
         $keyNumbers['patientsNotSeenYet'] = $patientNotSeenYet;
 
-        $pendingBillsToSign = Bill::where(function ($query) use ($performerProID) {
+        $pendingBillsToSign = Bill::where('bill_service_type', '<>', 'CARE_MONTH')->where(function ($query) use ($performerProID) {
             $query->where('hcp_pro_id', $performerProID)->where('is_signed_by_hcp', false)->where('is_cancelled', false);
         })
             ->orWhere(function ($query) use ($performerProID) {
@@ -831,7 +831,7 @@ WHERE measurement.label NOT IN ('SBP', 'DBP')
         else {
             $pros = $pros->orderBy('name_last', 'asc');
         }
-            
+
         $pros = $pros->paginate(20);
 
         return view('app/log-in-as', ['logInAsPros' => $pros]);

app/Http/Controllers/PracticeManagementController.php

@@ -118,7 +118,7 @@ class PracticeManagementController extends Controller
 
             case 'without-bills':
                 $query = $query->where('is_signed_by_hcp', true)->where('is_cancelled', false)->whereDoesntHave('bills');
-                
+
                 break;
 
             // more cases can be added as needed
@@ -153,7 +153,7 @@ class PracticeManagementController extends Controller
     public function bills(Request $request, $filter = '')
     {
         $proID = $this->performer()->pro->id;
-        $query = Bill::where('is_cancelled', false);
+        $query = Bill::where('is_cancelled', false)->where('bill_service_type', '<>', 'CARE_MONTH');
         switch ($filter) {
             case 'not-yet-signed':
                 $query = $query
@@ -1092,8 +1092,8 @@ SELECT claim.uid AS uid,
        note.method,
        note.new_or_fu_or_na,
        -- claim.status_updated_at,
-       (DATE(claim.status_updated_at) || ' ' || 
-            LPAD(EXTRACT(hour FROM claim.status_updated_at)::text, 2, '0') || ':' || 
+       (DATE(claim.status_updated_at) || ' ' ||
+            LPAD(EXTRACT(hour FROM claim.status_updated_at)::text, 2, '0') || ':' ||
             LPAD(EXTRACT(minute FROM claim.status_updated_at)::text, 2, '0')) AS status_updated_at,
        (SELECT string_agg(claim_line.cpt, ', ') FROM claim_line where claim_id = claim.id) AS cpts,
        (SELECT COUNT(claim_line_icd.id) FROM claim_line_icd WHERE claim_line_id IN (SELECT id FROM claim_line WHERE claim_id = claim.id)) AS icds,
@@ -1107,9 +1107,9 @@ FROM claim
 --WHERE claim.status IS NULL OR claim.status = 'NEW'
 WHERE (claim.status is NULL OR claim.status NOT IN ('CANCELLED', 'ABANDONED'))
 -- AND claim.current_version_id IS NOT NULL
-AND (client.name_first ILIKE :q OR 
-     client.name_last ILIKE :q OR 
-     client.chart_number ILIKE :q OR 
+AND (client.name_first ILIKE :q OR
+     client.name_last ILIKE :q OR
+     client.chart_number ILIKE :q OR
      client.mcn ILIKE :q)
 AND (claim.created_at >= :from AND claim.created_at <= :to)
 " . ($hcpPro ? "AND claim.pro_id = :hcp" : '') . "

resources/views/app/patient/care-month/_create-claim.blade.php

@@ -121,7 +121,7 @@
                 lines: [
                     {
                         cpt: '',
-                        dateOfService: '{{date_format($note->created_at, 'Y-m-d')}}',
+                        dateOfService: '{{date_format($careMonth->created_at, 'Y-m-d')}}',
                         icds: window.rmReasons.map(_x => {
                             return {
                                 code: _x.icd,

resources/views/app/patient/care-month/dashboard.blade.php

@@ -1202,7 +1202,7 @@
 
 
             {{-- bills --}}
-            @if($pro->pro_type === 'ADMIN' || ($careMonth->mcp && $pro->id === $careMonth->mcp->id))
+            @if(($pro->pro_type === 'ADMIN' || ($careMonth->mcp && $pro->id === $careMonth->mcp->id) ) && false)
                 @if($careMonth->bills->count())
                     <div class="">
                         <div class="d-flex align-items-center mb-2">
@@ -1250,7 +1250,7 @@
                                             </table>
                                         </td> */ ?>
                                         <td class="text-nowrap">{{friendlier_date_time($bill->effective_date, false)}}</td>
-                                        <td>{{$bill->code}}</td>
+                                        <td>{{$bill->code}} {{$bill->cm_or_rm}} {{$bill->is_cancelled}}</td>
                                         <td class="">
                                             @if(strpos(strtolower($bill->code), 'treatment services') !== FALSE)
                                                 <?php

resources/views/app/patient/note/_create-bill.blade.php

@@ -37,7 +37,7 @@
                         $maxMinutes = 75;
                     }
                     else if($note->method === 'AUDIO') {
-                        $maxMinutes = 45;
+                        $maxMinutes = 60;
                     }
                 }
             ?>

spec/note_implementation_spec_june_30_2021.txt

@@ -0,0 +1,55 @@
+
+	section
+	
+		<vue-app>
+		
+			<edit-mode v-if="view == 'edit'"> 
+			
+			<summary-markup v-if="view == 'summary'" v-model="summaryHtml">
+			
+			<script>
+
+			{
+			
+				data: {
+					view:'edit',
+					summaryHtml:'{{$section->summary_html}}',
+					data: {
+						...
+					}
+				},
+				
+				methods: {
+					showEdit:function(){
+						// reload data
+						// view = 'edit'
+					}
+					showSummary:function(){
+						// reloadSummaryMarkup
+						// view = 'summary'
+					}
+					reloadData:function(){
+						//call php /note/section/{internalName}/getData
+						//php aggregates section data from the relevant pages / measurements / etc.
+						//php can use ob_start on /section/data.php
+					}
+					reloadSummaryMarkup:function(){
+						//call php to regenerate summary 
+						//php call java /api/section/updateSummaryHtml
+						//return summaryHtmlMarkup
+					}
+				},
+				
+				mount: function{
+				
+				}
+			}
+			</script>
+			
+		</vue-app>
+	
+		edit-mode
+		
+		summary-mode
+		
+			$section->summary_html