diff --git a/app/Amqp/Consumer/DetectionCompleteDelayDirectConsumer.php b/app/Amqp/Consumer/DetectionCompleteDelayDirectConsumer.php index 1ce10cf..2c0b91f 100644 --- a/app/Amqp/Consumer/DetectionCompleteDelayDirectConsumer.php +++ b/app/Amqp/Consumer/DetectionCompleteDelayDirectConsumer.php @@ -186,7 +186,7 @@ class DetectionCompleteDelayDirectConsumer extends ConsumerMessage $data['height'] = $patient_family['height'] ?: null; // 身高(cm) $data['weight'] = $patient_family['weight'] ?: null;; // 体重(kg) $data['nation_id'] = $order_detection_case['nation_id'] ?: $patient_family['nation_id'] ?: null;; // 民族 - $data['nation_name'] = $order_detection_case['nation_id'] ?: $patient_family['nation_name'] ?: null;; // 民族名称 + $data['nation_name'] = $order_detection_case['nation_name'] ?: $patient_family['nation_name'] ?: null;; // 民族名称 $order_inquiry_case = OrderInquiryCase::addOrderInquiryCase($data); if (empty($order_inquiry_case)) { Db::rollBack(); diff --git a/app/Controller/CallBackController.php b/app/Controller/CallBackController.php index ef04fb4..5c70361 100644 --- a/app/Controller/CallBackController.php +++ b/app/Controller/CallBackController.php @@ -1814,7 +1814,7 @@ class CallBackController extends AbstractController $data['height'] = $patient_family['height'] ?: null; // 身高(cm) $data['weight'] = $patient_family['weight'] ?: null;; // 体重(kg) $data['nation_id'] = $order_detection_case['nation_id'] ?: $patient_family['nation_id'] ?: null;; // 民族 - $data['nation_name'] = $order_detection_case['nation_id'] ?: $patient_family['nation_name'] ?: null;; // 民族名称 + $data['nation_name'] = $order_detection_case['nation_name'] ?: $patient_family['nation_name'] ?: null;; // 民族名称 $order_inquiry_case = OrderInquiryCase::addOrderInquiryCase($data); if (empty($order_inquiry_case)) { Db::rollBack(); diff --git a/app/Services/DetectionService.php b/app/Services/DetectionService.php index a6e69ee..60bae2c 100644 --- a/app/Services/DetectionService.php +++ b/app/Services/DetectionService.php @@ -690,7 +690,7 @@ class DetectionService extends BaseService $data['height'] = $patient_family['height'] ?: null; // 身高(cm) $data['weight'] = $patient_family['weight'] ?: null;; // 体重(kg) $data['nation_id'] = $order_detection_case['nation_id'] ?: $patient_family['nation_id'] ?: null;; // 民族 - $data['nation_name'] = $order_detection_case['nation_id'] ?: $patient_family['nation_name'] ?: null;; // 民族名称 + $data['nation_name'] = $order_detection_case['nation_name'] ?: $patient_family['nation_name'] ?: null;; // 民族名称 $order_inquiry_case = OrderInquiryCase::addOrderInquiryCase($data); if (empty($order_inquiry_case)) { Db::rollBack();