diff --git a/Laravel/app/Http/Controllers/API/PdfController.php b/Laravel/app/Http/Controllers/API/PdfController.php index 3986fee..99c1dc3 100644 --- a/Laravel/app/Http/Controllers/API/PdfController.php +++ b/Laravel/app/Http/Controllers/API/PdfController.php @@ -175,6 +175,7 @@ public function GetCheckPdf() 'id' => $item->id, 'entrust_id' => $item->entrust_id, 'entrust' => $item->entrust, + 'requestComment' => $item->requestComment, 'entrust_date' => $item->entrust_date, 'entrust_time' => $item->entrust_time, 'reservation_date' => $item->reservation_date, @@ -197,7 +198,12 @@ public function GetCheckPdf() $patient['barcode_text'] = $patient['patient_id']; foreach ($patient['rooms'] as &$room) { - $room['items_str'] = implode(',', array_column($room['items'], 'entrust')); + $room['items_str'] = implode(',', array_map(function($item) { + if (!empty($item['requestComment'])) { + return $item['entrust'] . '(' . $item['requestComment'] . ')'; + } + return $item['entrust']; + }, $room['items'])); $firstItem = $room['items'][0]; $room['reservation_date'] = $firstItem['reservation_date']; @@ -500,6 +506,7 @@ public function GenerateGroupedCheckPdf() $groups[$typeKey]['patients'][$patientKey]['rooms'][$roomKey]['items'][] = [ 'id' => $item->id, 'entrust' => $item->entrust, + 'requestComment' => $item->requestComment, 'entrust_date' => $item->entrust_date, 'entrust_time' => $item->entrust_time, 'reservation_date' => $item->reservation_date, @@ -525,7 +532,12 @@ public function GenerateGroupedCheckPdf() foreach ($patient['rooms'] as &$room) { //项目名称拼接 - $room['items_str'] = implode(',', array_column($room['items'], 'entrust')); + $room['items_str'] = implode(',', array_map(function($item) { + if (!empty($item['requestComment'])) { + return $item['entrust'] . '(' . $item['requestComment'] . ')'; + } + return $item['entrust']; + }, $room['items'])); //预约时间 $firstItem = $room['items'][0]; diff --git a/YiJi-admin/src/components/Yewu/YuYue202506.vue b/YiJi-admin/src/components/Yewu/YuYue202506.vue index 483c446..dbd41c5 100644 --- a/YiJi-admin/src/components/Yewu/YuYue202506.vue +++ b/YiJi-admin/src/components/Yewu/YuYue202506.vue @@ -42,7 +42,11 @@ 完成 - + + + - + + + - + + +