From 5e35083c6425213103b313b27b80de52fa121ebe Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Thu, 4 May 2023 08:49:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Model/BasicDoctorTitle.php | 55 ++++++++++++++++++++++++++++++++++
 app/Services/MessagePush.php   |  4 +--
 2 files changed, 57 insertions(+), 2 deletions(-)
 create mode 100644 app/Model/BasicDoctorTitle.php

diff --git a/app/Model/BasicDoctorTitle.php b/app/Model/BasicDoctorTitle.php
new file mode 100644
index 0000000..28a2759
--- /dev/null
+++ b/app/Model/BasicDoctorTitle.php
@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Model;
+
+
+
+use Hyperf\Database\Model\Collection;
+use Hyperf\Snowflake\Concern\Snowflake;
+
+/**
+ * @property int $doctor_title_id 主键id
+ * @property string $doctor_title_name 职称名称
+ * @property \Carbon\Carbon $created_at 创建时间
+ * @property \Carbon\Carbon $updated_at 修改时间
+ */
+class BasicDoctorTitle extends Model
+{
+    use Snowflake;
+
+    /**
+     * The table associated with the model.
+     */
+    protected ?string $table = 'basic_doctor_title';
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected array $fillable = ['doctor_title_id', 'doctor_title_name', 'created_at', 'updated_at'];
+
+    protected string $primaryKey = "doctor_title_id";
+
+    /**
+     * 获取信息-单条
+     * @param array $params
+     * @param array $fields
+     * @return object|null
+     */
+    public static function getOne(array $params, array $fields = ['*']): object|null
+    {
+        return self::where($params)->first($fields);
+    }
+
+    /**
+     * 获取信息-多条
+     * @param array $params
+     * @param array $fields
+     * @return Collection|array
+     */
+    public static function getList(array $params, array $fields = ['*']): Collection|array
+    {
+        return self::where($params)->get($fields);
+    }
+}
diff --git a/app/Services/MessagePush.php b/app/Services/MessagePush.php
index bc87b2b..11f18bd 100644
--- a/app/Services/MessagePush.php
+++ b/app/Services/MessagePush.php
@@ -311,7 +311,7 @@ class MessagePush extends BaseService
             $sub_data['params']['page'] = "pages/orderDetail/orderDetail?order_inquiry_id={$this->order_inquiry['order_inquiry_id']}";
             $sub_data['params']['data'] = [
                 "thing1" => (string)$disease_desc,// 问诊内容-病情主诉
-                "thing2" => "{$user_doctor['user_name']}医生已接诊，请您尽快和医生沟通交流病情",// 提醒内容
+                "thing2" => "医生已接诊，请您尽快和医生沟通交流病情",// 提醒内容
                 "name3" => (string)$user_doctor['user_name'],// 问诊医生
                 "thing4" => "点击查看问诊订单详情",// 提示说明
             ];
@@ -432,7 +432,7 @@ class MessagePush extends BaseService
             $sub_data['params']['page'] = "pages/orderDetail/orderDetail?order_inquiry_id={$this->order_inquiry['order_inquiry_id']}";
             $sub_data['params']['data'] = [
                 "thing1" => (string)$disease_desc,// 问诊内容
-                "thing2" => "您咨询{$user_doctor['user_name']}医生的服务已结束，请对本次问诊服务做出评价",// 提醒内容
+                "thing2" => "您的问诊服务已结束，请对本次服务做出评价",// 提醒内容
                 "name3" => (string)$user_doctor['user_name'],// 问诊医生
                 "thing4" => "点击查看问诊订单详情",// 提示说明
             ];