|
@@ -12,9 +12,19 @@ $items = !$items ? [] : $items;
|
|
|
foreach($items as $item):
|
|
foreach($items as $item):
|
|
|
$value[] = $item['title'];
|
|
$value[] = $item['title'];
|
|
|
endforeach;
|
|
endforeach;
|
|
|
-$summaryHtml = $patient->displayName() . ", {$patient->age_in_years} years old {$patient->sex} ";
|
|
|
|
|
|
|
+
|
|
|
|
|
+$summaryHtml = 'Patient ' . $patient->name_first .' '.$patient->name_last . " is a {$patient->age_in_years} year old {$patient->sex} ";
|
|
|
if(count($value)) {
|
|
if(count($value)) {
|
|
|
- $summaryHtml .= "presenting with " . implode(", ", $value);
|
|
|
|
|
|
|
+ $summaryHtml .= "presenting with ";
|
|
|
|
|
+ if(count($value) == 1){
|
|
|
|
|
+ $summaryHtml .= implode(", ", $value);
|
|
|
|
|
+ }else{
|
|
|
|
|
+ $allButLast = array_slice($value, 0, count($value)-1);
|
|
|
|
|
+ $last = array_slice($value, count($value)-1, 1)[0];
|
|
|
|
|
+ $summaryHtml .= implode(", ", $allButLast);
|
|
|
|
|
+ $summaryHtml .= ' and ' . $last;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
$contentData = [
|
|
$contentData = [
|
|
|
'value' => $summaryHtml
|
|
'value' => $summaryHtml
|
Josh