From 5ade760b8856733d8580a4bdd09f5f136f19ea28 Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Tue, 28 Feb 2023 09:46:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=8C=BB=E7=94=9F=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Model/OrderInquiryCase.php | 10 ++++++++++ app/Services/OrderInquiryService.php | 20 ++++++++++++-------- app/Services/UserDoctorService.php | 14 ++++++++++++++ 3 files changed, 36 insertions(+), 8 deletions(-) diff --git a/app/Model/OrderInquiryCase.php b/app/Model/OrderInquiryCase.php index d2083f6..f1f83d1 100644 --- a/app/Model/OrderInquiryCase.php +++ b/app/Model/OrderInquiryCase.php @@ -113,4 +113,14 @@ class OrderInquiryCase extends Model ->where($params) ->first($fields); } + + /** + * 新增 + * @param array $data + * @return \Hyperf\Database\Model\Model|OrderInquiryCase + */ + public static function addOrderInquiryCase(array $data): \Hyperf\Database\Model\Model|OrderInquiryCase + { + return self::create($data); + } } diff --git a/app/Services/OrderInquiryService.php b/app/Services/OrderInquiryService.php index a99f897..f161a86 100644 --- a/app/Services/OrderInquiryService.php +++ b/app/Services/OrderInquiryService.php @@ -7,6 +7,7 @@ use App\Exception\BusinessException; use App\Model\DiseaseClass; use App\Model\DoctorInquiryConfig; use App\Model\OrderInquiry; +use App\Model\OrderInquiryCase; use App\Model\PatientFamily; use App\Model\Product; use App\Model\SystemInquiryConfig; @@ -218,7 +219,6 @@ class OrderInquiryService extends BaseService return fail(HttpEnumCode::SERVER_ERROR,"订单创建失败"); } - // 处理复诊凭证 if (!empty($request_params['diagnose_images'])){ // 医师资格证 @@ -226,8 +226,6 @@ class OrderInquiryService extends BaseService $diagnose_images = PcreMatch::pregRemoveOssWebsite($diagnose_images); } - dump($patient_family->toArray()); - dump($patient_family['card_name']); // 增加患者问诊病例 $data = array(); $data['user_id'] = $user_info['user_id']; @@ -236,12 +234,10 @@ class OrderInquiryService extends BaseService $data['family_id'] = $patient_family['family_id']; // 家庭成员id $data['relation'] = $patient_family['relation']; // 与患者关系(1:本人 2:父母 3:爱人 4:子女 5:亲戚 6:其他 ) $data['name'] = $patient_family['card_name']; // 患者名称 - $data['sex'] = $patient_family['sex'] ?? 0; // 患者性别(0:未知 1:男 2:女) $data['age'] = $patient_family['age'] ?? null; // 患者年龄 $data['height'] = $request_params['height'] ?? $patient_family['height'] ?: null; // 身高(cm) $data['weight'] = $request_params['weight'] ?? $patient_family['weight'] ?: null;; // 体重(kg) - $data['disease_class_id'] = $disease_class['disease_class_id']; // 疾病分类id-系统 $data['disease_class_name'] = $disease_class['disease_class_name']; // 疾病名称-系统 $data['diagnosis_date'] = $request_params['diagnosis_date'] ?: null; // 确诊日期 @@ -252,16 +248,24 @@ class OrderInquiryService extends BaseService $data['is_family_history'] = $request_params['is_family_history'] ?: 0; // 是否存在家族病史(0:否 1:是) $data['family_history'] = $request_params['family_history'] ?? null; // 家族病史描述 $data['is_pregnant'] = $request_params['is_pregnant'] ?: 0; // 是否备孕、妊娠、哺乳期(0:否 1:是) + $order_inquiry_case = OrderInquiryCase::addOrderInquiryCase($data); + if (empty($order_inquiry_case)){ + return fail(HttpEnumCode::SERVER_ERROR,"订单创建失败"); + } + + // 增加意向用药表 + + // 锁定库存 + + // 增加至退款延迟队列 - dump($data); } catch (\Exception $e) { Db::rollBack(); return fail(HttpEnumCode::HTTP_ERROR, $e->getMessage()); } - // 添加患者病例 - // 添加至具体队列 + } } \ No newline at end of file diff --git a/app/Services/UserDoctorService.php b/app/Services/UserDoctorService.php index dda5364..6b5737f 100644 --- a/app/Services/UserDoctorService.php +++ b/app/Services/UserDoctorService.php @@ -665,6 +665,20 @@ class UserDoctorService extends BaseService return fail(HttpEnumCode::HTTP_ERROR, $res); } + // 获取医生详情 + $fields = [ + 'card_name', + 'card_num_mask', + ]; + + $params = array(); + $params['doctor_id'] = $user_info['client_user_id']; + $user_doctor_info = UserDoctorInfo::getOne($params,$fields); + if (empty($user_doctor_info)) { + $user_doctor['card_name'] = ""; + $user_doctor['card_num_mask'] = ""; + } + $user_doctor['avatar'] = addAliyunOssWebsite($user_doctor['avatar']); return success($user_doctor->toArray());