From 30695418a6a0d2e7c6c8c08a91c7b9282035c2aa Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Sun, 23 Apr 2023 09:25:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=84=E6=96=B9=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E8=AF=A6=E6=83=85=EF=BC=8C=E6=94=B6=E8=B4=A7=E5=9C=B0?=
 =?UTF-8?q?=E5=9D=80=E5=AD=97=E6=AE=B5=E6=A0=BC=E5=BC=8F=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=AE=B6=E5=BA=AD=E6=88=90=E5=91=98=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Request/PatientFamilyRequest.php  |  4 +--
 app/Services/PatientFamilyService.php | 38 ++++++++++++++++++---------
 app/Services/PatientOrderService.php  |  2 +-
 3 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/app/Request/PatientFamilyRequest.php b/app/Request/PatientFamilyRequest.php
index 481cbb5..0f9ec56 100644
--- a/app/Request/PatientFamilyRequest.php
+++ b/app/Request/PatientFamilyRequest.php
@@ -122,7 +122,7 @@ class PatientFamilyRequest extends FormRequest
             'smoke_status' => ['sometimes','numeric','min:1','max:5'],
             'chemical_compound_status' => ['sometimes','numeric','min:1','max:4'],
             'family_id' => "required",
-            'disease_class_id' => "required",
+//            'disease_class_id' => "required",
             'diagnosis_date' => ['sometimes','date'],
         ];
     }
@@ -169,7 +169,7 @@ class PatientFamilyRequest extends FormRequest
             'chemical_compound_status.min' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR),
             'chemical_compound_status.max' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR),
             'family_id.required' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR),
-            'disease_class_id.required' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR),
+//            'disease_class_id.required' => HttpEnumCode::getMessage(HttpEnumCode::CLIENT_HTTP_ERROR),
             'diagnosis_date.date' => "日期格式错误",
         ];
     }
diff --git a/app/Services/PatientFamilyService.php b/app/Services/PatientFamilyService.php
index 1bcfc30..2f56dfe 100644
--- a/app/Services/PatientFamilyService.php
+++ b/app/Services/PatientFamilyService.php
@@ -839,23 +839,35 @@ class PatientFamilyService extends BaseService
         $data['family_id'] = $request_params['family_id'];
         $data['patient_id'] = $user_info['client_user_id'];
 
-        if (!empty($request_params['disease_class_id'])){
-            // 疾病分类id-系统
-            $data['disease_class_id'] = $request_params['disease_class_id'];
+        if (isset($request_params['disease_class_id'])){
+            if (!empty($request_params['disease_class_id'])){
+                // 疾病分类id-系统
+                $data['disease_class_id'] = $request_params['disease_class_id'];
 
-            // 检测疾病是否正确
-            $params = array();
-            $params['disease_class_id'] = $request_params['disease_class_id'];
-            $disease_class = DiseaseClass::getOne($params);
-            if (empty($disease_class)){
-                return fail(HttpEnumCode::HTTP_ERROR,"疾病数据错误");
+                // 检测疾病是否正确
+                $params = array();
+                $params['disease_class_id'] = $request_params['disease_class_id'];
+                $disease_class = DiseaseClass::getOne($params);
+                if (empty($disease_class)){
+                    return fail(HttpEnumCode::HTTP_ERROR,"疾病数据错误");
+                }
+
+                $data['disease_class_name'] = $disease_class['disease_class_name'];
+            }
+        }
+
+        if (isset($request_params['diagnosis_date'])){
+            if (!empty($request_params['diagnosis_date'])){
+                $data['diagnosis_date'] = $request_params['diagnosis_date'];
+            }
+        }
+
+        if (isset($request_params['diagnosis_hospital'])){
+            if (!empty($request_params['diagnosis_hospital'])){
+                $data['diagnosis_hospital'] = $request_params['diagnosis_hospital'];
             }
-
-            $data['disease_class_name'] = $disease_class['disease_class_name'];
         }
 
-        $data['diagnosis_date'] = $request_params['diagnosis_date'];
-        $data['diagnosis_hospital'] = $request_params['diagnosis_hospital'];
         if (isset($request_params['is_take_medicine'])){
             $data['is_take_medicine'] = $request_params['is_take_medicine'];
             $data['drugs_name'] = $request_params['drugs_name'];
diff --git a/app/Services/PatientOrderService.php b/app/Services/PatientOrderService.php
index 7bd45f6..54e72ca 100644
--- a/app/Services/PatientOrderService.php
+++ b/app/Services/PatientOrderService.php
@@ -1347,7 +1347,7 @@ class PatientOrderService extends BaseService
 
         // 无默认地址，选择第一个
         if (empty($user_ship_address)) {
-            $user_ship_address = $user_ship_addresss[0] ?? [];
+            $user_ship_address = $user_ship_addresss[0] ?? NULL;
         }
 
         $result = array();