diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php index 3e14450..933590f 100644 --- a/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php +++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php @@ -97,10 +97,10 @@ public function getMainDetail() } } } - $generator = new \Picqer\Barcode\BarcodeGeneratorHTML(); - $tiaoma= $generator->getBarcode($value->app_num, $generator::TYPE_CODE_128, 2, 40); - $updatedHtml = preg_replace('/background-color:\s*black\s*;/i', 'background-color: black !important;', $tiaoma); - $value->barcode=$updatedHtml; + $barcodeContent = $value->patient_type == 0 ? substr($value->episodeid, -10) : $value->app_num; + $generator = new \Picqer\Barcode\BarcodeGeneratorPNG(); + $barcodePng = $generator->getBarcode($barcodeContent, $generator::TYPE_CODE_128, 2, 40); + $value->barcode = base64_encode($barcodePng); $itemInfo[]=[ 'maininfo'=>$value, 'iteminfo'=>$ii, diff --git a/Laravel/app/Http/Controllers/API/Third/PacsController.php b/Laravel/app/Http/Controllers/API/Third/PacsController.php index f28b450..9e0a284 100644 --- a/Laravel/app/Http/Controllers/API/Third/PacsController.php +++ b/Laravel/app/Http/Controllers/API/Third/PacsController.php @@ -280,4 +280,15 @@ public function CancelSignInOnPacs(){ } } + //条形码测试接口 + public function BarcodeTest() + { + $code = request('code'); + if (empty($code)) { + return \Yz::JsonError('code 不能为空'); + } + $generator = new \Picqer\Barcode\BarcodeGeneratorPNG(); + $barcode = $generator->getBarcode($code, $generator::TYPE_CODE_128, 2, 40); + return response($barcode)->header('Content-Type', 'image/png'); + } } diff --git a/Laravel/routes/api.php b/Laravel/routes/api.php index cec9649..0f68bb9 100644 --- a/Laravel/routes/api.php +++ b/Laravel/routes/api.php @@ -19,6 +19,7 @@ }); Route::get('/dev/ho','App\Http\Controllers\TestController@HoTest' ); +Route::get('/dev/barcode','App\Http\Controllers\API\Third\PacsController@BarcodeTest' ); Route::post('admin/login','App\Http\Controllers\API\Admin\LoginController@Login')->middleware('log'); //登录 Route::post('/tokenRefresh','App\Http\Controllers\API\TokenController@TokenRefresh')->middleware('log'); //刷新token Route::post('/GetServiceDateTime','App\Http\Controllers\API\ToolsController@GetServiceDateTime')->middleware('log'); //获取当前服务器时间 diff --git a/YiJi-admin/src/components/Yewu/PrintShenQingDan.vue b/YiJi-admin/src/components/Yewu/PrintShenQingDan.vue index 5e40618..da56496 100644 --- a/YiJi-admin/src/components/Yewu/PrintShenQingDan.vue +++ b/YiJi-admin/src/components/Yewu/PrintShenQingDan.vue @@ -4,9 +4,10 @@
秦皇岛市中医医院
检查预约回执单
-
-
{{printInfo.app_num}}
+ style="width:200px;text-align: center;padding-bottom: 8px;-webkit-print-color-adjust: exact; position: absolute;right: 10px;top:0px;"> + +
{{printInfo.patient_type == 0 ? printInfo.episodeid.slice(-10) : printInfo.app_num}}
@@ -19,7 +20,7 @@ - {{printInfo.patient_type_label}}号{{printInfo.patient_type == 0 ? printInfo.episodeid : printInfo.reg_num}} + {{printInfo.patient_type_label}}号:{{printInfo.patient_type == 0 ? printInfo.episodeid.slice(-10) : printInfo.reg_num}} 病区:{{printInfo.warddesc ?? ''}} 床号:{{printInfo.bedno ?? ''}}