From 702c7f83926d152e9a681dd8220f45eea8f962b7 Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Thu, 6 Apr 2023 18:51:31 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E5=A4=84?= =?UTF-8?q?=E6=96=B9=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Controller/TestController.php | 76 +++++++++---------- app/Services/UserDoctorService.php | 6 +- .../RegulatoryPlatform/regulatoryPlatform.php | 2 +- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/app/Controller/TestController.php b/app/Controller/TestController.php index 1fbbd27..8931835 100644 --- a/app/Controller/TestController.php +++ b/app/Controller/TestController.php @@ -705,46 +705,46 @@ class TestController extends AbstractController $order_prescription = OrderPrescription::getOne($params); // 网络咨询（网络门诊）服务 -// $arg = array(); -// $arg['thirdUniqueid'] = $order_inquiry['order_inquiry_id']; // 唯一标识 -// $arg['orgName'] = "成都金牛欣欣相照互联网医院"; // 机构名称 -// $arg['orgCode'] = "MA6CGUDA251010619D2112"; // 机构编码 -// $arg['channelName'] = "成都金牛欣欣相照互联网医院";//平台名称 -// $arg['section'] = $hospital_department_custom['department_name'];//科室名称 -// $arg['sectionCode'] = $hospital_department_custom['department_code'];//科室编码 -// $arg['docName'] = $user_doctor['user_name'];// 姓名（医师、护师、技师） -// $arg['certificateNum'] = $user_doctor_info['qualification_cert_num']; // 执业资格证号 -// $arg['patientName'] = $order_inquiry['patient_name']; // 患者姓名 -// $arg['patientAge'] = $order_inquiry['patient_age']; // 患者年龄 -// $arg['patientSex'] = $order_inquiry['patient_sex'] == 0 ?: 1; // 患者性别 -// $arg['patientIdcardType'] = 1; // 证件类型 -// $arg['patientIdcardNum'] = $patient_family['id_number']; // 患者证件号码 -// $arg['serviceType'] = 1; // 服务类型 1网络咨询 2网络门诊 -// $arg['consultNo'] = $order_inquiry['inquiry_no']; // 网络咨询或网络门诊编号 订单编号 -// $arg['consultType'] = 1; // 咨询类别 1、图文咨询 2语音咨询3、视频咨询 -// $arg['consultApplyTime'] = $order_inquiry['created_at']; // 咨询申请时间 -// $arg['consultStartTime'] = $order_inquiry['reception_time']; // 咨询开始时间 -// $arg['consultEndTime'] = $order_inquiry['complete_time']; // 咨询结束时间 -// $arg['feeType'] = 1; // 费别 1自费 2医保 -// $arg['price'] = $order_inquiry['payment_amount_total']; // 咨询价格 元 -// $arg['isReply'] = 1; //咨询是否回复 0未回复 1已回复 -// $arg['patientEvaluate'] = 1; //患者满意度 1-5 1代表非常满意 5代表非常不满意 -// $arg['complainInfo'] = "无"; //投诉举报信息 -// $arg['disposeResult'] = "无"; //处理结果信息 -// $arg['isRiskWarn'] = 1; //是否进行诊前风险提示 0否 1是 -// $arg['isPatientSign'] = 1; //是否确认患者为签约对象 0否 1是 -// $arg['uploadTime'] = date('Y-m-d H:i:s',time()); //上传时间 -// $arg['medicalHistory'] = $order_inquiry_case['disease_desc']; //患者病史描述 -// $arg['docAdvice'] = $order_prescription['doctor_advice'] ?? "无"; // 医生建议描述 医嘱 -// $arg['isMark'] = 1;//是否留痕 1：代表留痕；0代表未留痕 -// -// $result = $regulatoryPlatform->uploadConsult($arg); + $arg = array(); + $arg['thirdUniqueid'] = $order_inquiry['order_inquiry_id']; // 唯一标识 + $arg['orgName'] = "成都金牛欣欣相照互联网医院"; // 机构名称 + $arg['orgCode'] = "MA6CGUDA251010619D2112"; // 机构编码 + $arg['channelName'] = "成都金牛欣欣相照互联网医院";//平台名称 + $arg['section'] = $hospital_department_custom['department_name'];//科室名称 + $arg['sectionCode'] = $hospital_department_custom['department_code'];//科室编码 + $arg['docName'] = $user_doctor['user_name'];// 姓名（医师、护师、技师） + $arg['certificateNum'] = $user_doctor_info['qualification_cert_num']; // 执业资格证号 + $arg['patientName'] = $order_inquiry['patient_name']; // 患者姓名 + $arg['patientAge'] = $order_inquiry['patient_age']; // 患者年龄 + $arg['patientSex'] = $order_inquiry['patient_sex'] == 0 ?: 1; // 患者性别 + $arg['patientIdcardType'] = 1; // 证件类型 + $arg['patientIdcardNum'] = $patient_family['id_number']; // 患者证件号码 + $arg['serviceType'] = 1; // 服务类型 1网络咨询 2网络门诊 + $arg['consultNo'] = $order_inquiry['inquiry_no']; // 网络咨询或网络门诊编号 订单编号 + $arg['consultType'] = 1; // 咨询类别 1、图文咨询 2语音咨询3、视频咨询 + $arg['consultApplyTime'] = $order_inquiry['created_at']; // 咨询申请时间 + $arg['consultStartTime'] = $order_inquiry['reception_time']; // 咨询开始时间 + $arg['consultEndTime'] = $order_inquiry['complete_time']; // 咨询结束时间 + $arg['feeType'] = 1; // 费别 1自费 2医保 + $arg['price'] = $order_inquiry['payment_amount_total']; // 咨询价格 元 + $arg['isReply'] = 1; //咨询是否回复 0未回复 1已回复 + $arg['patientEvaluate'] = 1; //患者满意度 1-5 1代表非常满意 5代表非常不满意 + $arg['complainInfo'] = "无"; //投诉举报信息 + $arg['disposeResult'] = "无"; //处理结果信息 + $arg['isRiskWarn'] = 1; //是否进行诊前风险提示 0否 1是 + $arg['isPatientSign'] = 1; //是否确认患者为签约对象 0否 1是 + $arg['uploadTime'] = date('Y-m-d H:i:s',time()); //上传时间 + $arg['medicalHistory'] = $order_inquiry_case['disease_desc']; //患者病史描述 + $arg['docAdvice'] = $order_prescription['doctor_advice'] ?? "无"; // 医生建议描述 医嘱 + $arg['isMark'] = 1;//是否留痕 1：代表留痕；0代表未留痕 + + $result = $regulatoryPlatform->uploadConsult($arg); //上报 网络复诊服务 - $arg = array(); - $arg['thirdUniqueid'] = - - $result = $regulatoryPlatform->uploadFurtherConsult($arg); +// $arg = array(); +// $arg['thirdUniqueid'] = +// +// $result = $regulatoryPlatform->uploadFurtherConsult($arg); dump($result); } } \ No newline at end of file diff --git a/app/Services/UserDoctorService.php b/app/Services/UserDoctorService.php index 9c8e4c8..d697b0c 100644 --- a/app/Services/UserDoctorService.php +++ b/app/Services/UserDoctorService.php @@ -557,14 +557,14 @@ class UserDoctorService extends BaseService $DoctorAccountService = new DoctorAccountService(); $balance_account = $DoctorAccountService->getDoctorBalanceAccount($user_info['client_user_id']); if ($balance_account > 0) { - $balance_account = $balance_account * 0.75; + $balance_account = round($balance_account * 0.75,2); } // 获取医生当日接诊的订单金额 $InquiryService = new InquiryService(); $estimate_income = $InquiryService->getDoctorDayAmountTotal($user_info['client_user_id'], date('Y-m-d', time())); if (!empty($estimate_income)) { - $estimate_income = $estimate_income * 0.75; + $estimate_income = round($estimate_income * 0.75,2); } $user_doctor['avatar'] = addAliyunOssWebsite($user_doctor['avatar']); @@ -888,7 +888,7 @@ class UserDoctorService extends BaseService $user_info = $this->request->getAttribute("userInfo") ?? []; $order_inquiry_id = $this->request->input('order_inquiry_id'); - $order_prescription_id = $this->request->route('order_prescription_id'); + $order_prescription_id = $this->request->input('order_prescription_id'); // 获取医生信息 $params = array(); diff --git a/extend/RegulatoryPlatform/regulatoryPlatform.php b/extend/RegulatoryPlatform/regulatoryPlatform.php index 0b81c53..43fcb4a 100644 --- a/extend/RegulatoryPlatform/regulatoryPlatform.php +++ b/extend/RegulatoryPlatform/regulatoryPlatform.php @@ -109,7 +109,7 @@ class regulatoryPlatform $arg['clientId'] = $this->client_id; $option = [ - "json" => $arg + "json" => [$arg] ]; $response = $this->httpRequest($this->api_url . '/wjw/upload/uploadConsult', $option);