From cd9e43337e78e508c0060c74cedb1c78d8f5f520 Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Tue, 9 May 2023 11:41:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=B6=E5=BA=AD=E6=88=90?=
 =?UTF-8?q?=E5=91=98-=E5=81=A5=E5=BA=B7=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Request/PatientFamilyRequest.php  | 7 +++++--
 app/Services/PatientFamilyService.php | 8 ++++++--
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/Request/PatientFamilyRequest.php b/app/Request/PatientFamilyRequest.php
index 9c656e0..fec76c5 100644
--- a/app/Request/PatientFamilyRequest.php
+++ b/app/Request/PatientFamilyRequest.php
@@ -78,14 +78,16 @@ class PatientFamilyRequest extends FormRequest
             'disease_class_id',
             'diagnosis_date',// 确诊日期
             'diagnosis_hospital',//确诊医院
-            'drugs_name', // 家族病史
+            'is_take_medicine', // 正在服药（0:否 1:是）
+            'drugs_name', // 正在服药名称
         ],
         'addFamilyHealth' => [ // 新增家庭成员-健康情况
             'family_id',
             'disease_class_id',
             'diagnosis_date',// 确诊日期
             'diagnosis_hospital',//确诊医院
-            'drugs_name', // 家族病史
+            'is_take_medicine', // 正在服药（0:否 1:是）
+            'drugs_name', // 正在服药名称
         ],
     ];
 
@@ -120,6 +122,7 @@ class PatientFamilyRequest extends FormRequest
             'drink_wine_status' => ['sometimes',Rule::in([1,2,3,4,5,null])],
             'smoke_status' => ['sometimes','numeric',Rule::in([1,2,3,4,5,null])],
             'chemical_compound_status' => ['sometimes',Rule::in([1,2,3,4,null])],
+            'is_take_medicine' => ['sometimes',Rule::in([0,1,null])],
             'family_id' => "required",
             'diagnosis_date' => ['sometimes','date'],
         ];
diff --git a/app/Services/PatientFamilyService.php b/app/Services/PatientFamilyService.php
index 01a6b0d..5b5f488 100644
--- a/app/Services/PatientFamilyService.php
+++ b/app/Services/PatientFamilyService.php
@@ -826,6 +826,7 @@ class PatientFamilyService extends BaseService
         if (isset($request_params['is_take_medicine'])){
             if ($request_params['is_take_medicine'] != $patient_family_health['is_take_medicine']){
                 $data['is_take_medicine'] = $request_params['is_take_medicine'];
+
                 if ($request_params['drugs_name'] != $patient_family_health['drugs_name']){
                     $data['drugs_name'] = $request_params['drugs_name'];
                 }
@@ -905,8 +906,11 @@ class PatientFamilyService extends BaseService
         }
 
         if (isset($request_params['is_take_medicine'])){
-            $data['is_take_medicine'] = $request_params['is_take_medicine'];
-            $data['drugs_name'] = $request_params['drugs_name'];
+            if ($request_params['is_take_medicine'] != null){
+                $data['is_take_medicine'] = $request_params['is_take_medicine'];
+                $data['drugs_name'] = $request_params['drugs_name'] ?? "";
+            }
+
         }
         $patient_family_health = PatientFamilyHealth::addPatientFamilyHealth($data);
         if (empty($patient_family_health)){