gdxz/hospital-applets-api
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改检测检测当前医生是否和患者存在未完成问诊订单如惨

Browse Source
This commit is contained in:
wucongxing 2023-08-28 09:05:14 +08:00
parent 48f180dbb1
commit a47dccdedc
3 changed files with 33 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Amqp/Consumer/DetectionCompleteDelayDirectConsumer.php
View File

@ -59,7 +59,7 @@ class DetectionCompleteDelayDirectConsumer extends ConsumerMessage
try {
// 检测当前医生是否和患者存在未完成问诊订单
$InquiryService = new InquiryService();
$order_inquiry = $InquiryService->checkPatientDoctorProgressInquiry($order_detection['user_id'],$order_detection['doctor_id']);
$order_inquiry = $InquiryService->checkPatientDoctorProgressInquiry($order_detection['patient_id'],$order_detection['doctor_id']);
if (!empty($order_inquiry)){
// 存在未完成订单
// 获取现在时间距离订单结束时间的时间差

3
app/Controller/CallBackController.php
View File

@ -1690,7 +1690,7 @@ class CallBackController extends AbstractController
// 检测当前医生是否和患者存在未完成问诊订单
$InquiryService = new InquiryService();
$order_inquiry = $InquiryService->checkPatientDoctorProgressInquiry($order_detection['user_id'],$order_detection['doctor_id']);
$order_inquiry = $InquiryService->checkPatientDoctorProgressInquiry($order_detection['patient_id'],$order_detection['doctor_id']);
if(!empty($order_inquiry)){
// 存在问诊订单
$time_diff = $InquiryService->getInquiryFinishTimeDiff($order_inquiry);
@ -1698,6 +1698,7 @@ class CallBackController extends AbstractController
$time_diff = 60;
}
dump($time_diff);
// 计算时间并重新加入队列
$queue_data = array();
$queue_data['detection_no'] = $order_detection['detection_no'];

59
app/Services/DetectionService.php
View File

@ -567,7 +567,8 @@ class DetectionService extends BaseService
try {
// 检测当前医生是否和患者存在未完成问诊订单
$InquiryService = new InquiryService();
$order_inquiry = $InquiryService->checkPatientDoctorProgressInquiry($order_detection['user_id'],$order_detection['doctor_id']);
$order_inquiry = $InquiryService->checkPatientDoctorProgressInquiry($order_detection['patient_id'],$order_detection['doctor_id']);
dump($order_inquiry);
if (!empty($order_inquiry)){
if ($order_inquiry['inquiry_status'] == 1){
// 待支付
@ -714,35 +715,35 @@ class DetectionService extends BaseService
return fail();
}
// 发送im消息
$imService = new ImService();
// // 发送im消息
// $imService = new ImService();
//
// // 患者病例
// $imService->patientCase(
// $order_inquiry,
// $user_doctor['user_id'],
// $order_inquiry_case['disease_desc']
// );
//
// // 发送IM消息-检测报告结果
// $imService->detectionTestReport(
// $order_detection,
// $user_doctor['user_id'],
// $order_detection['user_id'],
// $order_detection_case['detection_disease_class_names'],
// $detection_project['detection_project_name']
// );
//
// // 发送IM消息-检测报告结果-文字
// $imService->detectionTestReportStr(
// $order_detection,
// $user_doctor['user_name'],
// $detection_project['detection_project_name'],
// $user_doctor['user_id'],
// $order_detection['user_id']
// );
// 患者病例
$imService->patientCase(
$order_inquiry,
$user_doctor['user_id'],
$order_inquiry_case['disease_desc']
);
// 发送IM消息-检测报告结果
$imService->detectionTestReport(
$order_detection,
$user_doctor['user_id'],
$order_detection['user_id'],
$order_detection_case['detection_disease_class_names'],
$detection_project['detection_project_name']
);
// 发送IM消息-检测报告结果-文字
$imService->detectionTestReportStr(
$order_detection,
$user_doctor['user_name'],
$detection_project['detection_project_name'],
$user_doctor['user_id'],
$order_detection['user_id']
);
Db::commit();
// Db::commit();
}catch (\Throwable $e){
Db::rollBack();
Log::getInstance("DetectionService-bindDetectionTube")->error($e->getMessage());