From f54424cf2d4bd546fcccac8c974840fd0af9d777 Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Fri, 17 May 2024 10:56:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=A4=84=E6=96=B9=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2=E5=9B=BE=E7=89=87=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Model/OrderPrescriptionFile.php  | 6 ++----
 app/Services/PatientOrderService.php | 3 +++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/Model/OrderPrescriptionFile.php b/app/Model/OrderPrescriptionFile.php
index 3abbd56..37b5f4f 100644
--- a/app/Model/OrderPrescriptionFile.php
+++ b/app/Model/OrderPrescriptionFile.php
@@ -17,9 +17,7 @@ use Hyperf\Snowflake\Concern\Snowflake;
  * @property string $hospital_ca_file_id 医院签章pdf文件id（可请求ca下载）
  * @property string $prescription_img_oss_path 签章img文件oss路径
  * @property string $prescription_pdf_oss_path 签章pdf文件oss路径
- * @property string $doctor_sign_image_path 医生签名图片oss地址
- * @property string $pharmacist_sign_image_path 药师签名图片oss地址
- * @property string $hospital_sign_image_path 医院签名图片oss地址
+ * @property int $is_converted_pdf 是否已转换pdf为图片(0:否 1:是)
  * @property \Carbon\Carbon $created_at 创建时间
  * @property \Carbon\Carbon $updated_at 修改时间
  */
@@ -35,7 +33,7 @@ class OrderPrescriptionFile extends Model
     /**
      * The attributes that are mass assignable.
      */
-    protected array $fillable = ['prescription_file_id', 'order_prescription_id', 'doctor_ca_file_id', 'hospital_ca_file_id', 'prescription_img_oss_path', 'prescription_pdf_oss_path', 'doctor_sign_image_path', 'pharmacist_sign_image_path', 'hospital_sign_image_path', 'created_at', 'updated_at'];
+    protected array $fillable = ['prescription_file_id', 'order_prescription_id', 'doctor_ca_file_id', 'hospital_ca_file_id', 'prescription_img_oss_path', 'prescription_pdf_oss_path', 'is_converted_pdf', 'created_at', 'updated_at'];
 
     protected string $primaryKey = "prescription_file_id";
 
diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php
index c532ead..1e2e621 100644
--- a/app/Services/PatientOrderService.php
+++ b/app/Services/PatientOrderService.php
@@ -2045,6 +2045,9 @@ class PatientOrderService extends BaseService
         // 获取处方医院签名
         $order_prescription['hospital_sign_image'] = "https://img.applets.igandanyiyuan.com/basic/file/hospital_signature.png";
 
+        // 是否已转换pdf为图片
+        $order_prescription['is_converted_pdf'] = $order_prescription_file['is_converted_pdf'];
+
         return success($order_prescription->toArray());
     }