处方生成修改

app/Admin/Controllers/PrescriptionPrintController.php

@@ -99,7 +99,7 @@ public function search()
                 $font->size(32);
                 $font->color('#000000');
             });
-            // 开放日期
+            // 开方日期
             $date = \Carbon\Carbon::parse($prescription->prescription_at)->format('Y-m-d');
             $img->text($date, 1215, 330, function ($font) {
                 $font->filename(public_path('static/fonts/SimHei.ttf'));
@@ -114,36 +114,37 @@ public function search()
             });
 
             $drugInfo = $prescription->drug_info; // 每个元素包含 'pharmacy_drug', 'num'
-            $drugInfo = json_decode($drugInfo, true);
-            $medicines = [];
-            foreach ($drugInfo as $v) {
-                $pharmacyDrug = PharmacyDrugModel::with(['drug', 'dosage'])->find($v['pharmacy_drug']);
-                $medicines[] = [
-                    'name' => $pharmacyDrug->drug->name,
-                    'spec' => $pharmacyDrug->drug->spec,
-                    'num' => $v['num'],
-                    'sig' => $pharmacyDrug->dosage->dosage_desc,
-                ];
-            }
+            $medicines = json_decode($drugInfo, true);
+            // $medicines = [];
+            // foreach ($drugInfo as $v) {
+            //     $pharmacyDrug = PharmacyDrugModel::with(['drug', 'dosage'])->find($v['pharmacy_drug']);
+            //     $medicines[] = [
+            //         'drug_name' => $v['drug_name'],
+            //         'spec' => $v['spec'],
+            //         'num' => $v['num'],
+            //         'dosage_desc' => $v['dosage_desc'],
+            //         'unit' => $v['unit'],
+            //     ];
+            // }
 
             // 初始 Y 坐标
             $yCoordinate = 650; // 根据需要调整初始 Y 坐标
 
             foreach ($medicines as $medicine) {
                 // 打印药品名称、规格和盒数
-                $medicineText = "{$medicine['name']}     {$medicine['spec']}      {$medicine['num']}{$pharmacyDrug->unit}";
+                $medicineText = "{$medicine['drug_name']}     {$medicine['spec']}      {$medicine['num']}{$medicine['unit']}";
                 $img->text($medicineText, 550, $yCoordinate, function ($font) {
                     $font->filename(public_path('static/fonts/SimHei.ttf'));
                     $font->size(32);
                     $font->color('#000000');
-                    $font->align('center');
+                    $font->align('left');
                 });
 
                 // 增加 Y 坐标以打印下一行
                 $yCoordinate += 40; // 根据字体大小调整行间距
 
                 // 打印 sig 信息
-                $img->text('Sig：  '.$medicine['sig'], 550, $yCoordinate, function ($font) {
+                $img->text('Sig：  '.$medicine['dosage_desc'], 550, $yCoordinate, function ($font) {
                     $font->filename(public_path('static/fonts/SimHei.ttf'));
                     $font->size(32);
                     $font->color('#000000');

app/Api/Controllers/PrescriptionController.php

@@ -106,7 +106,7 @@ public function create(Request $request)
         } else {
             return $this->failed('pharmacy_id不能为空');
         }
-
+        // 生成处方
         $prescription = new PrescriptionModel;
         $prescription->status = PrescriptionModel::PRESCRIPTION_STATUS_PENDING;
         $prescription->user_id = $authInfo->id; // 获取当前用户ID
@@ -156,11 +156,9 @@ public function create(Request $request)
         $prescription->doctor_title = $randomDoctor->doctor_title;
         $prescription->doctor_license_no = $randomDoctor->license_no;
         $prescription->doctor_signed_pic = $randomDoctor->signed_pic;
-
         // 药店信息
         $prescription->pharmacy_id = $pharmacy->id;
         $prescription->pharmacy_name = $pharmacy->name;
-
         // 分派药师,先搜索是否存在默认药师，如果不存在则随机抽取一个
         $pharmacist = PharmacistModel::where('status', 1)
             ->where('pharmacy_id', $pharmacy_id)