问诊结束列表+民族
This commit is contained in:
@@ -407,10 +407,19 @@ class InquiryService extends BaseService
|
||||
$params['family_id'] = $order_inquiry_case['family_id'];
|
||||
$patient_family = PatientFamily::getOne($params);
|
||||
|
||||
// 民族
|
||||
$nation_name = "";
|
||||
if (isset($patient_family)){
|
||||
if (!empty($patient_family['nation_name'])){
|
||||
$nation_name = $patient_family['nation_name'];
|
||||
}else{
|
||||
// if (!empty($order_inquiry_case['']))
|
||||
}
|
||||
}
|
||||
$order_inquiry_case['height'] = $order_inquiry_case['height'] ?: $patient_family['height'] ?: NULL;
|
||||
$order_inquiry_case['weight'] = $order_inquiry_case['weight'] ?: $patient_family['weight'] ?: NULL;
|
||||
$order_inquiry_case['job_name'] = $patient_family['job_name'] ?? "";
|
||||
$order_inquiry_case['nation_name'] = $patient_family['nation_name'] ?? "";
|
||||
$order_inquiry_case['nation_name'] = $nation_name;
|
||||
$order_inquiry_case['marital_status'] = $patient_family['marital_status'] ?? 0;
|
||||
$order_inquiry_case['id_number'] = $patient_family['id_number'] ?? "";
|
||||
|
||||
@@ -822,6 +831,8 @@ class InquiryService extends BaseService
|
||||
$page = $this->request->input('page', 1);
|
||||
$per_page = $this->request->input('per_page', 10);
|
||||
|
||||
// 获取该医生下问诊过的用户id和家庭成员id
|
||||
|
||||
$params = array();
|
||||
$params['doctor_id'] = $user_info['client_user_id'];
|
||||
|
||||
@@ -849,14 +860,26 @@ class InquiryService extends BaseService
|
||||
'created_at',
|
||||
];
|
||||
|
||||
$result = OrderInquiry::getInquiryStatusWithDoctorPage($params, $inquiry_status_params, $fields, $page, $per_page);
|
||||
$result = OrderInquiry::getInquiryEndPage($params, $fields, $page, $per_page);
|
||||
|
||||
if (!empty($result['data'])) {
|
||||
foreach ($result['data'] as &$item) {
|
||||
$params = array();
|
||||
$params['message_send_result'] = 1;
|
||||
$params['order_inquiry_id'] = $item['order_inquiry_id'];
|
||||
$item['message_im'] = MessageIm::getOne($params);
|
||||
$params['doctor_id'] = $user_info['client_user_id'];
|
||||
$params['user_id'] = $item['user_id'];
|
||||
|
||||
$inquiry_status_params = [5,6];
|
||||
$order_inquiry = OrderInquiry::getInquiryStatusLastOne($params,$inquiry_status_params,$fields);
|
||||
|
||||
unset($item['user_id']);
|
||||
if (!empty($order_inquiry)){
|
||||
$item = $order_inquiry->toArray();
|
||||
|
||||
$params = array();
|
||||
$params['message_send_result'] = 1;
|
||||
$params['order_inquiry_id'] = $order_inquiry['order_inquiry_id'];
|
||||
$item['message_im'] = MessageIm::getOne($params);
|
||||
}
|
||||
}
|
||||
}
|
||||
return success($result);
|
||||
@@ -1332,10 +1355,6 @@ class InquiryService extends BaseService
|
||||
$params[] = ['patient_id', '=', $patient_id];
|
||||
}
|
||||
|
||||
if (!empty($family_id)) {
|
||||
$params[] = ['family_id', '=', $family_id];
|
||||
}
|
||||
|
||||
$params = array();
|
||||
$params[] = ['patient_id', '=', $patient_id];
|
||||
$params[] = ['doctor_id', '=', $doctor_id];
|
||||
@@ -1511,6 +1530,9 @@ class InquiryService extends BaseService
|
||||
$wait_assign_time = 60 * 5;
|
||||
$wait_inquiry_time = 60 * 10;
|
||||
$wait_finish_time = 60 * 30;
|
||||
} elseif ($order_inquiry['inquiry_type'] == 5) {
|
||||
// 问诊购药
|
||||
$wait_finish_time = 60 * 60 * 24 * 3;
|
||||
}
|
||||
|
||||
switch ($order_inquiry['inquiry_status']) {
|
||||
|
||||
Reference in New Issue
Block a user