From 03979e542667b5fd902c483641d5e9b89e075126 Mon Sep 17 00:00:00 2001 From: wucongxing <815046773@qq.com> Date: Tue, 9 May 2023 19:24:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=97=AE=E8=AF=8A=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E7=97=85=E4=BE=8B=E5=9B=9E=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AutoFinishInquiryDelayDirectConsumer.php | 47 ++++++++----------- 1 file changed, 19 insertions(+), 28 deletions(-) diff --git a/app/Amqp/Consumer/AutoFinishInquiryDelayDirectConsumer.php b/app/Amqp/Consumer/AutoFinishInquiryDelayDirectConsumer.php index 07112f0..7ec6110 100644 --- a/app/Amqp/Consumer/AutoFinishInquiryDelayDirectConsumer.php +++ b/app/Amqp/Consumer/AutoFinishInquiryDelayDirectConsumer.php @@ -301,33 +301,24 @@ class AutoFinishInquiryDelayDirectConsumer extends ConsumerMessage $data = array(); $data['family_id'] = $order_inquiry['family_id']; $data['patient_id'] = $order_inquiry['patient_id']; - if (!empty($order_inquiry_case['disease_class_id'])) { - $data['disease_class_id'] = $order_inquiry_case['disease_class_id']; // 疾病分类id-系统 - } - - if (!empty($order_inquiry_case['disease_class_name'])) { - $data['disease_class_name'] = $order_inquiry_case['disease_class_name']; // 疾病名称-系统 - } - - if (!empty($order_inquiry_case['diagnosis_date'])) { - $data['diagnosis_date'] = $order_inquiry_case['diagnosis_date']; // 确诊日期 - } - + $data['disease_class_id'] = $order_inquiry_case['disease_class_id']; // 疾病分类id-系统 + $data['disease_class_name'] = $order_inquiry_case['disease_class_name']; // 疾病名称-系统 + $data['diagnosis_date'] = $order_inquiry_case['diagnosis_date']; // 确诊日期 $patient_family_health = PatientFamilyHealth::addPatientFamilyHealth($data); if (empty($patient_family_health)) { Log::getInstance("queue-AutoFinishInquiry")->error("错误：回写患者家庭成员信息表-健康情况表失败"); } } else { $data = array(); - if (!empty($order_inquiry_case['disease_class_id']) && $order_inquiry_case['disease_class_id'] != $patient_family_health['disease_class_id']) { + if ($order_inquiry_case['disease_class_id'] != $patient_family_health['disease_class_id']) { $data['disease_class_id'] = $order_inquiry_case['disease_class_id']; // 疾病分类id-系统 } - if (!empty($order_inquiry_case['disease_class_name']) && $order_inquiry_case['disease_class_name'] != $patient_family_health['disease_class_name']) { + if ($order_inquiry_case['disease_class_name'] != $patient_family_health['disease_class_name']) { $data['disease_class_name'] = $order_inquiry_case['disease_class_name']; // 疾病名称-系统 } - if (!empty($order_inquiry_case['diagnosis_date']) && $order_inquiry_case['diagnosis_date'] != $patient_family_health['diagnosis_date']) { + if ($order_inquiry_case['diagnosis_date'] != $patient_family_health['diagnosis_date']) { $data['diagnosis_date'] = $order_inquiry_case['diagnosis_date']; // 确诊日期 } @@ -347,28 +338,28 @@ class AutoFinishInquiryDelayDirectConsumer extends ConsumerMessage $data = array(); $data['family_id'] = $order_inquiry['family_id']; $data['patient_id'] = $order_inquiry['patient_id']; - if (!empty($order_inquiry_case['is_allergy_history'])) { + if ($order_inquiry_case['is_allergy_history'] != null) { $data['is_allergy_history'] = $order_inquiry_case['is_allergy_history']; // 是否存在过敏史（0:否 1:是） } - if (!empty($order_inquiry_case['allergy_history'])) { + if ($order_inquiry_case['allergy_history'] != null) { $data['allergy_history'] = $order_inquiry_case['allergy_history']; // 过敏史描述 } - if (!empty($order_inquiry_case['is_family_history'])) { + if ($order_inquiry_case['is_family_history'] != null) { $data['is_family_history'] = $order_inquiry_case['is_family_history']; // 是否存在家族病史（0:否 1:是） } - if (!empty($order_inquiry_case['family_history'])) { + if ($order_inquiry_case['family_history'] != null) { $data['family_history'] = $order_inquiry_case['family_history']; // 家族病史描述 } - if (!empty($order_inquiry_case['is_pregnant'])) { + if ($order_inquiry_case['is_pregnant'] != null) { $data['is_pregnant'] = $order_inquiry_case['is_pregnant']; // 是否备孕、妊娠、哺乳期（0:否 1:是） } - if (!empty($order_inquiry_case['is_pregnant'])) { - $data['is_pregnant'] = $order_inquiry_case['is_pregnant']; // 是否备孕、妊娠、哺乳期（0:否 1:是） + if ($order_inquiry_case['pregnant'] != null) { + $data['pregnant'] = $order_inquiry_case['pregnant']; // 是否备孕、妊娠、哺乳期（0:否 1:是） } $patient_family_personal = PatientFamilyPersonal::addPatientFamilyPersonal($data); @@ -377,27 +368,27 @@ class AutoFinishInquiryDelayDirectConsumer extends ConsumerMessage } } else { $data = array(); - if (!empty($order_inquiry_case['is_allergy_history']) && $order_inquiry_case['is_allergy_history'] != $patient_family_personal['is_allergy_history']) { + if ($order_inquiry_case['is_allergy_history'] != $patient_family_personal['is_allergy_history']) { $data['is_allergy_history'] = $order_inquiry_case['is_allergy_history']; // 是否存在过敏史（0:否 1:是） } - if (!empty($order_inquiry_case['allergy_history']) && $order_inquiry_case['allergy_history'] != $patient_family_personal['allergy_history']) { + if ($order_inquiry_case['allergy_history'] != $patient_family_personal['allergy_history']) { $data['allergy_history'] = $order_inquiry_case['allergy_history']; // 过敏史描述 } - if (!empty($order_inquiry_case['is_family_history']) && $order_inquiry_case['is_family_history'] != $patient_family_personal['is_family_history']) { + if ($order_inquiry_case['is_family_history'] != $patient_family_personal['is_family_history']) { $data['is_family_history'] = $order_inquiry_case['is_family_history']; // 是否存在家族病史（0:否 1:是） } - if (!empty($order_inquiry_case['family_history']) && $order_inquiry_case['family_history'] != $patient_family_personal['family_history']) { + if ($order_inquiry_case['family_history'] != $patient_family_personal['family_history']) { $data['family_history'] = $order_inquiry_case['family_history']; // 家族病史描述 } - if (!empty($order_inquiry_case['is_pregnant']) && $order_inquiry_case['is_pregnant'] != $patient_family_personal['is_pregnant']) { + if ($order_inquiry_case['is_pregnant'] != $patient_family_personal['is_pregnant']) { $data['is_pregnant'] = $order_inquiry_case['is_pregnant']; // 是否备孕、妊娠、哺乳期（0:否 1:是） } - if (!empty($order_inquiry_case['is_pregnant']) && $order_inquiry_case['is_pregnant'] != $patient_family_personal['is_pregnant']) { + if ($order_inquiry_case['is_pregnant'] != $patient_family_personal['is_pregnant']) { $data['is_pregnant'] = $order_inquiry_case['is_pregnant']; // 是否备孕、妊娠、哺乳期（0:否 1:是） }