|
@@ -147,9 +147,15 @@ if(!function_exists('genericBills')) {
|
|
$genericBills = $genericBills->where('client_id', $patient->id);
|
|
$genericBills = $genericBills->where('client_id', $patient->id);
|
|
}
|
|
}
|
|
if($entityType && $entityUid) {
|
|
if($entityType && $entityUid) {
|
|
- $genericBills = $genericBills
|
|
|
|
- ->where('generic_target_entity_type', $entityType)
|
|
|
|
- ->where('generic_target_entity_uid', $entityUid);
|
|
|
|
|
|
+ if($entityType == 'CareMonth'){
|
|
|
|
+ $genericBills = $genericBills
|
|
|
|
+ ->where('care_month_id', $entityUid);
|
|
|
|
+ }else{
|
|
|
|
+ $genericBills = $genericBills
|
|
|
|
+ ->where('generic_target_entity_type', $entityType)
|
|
|
|
+ ->where('generic_target_entity_uid', $entityUid);
|
|
|
|
+ }
|
|
|
|
+
|
|
}
|
|
}
|
|
return $genericBills->orderBy('created_at', 'DESC')->get();
|
|
return $genericBills->orderBy('created_at', 'DESC')->get();
|
|
}
|
|
}
|