修改im消息推送问题
This commit is contained in:
@@ -1724,17 +1724,37 @@ class CallBackController extends AbstractController
|
||||
$params['order_detection_id'] = $order_detection['order_detection_id'];
|
||||
OrderDetection::editOrderDetection($params,$data);
|
||||
|
||||
$order_detection['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
|
||||
|
||||
// 发送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'],
|
||||
$order_inquiry['inquiry_type']
|
||||
);
|
||||
$data = [
|
||||
"order_inquiry_id" => $order_inquiry['order_inquiry_id'],
|
||||
"inquiry_type" => $order_inquiry['inquiry_type'],
|
||||
"detection_no" => $order_detection['detection_no'],
|
||||
"patient_name" => $order_inquiry['patient_name'],
|
||||
"patient_sex" => $order_inquiry['patient_sex'],
|
||||
"patient_age" => $order_inquiry['patient_age'],
|
||||
"detection_project_name" => $detection_project['detection_project_name'],
|
||||
"disease_class_names" => $order_detection_case['detection_disease_class_names'],
|
||||
"detection_result_pdf" => $order_detection['detection_result_pdf'],
|
||||
"patient_user_id" => $order_detection['user_id'],
|
||||
"doctor_user_id" => $user_doctor['user_id'],
|
||||
];
|
||||
$imService->detectionTestReport($data);
|
||||
|
||||
// 发送IM消息-检测报告结果-文字
|
||||
$data = [
|
||||
"order_inquiry_id" => $order_inquiry['order_inquiry_id'],
|
||||
"inquiry_type" => $order_inquiry['inquiry_type'],
|
||||
"detection_no" => $order_detection['detection_no'],
|
||||
"doctor_name" => $user_doctor['user_name'],
|
||||
"patient_name" => $order_inquiry['patient_name'],
|
||||
"patient_sex" => $order_inquiry['patient_sex'],
|
||||
"patient_age" => $order_inquiry['patient_age'],
|
||||
"detection_project_name" => $detection_project['detection_project_name'],
|
||||
"patient_user_id" => $order_detection['user_id'],
|
||||
"doctor_user_id" => $user_doctor['user_id'],
|
||||
];
|
||||
|
||||
$imService->detectionTestReportStr($data);
|
||||
|
||||
return $this->detectionResultSuccessReturn();
|
||||
}else{
|
||||
@@ -1780,9 +1800,6 @@ class CallBackController extends AbstractController
|
||||
return $this->detectionResultFailReturn("问诊订单创建失败");
|
||||
}
|
||||
|
||||
// 回填问诊订单id
|
||||
$order_detection['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
|
||||
|
||||
// 增加患者问诊病例
|
||||
$data = array();
|
||||
$data['user_id'] = $order_detection['user_id'];
|
||||
@@ -1834,14 +1851,36 @@ class CallBackController extends AbstractController
|
||||
);
|
||||
|
||||
// 发送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'],
|
||||
$order_inquiry['inquiry_type']
|
||||
);
|
||||
$data = [
|
||||
"order_inquiry_id" => $order_inquiry['order_inquiry_id'],
|
||||
"inquiry_type" => $order_inquiry['inquiry_type'],
|
||||
"detection_no" => $order_detection['detection_no'],
|
||||
"patient_name" => $order_detection['patient_name'],
|
||||
"patient_sex" => $order_detection['patient_sex'],
|
||||
"patient_age" => $order_detection['patient_age'],
|
||||
"detection_project_name" => $detection_project['detection_project_name'],
|
||||
"disease_class_names" => $order_detection_case['detection_disease_class_names'],
|
||||
"detection_result_pdf" => $order_detection['detection_result_pdf'],
|
||||
"patient_user_id" => $order_detection['user_id'],
|
||||
"doctor_user_id" => $user_doctor['user_id'],
|
||||
];
|
||||
$imService->detectionTestReport($data);
|
||||
|
||||
// 发送IM消息-检测报告结果-文字
|
||||
$data = [
|
||||
"order_inquiry_id" => $order_inquiry['order_inquiry_id'],
|
||||
"inquiry_type" => $order_inquiry['inquiry_type'],
|
||||
"detection_no" => $order_detection['detection_no'],
|
||||
"doctor_name" => $user_doctor['user_name'],
|
||||
"patient_name" => $order_detection['patient_name'],
|
||||
"patient_sex" => $order_detection['patient_sex'],
|
||||
"patient_age" => $order_detection['patient_age'],
|
||||
"detection_project_name" => $detection_project['detection_project_name'],
|
||||
"patient_user_id" => $order_detection['user_id'],
|
||||
"doctor_user_id" => $user_doctor['user_id'],
|
||||
];
|
||||
|
||||
$imService->detectionTestReportStr($data);
|
||||
|
||||
Db::commit();
|
||||
} catch (\Throwable $e) {
|
||||
@@ -1851,16 +1890,6 @@ class CallBackController extends AbstractController
|
||||
}
|
||||
|
||||
try {
|
||||
// 发送IM消息-检测报告结果-文字
|
||||
$imService->detectionTestReportStr(
|
||||
$order_detection,
|
||||
$user_doctor['user_name'],
|
||||
$detection_project['detection_project_name'],
|
||||
$user_doctor['user_id'],
|
||||
$order_detection['user_id'],
|
||||
$order_inquiry['inquiry_type']
|
||||
);
|
||||
|
||||
// 患者-新报告生成通知
|
||||
$MessagePush = new MessagePush($order_detection['user_id']);
|
||||
$MessagePush->patientDetectionResultNotice($order_detection['order_detection_id']);
|
||||
|
||||
Reference in New Issue
Block a user