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-30 11:57:22 +08:00
parent b5739783ad
commit 055bfc09f9
5 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,6 +185,8 @@ class DetectionCompleteDelayDirectConsumer extends ConsumerMessage
$data['age'] = $patient_family['age'] ?? null; // 患者年龄 $data['age'] = $patient_family['age'] ?? null; // 患者年龄
$data['height'] = $patient_family['height'] ?: null; // 身高（cm） $data['height'] = $patient_family['height'] ?: null; // 身高（cm）
$data['weight'] = $patient_family['weight'] ?: null;; // 体重（kg） $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;; // 民族名称
$order_inquiry_case = OrderInquiryCase::addOrderInquiryCase($data); $order_inquiry_case = OrderInquiryCase::addOrderInquiryCase($data);
if (empty($order_inquiry_case)) { if (empty($order_inquiry_case)) {
Db::rollBack(); Db::rollBack();

2
app/Controller/CallBackController.php
View File

@ -1813,6 +1813,8 @@ class CallBackController extends AbstractController
$data['age'] = $patient_family['age'] ?? null; // 患者年龄 $data['age'] = $patient_family['age'] ?? null; // 患者年龄
$data['height'] = $patient_family['height'] ?: null; // 身高（cm） $data['height'] = $patient_family['height'] ?: null; // 身高（cm）
$data['weight'] = $patient_family['weight'] ?: null;; // 体重（kg） $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;; // 民族名称
$order_inquiry_case = OrderInquiryCase::addOrderInquiryCase($data); $order_inquiry_case = OrderInquiryCase::addOrderInquiryCase($data);
if (empty($order_inquiry_case)) { if (empty($order_inquiry_case)) {
Db::rollBack(); Db::rollBack();

12
app/Model/OrderInquiryCase.php
View File

@ -32,12 +32,14 @@ use Hyperf\Snowflake\Concern\Snowflake;
* @property string $family_history 家族病史描述 * @property string $family_history 家族病史描述
* @property int $is_pregnant 是否备孕、妊娠、哺乳期（0:否 1:是） * @property int $is_pregnant 是否备孕、妊娠、哺乳期（0:否 1:是）
* @property string $pregnant 备孕、妊娠、哺乳期描述 * @property string $pregnant 备孕、妊娠、哺乳期描述
* @property int $is_taboo 是否存在禁忌药物（0:否 1:是）问诊购药时存在 * @property int $is_taboo 是否服用过禁忌药物，且无相关禁忌（0:否 1:是）问诊购药时存在
* @property int $nation_id 民族
* @property string $nation_name 民族名称
* @property \Carbon\Carbon $created_at 创建时间 * @property \Carbon\Carbon $created_at 创建时间
* @property \Carbon\Carbon $updated_at 修改时间 * @property \Carbon\Carbon $updated_at 修改时间
* @property-read BasicJob $BasicJob * @property-read BasicJob|null $BasicJob
* @property-read BasicNation $BasicNation * @property-read BasicNation|null $BasicNation
* @property-read OrderInquiry $OrderInquiry * @property-read OrderInquiry|null $OrderInquiry
*/ */
class OrderInquiryCase extends Model class OrderInquiryCase extends Model
{ {
@ -51,7 +53,7 @@ class OrderInquiryCase extends Model
/** /**
* The attributes that are mass assignable. * The attributes that are mass assignable.
*/ */
protected array $fillable = ['inquiry_case_id', 'user_id', 'patient_id', 'order_inquiry_id', 'family_id', 'relation', 'status', 'name', 'sex', 'age', 'height', 'weight', 'disease_class_id', 'disease_class_name', 'diagnosis_date', 'disease_desc', 'diagnose_images', 'is_allergy_history', 'allergy_history', 'is_family_history', 'family_history', 'is_pregnant', 'pregnant', 'is_taboo', 'created_at', 'updated_at']; protected array $fillable = ['inquiry_case_id', 'user_id', 'patient_id', 'order_inquiry_id', 'family_id', 'relation', 'status', 'name', 'sex', 'age', 'height', 'weight', 'disease_class_id', 'disease_class_name', 'diagnosis_date', 'disease_desc', 'diagnose_images', 'is_allergy_history', 'allergy_history', 'is_family_history', 'family_history', 'is_pregnant', 'pregnant', 'is_taboo', 'nation_id', 'nation_name', 'created_at', 'updated_at'];
protected string $primaryKey = "inquiry_case_id"; protected string $primaryKey = "inquiry_case_id";

2
app/Services/DetectionService.php
View File

@ -689,6 +689,8 @@ class DetectionService extends BaseService
$data['age'] = $patient_family['age'] ?? null; // 患者年龄 $data['age'] = $patient_family['age'] ?? null; // 患者年龄
$data['height'] = $patient_family['height'] ?: null; // 身高（cm） $data['height'] = $patient_family['height'] ?: null; // 身高（cm）
$data['weight'] = $patient_family['weight'] ?: null;; // 体重（kg） $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;; // 民族名称
$order_inquiry_case = OrderInquiryCase::addOrderInquiryCase($data); $order_inquiry_case = OrderInquiryCase::addOrderInquiryCase($data);
if (empty($order_inquiry_case)) { if (empty($order_inquiry_case)) {
Db::rollBack(); Db::rollBack();

4
app/Services/InquiryService.php
View File

@ -413,7 +413,9 @@ class InquiryService extends BaseService
if (!empty($patient_family['nation_name'])){ if (!empty($patient_family['nation_name'])){
$nation_name = $patient_family['nation_name']; $nation_name = $patient_family['nation_name'];
}else{ }else{
// if (!empty($order_inquiry_case[''])) if (!empty($order_inquiry_case['nation_name'])){
$nation_name = $order_inquiry_case['nation_name'];
}
} }
} }
$order_inquiry_case['height'] = $order_inquiry_case['height'] ?: $patient_family['height'] ?: NULL; $order_inquiry_case['height'] = $order_inquiry_case['height'] ?: $patient_family['height'] ?: NULL;