From b517ab011b2906bf0fade6df8f4a45e678f7a2cc Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Wed, 4 Sep 2024 14:59:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E6=94=B6?=
 =?UTF-8?q?=E8=B4=B9=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/API/Admin/YeWu/HealthCheckupController.php | 2 ++
 Laravel/app/Services/Admin/YeWu/HealthCheckupService.php        | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php
index bbf1070..f4faa44 100644
--- a/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php
+++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/HealthCheckupController.php
@@ -90,6 +90,7 @@ class HealthCheckupController extends Controller
         $type=request('type');
         $org_code=request('org_code');
         $pdfs=request('pdfs');
+        $free_type=request('free_type');
         if(!isset($tijian_num)) return \Yz::echoError1('体检号不能为空');
         if(!isset($id_card_num)) return \Yz::echoError1('身份证不能为空');
         if(!isset($pdfs)) return \Yz::echoError1('pdfs不能为空');
@@ -131,6 +132,7 @@ class HealthCheckupController extends Controller
             "sex"=>$sex,
             "id_card_num"=>$id_card_num,
             "type"=>$type,
+            "fee_type"=>$free_type,
             "institution_id"=>$org_id->id,
             "tijian_num"=>$tijian_num,
             "pdfs"=>isset($pdfs)?json_encode($pdfs,JSON_UNESCAPED_UNICODE):'',
diff --git a/Laravel/app/Services/Admin/YeWu/HealthCheckupService.php b/Laravel/app/Services/Admin/YeWu/HealthCheckupService.php
index 215dea5..576a7d4 100644
--- a/Laravel/app/Services/Admin/YeWu/HealthCheckupService.php
+++ b/Laravel/app/Services/Admin/YeWu/HealthCheckupService.php
@@ -92,6 +92,7 @@ class HealthCheckupService
                 "head_img"=>$img_url,
                 "id_card_num"=>$CheckupInfo['id_card_num'],
                 "type"=>1,
+                "fee_type"=>isset($CheckupInfo['free_type'])?$CheckupInfo['free_type']:null,
                 "industry_type"=>$CheckupInfo['industry_type'],
                 "institution_id"=>$org_id[0]->id,
                 "tijian_time"=>$CheckupInfo['tijian_time'],