diff --git a/application/app/controller/Base.php b/application/app/controller/Base.php
index d2647e5..e198413 100644
--- a/application/app/controller/Base.php
+++ b/application/app/controller/Base.php
@@ -54,12 +54,7 @@ class Base extends Controller{
         if($type!=1){
             return true;
         }
-        // $result = Db::table('app_card_data')->where(['is_del'=>1])->cache(true,3600)->column('id');//查询结果缓存3600秒
         $result = Db::table('app_card_data')->where(['is_del'=>0])->cache(true,3600)->select();//查询结果缓存3600秒
-        // dump($result);
-        // die;
-        // dump(array_column($result, 'id'));
-        // die;
         if(empty(array_diff($array, array_column($result, 'id')))){
             return true;// 数组是一维的且只包含数字,且已经跟数据库比对过，每个数值都是有效
         }else{
@@ -78,20 +73,16 @@ class Base extends Controller{
     public function is_tel_email($str) {  
         // 手机号码的正则表达式（中国大陆格式）(下面正则实际判断的是是否为11位数字)
         $mobilePattern = '/^\d{11}$/';  
-          
         // 电子邮件地址的正则表达式  
         $emailPattern = '/^[a-zA-Z0-9._%-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/';  
-          
         // 判断是否为手机号码  
         if (preg_match($mobilePattern, $str)) {  
             return 'tel';  
         }  
-          
         // 判断是否为电子邮件地址  
         if (preg_match($emailPattern, $str)) {  
             return 'email';  
         }  
-          
         // 如果都不是，返回其他  
         return false;  
     }  
@@ -100,10 +91,8 @@ class Base extends Controller{
     public function calculate_age($data = '1991-04-20'){
         $today = time(); // 获取当前时间的 Unix 时间戳  
         $birthDate = strtotime($data); // 将出生日期字符串转换为 Unix 时间戳  
-        
         if ($birthDate !== false) {  
             $age = date('Y', $today) - date('Y', $birthDate);  
-            
             // 如果当前年份的月份和日期小于出生年份的月份和日期，那么年龄减一  
             if (date('m-d', $today) < date('m-d', $birthDate)) {  
                 $age--;  
@@ -118,7 +107,6 @@ class Base extends Controller{
         $hours = intval($data / 3600);  
         $minutes = intval(($data % 3600) / 60);  
         $remainingSeconds = $data % 60;  
-    
         return [  
             'h' => str_pad($hours, 2, '0', STR_PAD_LEFT),  
             'm' => str_pad($minutes, 2, '0', STR_PAD_LEFT),  
@@ -164,27 +152,19 @@ class Base extends Controller{
     public function calculateAgeInMonthsWithPrecision($birthDateStr) {
         // 获取当前日期
         $now = new \DateTime();
-
         // 将出生日期字符串转换为 DateTime 对象
         $birthDate = \DateTime::createFromFormat('Y-m-d', $birthDateStr);
-
         // 计算两者之间的差距（以月为单位，包含部分月份的小数）
         $interval = $now->diff($birthDate);
         $ageInMonths = $interval->y * 12 + $interval->m; // 年份乘以12加上月份
         $remainingDays = $interval->d; // 当前月内的剩余天数
-
         // 将剩余天数转换为小数月份（假设一个月为30天，进行近似计算）
         $partialMonth = $remainingDays / 30;
-
         // 结果精确到小数点后两位
         $ageInMonthsPrecise = round($ageInMonths + $partialMonth, 2);
-
         return $ageInMonthsPrecise;
     }
-
-
     // 曲线页面-底部统计动作
-    
     public function base_target_initial_cumulative_weight($data = []){
         // 第一种：用户详情（所有数据都有）
         // 第二种：手动记录（只有最新体重）
@@ -204,6 +184,11 @@ class Base extends Controller{
         // dump($result_data);
         return $result_data;
     }
+    
+    // 判断一个参数是否为数字且大于等于0
+    function isPositiveNumber($value) {
+        return is_numeric($value) && $value >= 0;
+    }
 
     
 
diff --git a/application/app/controller/Card.php b/application/app/controller/Card.php
index 8a50e89..2d54a50 100644
--- a/application/app/controller/Card.php
+++ b/application/app/controller/Card.php
@@ -153,25 +153,25 @@ class Card extends Base{
         
         return $this->modify_weight_action($data);
     }
-    // 删除历史数据
-    public function card_del_record_data($data = ['id'=>'16','token'=>'0dafb98a10995c98b5a33b7d59d986ca']){
-        if(count(input('post.')) > 0){
-            $data = input('post.');
-        }
-        if(!array_key_exists('id', $data) || !array_key_exists('token', $data)){
-            return $this->msg(10001);
-        }
-        if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001);
-        }
-        unset($data['token']);
-        $user_data = Db::table('app_card_body_data')->where(['id'=>$data['id']])->update(['is_del'=>1]);
-        if($user_data){
-            return $this->msg([]);
-        }else{
-            return $this->msg(10002);
-        }
-    }
+    // // 删除历史数据
+    // public function card_del_record_data($data = ['id'=>'16','token'=>'0dafb98a10995c98b5a33b7d59d986ca']){
+    //     if(count(input('post.')) > 0){
+    //         $data = input('post.');
+    //     }
+    //     if(!array_key_exists('id', $data) || !array_key_exists('token', $data)){
+    //         return $this->msg(10001);
+    //     }
+    //     if($this->token_time_validate($data['token']) === false){
+    //         return $this->msg(20001);
+    //     }
+    //     unset($data['token']);
+    //     $user_data = Db::table('app_card_body_data')->where(['id'=>$data['id']])->update(['is_del'=>1]);
+    //     if($user_data){
+    //         return $this->msg([]);
+    //     }else{
+    //         return $this->msg(10002);
+    //     }
+    // }
 
     // // 数据对比
     // public function card_data_contrast($data = ['before_id'=>'24','after_id'=>'25','token'=>'0dafb98a10995c98b5a33b7d59d986ca']){
diff --git a/application/app/controller/Pagingcontrast.php b/application/app/controller/Pagingcontrast.php
index e4a19e1..404da05 100644
--- a/application/app/controller/Pagingcontrast.php
+++ b/application/app/controller/Pagingcontrast.php
@@ -15,7 +15,7 @@ class Pagingcontrast extends Base{
     protected $request_result = [
         '2'=>['height'=>['身高','cm'],'weight'=>['体重','kg'],'age'=>['年龄','岁'],'bmi'=>['BMI',''],'fat_w'=>['脂肪量','kg'],'fat_r'=>['脂肪率','%'],'muscleval'=>['肌肉量','kg'],'muscle'=>['肌肉率','%'],'proteinval'=>['蛋白量','kg'],'protein'=>['蛋白率','%'],'water'=>['水分',''],'bone'=>['骨重','kg'],'visceral'=>['内脏指数',''],'sfr'=>['皮下脂肪','%'],'kcal'=>['基础代谢','kcal'],'un_fat_w_weight'=>['去脂体重','kg'],'body_age'=>['体龄',''],'body_level'=>['肥胖等级',''],'body_type'=>['体型','']],
         '6'=>['jump_num'=>['个数',''],'jump_time'=>['时长',''],'jump_kcal'=>['卡路里','kcal']],
-        '8'=>[]
+        '8'=>['one_val'=>['第一次','ml'],'two_val'=>['第二次','ml'],'three_val'=>['第三次','ml'],'average_val'=>['三次平均','ml'],'score'=>['最后成绩','分']]
     ];
 
     protected $pagesize = 10;
@@ -91,6 +91,25 @@ class Pagingcontrast extends Base{
         // die;
         return $this->jump_transfer_interface_data_contrast($data);
     }
+    // 删除历史数据
+    public function del_all_record_data($data = ['id'=>'29','type'=>'2','token'=>'0dafb98a10995c98b5a33b7d59d986ca']){
+        if(count(input('post.')) > 0){
+            $data = input('post.');
+        }
+        if(!array_key_exists('id', $data) || !array_key_exists('type', $data) || !array_key_exists('token', $data)){
+            return $this->msg(10001);
+        }
+        if($this->token_time_validate($data['token']) === false){
+            return $this->msg(20001);
+        }
+        unset($data['token']);
+        $user_data = Db::table($this->db_name[$data['type']])->where(['id'=>$data['id']])->update(['is_del'=>1]);
+        if($user_data){
+            return $this->msg([]);
+        }else{
+            return $this->msg(10002);
+        }
+    }
     ################################################请求接口################################################
     ################################################请求接口################################################
     ################################################请求接口################################################
@@ -101,17 +120,20 @@ class Pagingcontrast extends Base{
         }else if($data['type'] == '6'){
             return $this->get_skip_record_data($data,$str);
         }else if($data['type'] == '8'){
-            return $this->get_body_record_data($data,$str);
+            return $this->get_vitalcapacity_record_data($data,$str);
         }
     }
     public function jump_transfer_interface_detailed($data){
-        if($data['type'] == '2'){
-            return $this->get_body_detaile_data_msg($data);
-        }else if($data['type'] == '6'){
-            return $this->msg(10005);
-        }else if($data['type'] == '8'){
-            // return $this->get_body_record_data($data,$str);
-        }
+        return $this->get_all_detaile_data_msg($data);
+        
+        // if($data['type'] == '2'){
+        //     return $this->get_body_detaile_data_msg($data);
+        // }else if($data['type'] == '6'){
+        //     return $this->get_skip_detaile_data_msg($data);
+        //     // return $this->msg(10005);
+        // }else if($data['type'] == '8'){
+        //     // return $this->get_body_record_data($data,$str);
+        // }
     }
     public function jump_transfer_interface_data_contrast($data){
         if($data['type'] == '2'){
@@ -125,6 +147,7 @@ class Pagingcontrast extends Base{
 
     ################################################业务部分################################################
     
+
     // 获取记录信息列表(分组)-身体
     // 获取记录信息列表(分页)-身体
     public function get_body_record_data($data,$type){
@@ -231,16 +254,86 @@ class Pagingcontrast extends Base{
         }
         return $this->msg($return_result);
     }
+    // 获取记录信息列表(分组)-肺活量
+    // 获取记录信息列表(分页)-肺活量
+    public function get_vitalcapacity_record_data($data,$type){
+        $return_result = [];
+        if($type == 'group'){
+            $result = Db::query("
+            select 
+            id,
+            CONVERT(varchar(10), record_time, 120) AS r_t,
+            CONVERT(varchar(19), record_time, 120) AS record_time,
+            one_val as v1,
+            two_val as v2,
+            three_val as v3
+            average_val as v4
+            score as v5
+            from app_card_vitalcapacity_data 
+            where aud_id='".$data['aud_id']."'
+            and record_time between '".$data['s_time']."' and '".$data['e_time']."' 
+            and is_del = 0
+            order by record_time desc");
+            foreach ($result as $key => $value) {
+                // $time_t = $this->handle_hour_branch_second($value['v2']);
+                array_push($return_result, [
+                    'id'=>$value['id'],
+                    'v1'=>$value['v1'],
+                    'v2'=>$value['v2'],
+                    'v3'=>$value['v3'],
+                    'v4'=>$value['v4'],
+                    'v5'=>explode(',',$value['v5']),
+                    'v1_name'=>'第一次',
+                    'v2_name'=>'第二次',
+                    'v3_name'=>'第三次',
+                    'v4_name'=>'平均',
+                    'v5_name'=>'成绩',
+                    'r_t'=>str_replace('-', '/', $value['r_t'])
+                ]);
+            }
+        }else{
+            $result = Db::table('app_card_vitalcapacity_data')->where(['aud_id'=>$data['aud_id'],'is_del'=>0])->field("id,record_time,REPLACE(record_time, '-', '/') AS b_time,one_val,two_val,three_val,average_val,score")->order('record_time desc')->page($data['page'],$this->pagesize)->select();
+            $return_result['totalrows'] = Db::table('app_card_vitalcapacity_data')->where(['aud_id'=>$data['aud_id']])->count();
+            $return_result['rows'] = [];
+            $return_result['pageno'] = $data['page'];
+            $return_result['pagesize'] = $this->pagesize;
+            $return_result['totalpage'] = ceil($return_result['totalrows']/$this->pagesize);
+            foreach ($result as $key => $value) {
+                // $time_t = $this->handle_hour_branch_second($value['jump_time']);
+                array_push($return_result['rows'],[
+                    'id'=>$value['id'],
+                    'v1'=>$value['one_val'],
+                    'v2'=>$value['two_val'],
+                    'v3'=>$value['three_val'],
+                    'v4'=>$value['average_val'],
+                    'v5'=>explode(',',$value['score']),
+                    'v1_name'=>'第一次',
+                    'v2_name'=>'第二次',
+                    'v3_name'=>'第三次',
+                    'v4_name'=>'平均',
+                    'v5_name'=>'成绩',
+                    'record_time'=>$value['b_time']
+                ]);
+            }
+        }
+        return $this->msg($return_result);
+    }
+
+    
     // 获取详细历史数据信息
-    public function get_body_detaile_data_msg($data){
+    public function get_all_detaile_data_msg($data){
         $result = Db::table($this->db_name[$data['type']])->where(['id'=>$data['id']])->find();
         if($result){
             $result_data = [];
-            foreach ($this->request_result['2'] as $key => $value) {
+            foreach ($this->request_result[$data['type']] as $key => $value) {
                 $temporary_arr['key_name'] = $key;
                 $temporary_arr['name'] = $value[0];
-                if($key == 'un_fat_w_weight'){
-                    $temporary_arr['value'] = bcsub(explode(',',$result['weight'])[0],explode(',',$result['fat_w'])[0],2);
+                if($data['type'] == 2){
+                    if($key == 'un_fat_w_weight'){
+                        $temporary_arr['value'] = bcsub(explode(',',$result['weight'])[0],explode(',',$result['fat_w'])[0],2);
+                    }else{
+                        $temporary_arr['value'] = explode(',',$result[$key])[0];
+                    }
                 }else{
                     $temporary_arr['value'] = explode(',',$result[$key])[0];
                 }
@@ -253,6 +346,8 @@ class Pagingcontrast extends Base{
         }
         
     }
+
+    
     // 数据对比
     public function get_body_data_contrast($data){
         // dump($data);
diff --git a/application/app/controller/Vitalcapacity.php b/application/app/controller/Vitalcapacity.php
index 4435e19..affc2be 100644
--- a/application/app/controller/Vitalcapacity.php
+++ b/application/app/controller/Vitalcapacity.php
@@ -7,7 +7,15 @@ use think\Db;
 
 class Vitalcapacity extends Base{
     
-    protected $color = ['#FF5656','#FFAB00','#5AD06D','#6492F6','#3967D6'];
+    protected $color = ['无效'=>'#FF5656','不及格'=>'#FF5656','及格'=>'#FFAB00','良好'=>'#5AD06D','优秀'=>'#6492F6','牛逼'=>'#3967D6'];
+    protected $standard0 = ['优秀','良好','及格','不及格','无效'];
+    protected $standard = [
+        ['min_val'=>'90','max_val'=>'100','text'=>'优秀','color'=>'#6492F6'],
+        ['min_val'=>'80','max_val'=>'89','text'=>'良好','color'=>'#5AD06D'],
+        ['min_val'=>'66','max_val'=>'79','text'=>'及格','color'=>'#FFAB00'],
+        ['min_val'=>'10','max_val'=>'65','text'=>'不及格','color'=>'#FF5656'],
+        ['min_val'=>'0','max_val'=>'9','text'=>'无效','color'=>'#FF5656'],
+    ];
     
     protected $result_end_data_mould = [
         'name'=>'',
@@ -18,176 +26,96 @@ class Vitalcapacity extends Base{
         'list'=>[]
     ];
 
+    // 加 bcadd(,,20)
+    // 减 bcsub(,,20)
+    // 乘 bcmul(,,20)
+    // 除 bcdiv(,,20)
     ################################################################接口################################################################
     ################################################################接口################################################################
     ################################################################接口################################################################
 
-    
-
-    // 今日数据
-    public function vitalcapacity_today_data($data = ['aud_id'=>11]){
-        $result = Db::query("
-        select 
-        jump_num,
-        jump_time,
-        jump_kcal,
-        aud_id,
-        CAST(GETDATE() AS DATE) as today_date
-        from app_card_skip_data
-        where 
-        CAST(record_time AS DATE) = CAST(GETDATE() AS DATE)
-        and aud_id = ".$data['aud_id']."
-        ");
-        
-        $return_data = ['jump_num'=>0,'jump_time'=>0,'jump_kcal'=>0];
-        foreach ($result as $key => $value) {
-            $return_data['jump_num'] = $value['jump_num']+$return_data['jump_num'];
-            $return_data['jump_time'] = $value['jump_time']+$return_data['jump_time'];
-            $return_data['jump_kcal'] = $value['jump_kcal']+$return_data['jump_kcal'];
-        }
-        
-        return $this->msg(0,'success',$return_data);
-    }
-
     // 数据记录
-    public function skip_record_data($data = ['aud_id'=>11,'num'=>50,'time'=>60,'kcal'=>150,'record_time'=>'','jump_type'=>'free']){
-
-        if($data['record_time'] == ''){
-            $data['record_time'] = date('Y-m-d H:i:s');
+    public function vitalcapacity_save_record_data($data = ['aud_id'=>'25','one'=>'1500','two'=>'1200','three'=>'1456','time'=>'2024-05-25 10:10:15','token'=>'0dafb98a10995c98b5a33b7d59d986ca']){
+        if(count(input('post.')) > 0){
+            $data = input('post.');
         }
-
-        $user_data = Db::table('app_card_skip_data')->insert([  
-            'create_time' => date('Y-m-d H:i:s'),  
-            'record_time' => $data['record_time'],  
-            'jump_num' => $data['num'],  
-            'jump_time' => $data['time'],  
-            'jump_kcal' => $data['kcal'],  
-            'aud_id' => $data['aud_id'],  
-            'acd_id' => 5,  
-            'jump_type' => $data['num']  
-        ]);
-
-        if($user_data){
-            return $this->msg(0,'success');
-        }else {
-            return $this->msg(10001,'数据记录失败');
-        }
-    }
-
-    // 运动曲线
-    // public function skip_motion_curve($data = ['aud_id'=>'11','time_data'=>['2024']]){
-    public function skip_motion_curve($data = ['aud_id'=>'11','time_data'=>['2024','04']]){
-    // public function skip_motion_curve($data = ['aud_id'=>'11','time_data'=>['2024','12','31']]){
-        // 确保传入的$data是一个数组且包含所需的键  
-        if (!is_array($data) || !isset($data['aud_id'], $data['time_data'])) {  
-            return $this->msg(10001,'参数格式错误'); // 返回false或抛出异常  
-        }  
-  
-        $audId = $data['aud_id'];  
-        $timeData = $data['time_data'];  
-  
-        // 根据$timeData的长度构建不同的查询条件  
-        $map = ['aud_id' => $audId];  
-        switch (count($timeData)) {  
-            case 3: // 年月日  
-                $map['record_time'] = ['between', [date('Y-m-d 00:00:00', strtotime($timeData[0] . '-' . $timeData[1] . '-' . $timeData[2])), date('Y-m-d 23:59:59', strtotime($timeData[0] . '-' . $timeData[1] . '-' . $timeData[2]))]];  
-                break;  
-            case 2: // 年月  
-                $map['record_time'] = ['between', [date('Y-m-01 00:00:00', strtotime($timeData[0] . '-' . $timeData[1])), date('Y-m-t 23:59:59', strtotime($timeData[0] . '-' . $timeData[1]))]];  
-                break;  
-            case 1: // 年  
-                $map['record_time'] = ['between', [date('Y-01-01 00:00:00', strtotime($timeData[0])), date('Y-12-31 23:59:59', strtotime($timeData[0]))]];  
-                break;  
-            default:  
-                return $this->msg(10002,'时间参数错误'); // 无效的时间数据格式  
-        }  
-  
-        // 使用查询构造器进行查询  
-        $result = Db::name('app_card_skip_data')->where($map)->field('jump_num,jump_time,jump_kcal,aud_id,record_time,jump_type,DATEPART(hour, record_time) AS hour,DATEPART(day, record_time) AS day,DATEPART(month, record_time) AS month')->order('record_time')->select();
-        
-        $return_data = ['jump_num'=>['max'=>0,'list'=>[]],'jump_time'=>['max'=>0,'list'=>[]],'jump_kcal'=>['max'=>0,'list'=>[]]];
-        if(count($timeData) == 3){
-            $key_condition = 'hour';
-        }else if(count($timeData) == 2){
-            $key_condition = 'day';
-        }else if(count($timeData) == 1){
-            $key_condition = 'month';
-        }
-        // dump($result);
-        // die;
-        foreach ($result as $key => $value) {
-            if(!array_key_exists($value[$key_condition], $return_data['jump_num']['list'])){
-                $return_data['jump_num']['list'][$value[$key_condition]] = $value['jump_num'];
-            }else{
-                $return_data['jump_num']['list'][$value[$key_condition]] = $return_data['jump_num']['list'][$value[$key_condition]] + $value['jump_num'];
-            }
-            if(!array_key_exists($value[$key_condition], $return_data['jump_time']['list'])){
-                $return_data['jump_time']['list'][$value[$key_condition]] = $value['jump_time'];
-            }else{
-                $return_data['jump_time']['list'][$value[$key_condition]] = $return_data['jump_time']['list'][$value[$key_condition]] + $value['jump_time'];
-            }
-            if(!array_key_exists($value[$key_condition], $return_data['jump_kcal']['list'])){
-                $return_data['jump_kcal']['list'][$value[$key_condition]] = $value['jump_kcal'];
-            }else{
-                $return_data['jump_kcal']['list'][$value[$key_condition]] = $return_data['jump_kcal']['list'][$value[$key_condition]] + $value['jump_kcal'];
-            }
-        }
-
-        foreach ($return_data as $key => $value) {
-            foreach ($value['list'] as $k => $v) {
-                $return_data[$key]['max'] = $v>$return_data[$key]['max']?$v:$return_data[$key]['max'];
-            }
-        }
-
-        return $this->msg(0,'success',$return_data);
-
-        // dump($result);
-        // dump($return_data);
-        // die;
-        // return $result;  
-    }
-
-    // 记录肺活量数据
-    public function vitalcapacity_data_set($data = ['aud_id'=>'20','times'=>[1991,2001,2024],'token'=>'0dafb98a10995c98b5a33b7d59d986ca','record_time'=>"2024-05-08 11:49:21"]){
-        if(count(input()) > 0){
-            $data = input();
-        }
-        if(!array_key_exists('aud_id', $data) || !array_key_exists('times', $data) || !array_key_exists('token', $data)){ 
-            return $this->msg(10001,'数据参数错误');
+        if(!array_key_exists('aud_id', $data) || !array_key_exists('time', $data) || !array_key_exists('token', $data)){
+            return $this->msg(10001);
         }
         if($this->token_time_validate($data['token']) === false){
-            return $this->msg(20001,'登录失效');
+            return $this->msg(20001);
         }
         unset($data['token']);
-        $average_num = intval(array_sum($data['times'])/count($data['times']));
+        $data['one'] = $this->isPositiveNumber($data['one']) === false?0:$data['one'];
+        $data['two'] = $this->isPositiveNumber($data['one']) === false?0:$data['two'];
+        $data['three'] = $this->isPositiveNumber($data['one']) === false?0:$data['three'];
+        return $this->vitalcapacity_save_record_data_action($data);
+    }
+    // 数据报告
+    public function vitalcapacity_data_report($data = ['aud_id'=>'25','token'=>'0dafb98a10995c98b5a33b7d59d986ca']){
+        if(count(input('post.')) > 0){
+            $data = input('post.');
+        }
+        if(!array_key_exists('aud_id', $data) || !array_key_exists('token', $data)){
+            return $this->msg(10001);
+        }
+        if($this->token_time_validate($data['token']) === false){
+            return $this->msg(20001);
+        }
+        unset($data['token']);
+        return $this->vitalcapacity_data_report_action($data);
+    }
 
+    ################################################################业务################################################################
+
+    ################################################################vitalcapacity_save_record_data
+    public function vitalcapacity_save_record_data_action($data){
+        $temporary_arr['aud_id'] = $data['aud_id'];
+        $temporary_arr['record_time'] = $data['time'];
+        $temporary_arr['one'] = $data['one'];
+        $temporary_arr['two'] = $data['two'];
+        $temporary_arr['three'] = $data['three'];
+        $temporary_arr['average'] = bcdiv(bcadd(bcadd($data['one'],$data['two'],2),$data['three'],2),3,2);
+        $temporary_arr['create_time'] = date('Y-m-d H:i:s');
+        $temporary_arr['one_val'] = $data['one'];
+        $temporary_arr['two_val'] = $data['two'];
+        $temporary_arr['three_val'] = $data['three'];
+        $temporary_arr['average_val'] = $temporary_arr['average'];
         $user_msg = Db::name('app_user_data')->where(['id'=>$data['aud_id']])->field('grade,gender')->find();
-        $str = "sex = ".$user_msg['gender']." and ".$user_msg['grade']." <= ".$average_num;
-        
-        $user_achievement = Db::name('pc_vitalcapacity_standard')->where("sex = ".$user_msg['gender']." and ".$user_msg['grade']." <= ".$average_num)->order($user_msg['grade'] .' desc')->limit(1)->select();
-        
-        $result = Db::name('app_card_vitalcapacity_data')->insert([
-            'one'=>$data['times'][0],
-            'two'=>$data['times'][1],
-            'three'=>$data['times'][2],
-            'average'=>$average_num,
-            'score'=>$user_achievement[0]['score'],
-            'average_data'=>$average_num.','.$user_achievement[0]['level'].',无',
-            'aud_id'=>$data['aud_id'],
-            'acd_id'=>8,
-            'create_time'=>date('Y-m-d H:i:s'),
-            'record_time'=>array_key_exists('record_time', $data)?$data['record_time']:date('Y-m-d H:i:s')
-        ]);
-        
-        
-        if($result){
-            return $this->msg(0,'success');
+        if($user_msg){
+            $achievement_judge_data = $this->vitalcapacity_achievement_judge(['average'=>$temporary_arr['average'],'grade'=>$user_msg['grade'],'gender'=>$user_msg['gender']]);
+            
+            $temporary_arr['score'] = $achievement_judge_data['score'].','.$achievement_judge_data['level'].','.$this->color[$achievement_judge_data['level']];
+            $temporary_arr['score_val'] = $achievement_judge_data['score'];
         }else{
-            return $this->msg(10001,'数据记录失败');
+            return $this->msg(10004);
+        }
+        $result = Db::table('app_card_vitalcapacity_data')->insert($temporary_arr);
+        if($result){
+            $time = $result[0]['record_time'];
+            $time = strtotime($time);  
+            $time = date('Y年m月d日 H:i:s', $time);  
+            
+            return $this->msg(['average'=>$temporary_arr['average'].'ml','level'=>$achievement_judge_data['level'],'time'=>$time,'list'=>$this->standard0,'offset'=>$temporary_arr['score_val']]);
+        }else{
+            return $this->msg(10002);
+        }
+    }
+    ################################################################vitalcapacity_data_report
+    public function vitalcapacity_data_report_action($data){
+        $result = Db::table('app_card_vitalcapacity_data')->where(['aud_id'=>$data['aud_id']])->order('record_time desc')->field('record_time,score,average')->limit(1)->select();
+        if(count($result) <= 0){
+            return $this->msg(10004);
+        }else{
+            $time = $result[0]['record_time'];
+            $time = strtotime($time);  
+            $time = date('Y年m月d日 H:i:s', $time);  
+            $o_l = explode(',',$result[0]['score']);
+            return $this->msg(['average'=>$result[0]['average'].'ml','level'=>$o_l[1],'time'=>$time,'list'=>$this->standard0,'offset'=>$o_l[0]]);
         }
 
     }
-
+    
 
 
     
@@ -195,7 +123,21 @@ class Vitalcapacity extends Base{
     ################################################################肺活量数据卡片接口################################################################
     ################################################################肺活量数据卡片接口################################################################
 
-    
+    // 肺活量成绩判断
+    public function vitalcapacity_achievement_judge($data){
+        $str = "sex = ".$data['gender']." and ".$data['grade']." <= ".$data['average']; 
+        $user_achievement = Db::name('pc_vitalcapacity_standard')->where($str)->order($data['grade'] .' desc')->field('level,score,'.$data['grade'])->limit(1)->select();
+        if(count($user_achievement)<=0){
+            $user_achievement = ['level'=>'无效','score'=>'0'];
+        }
+        return $user_achievement[0];
+    }
+    // 肺活量判断区间
+    public function vitalcapacity_standard_interval($data){
+        // 缓存一周
+        
+        
+    }
 
 
     ################################################################other################################################################
diff --git a/application/route.php b/application/route.php
index 0d11eaf..4c081c9 100644
--- a/application/route.php
+++ b/application/route.php
@@ -45,7 +45,8 @@ Route::any('/get_all_record_data_page', 'app/pagingcontrast/get_all_record_data_
 Route::any('/get_all_record_detailed_information', 'app/pagingcontrast/get_all_record_detailed_information');
 // 数据对比
 Route::any('/get_all_card_data_contrast', 'app/pagingcontrast/get_all_card_data_contrast');
-
+// 删除某个历史数据
+Route::any('/card_del_record_data', 'app/pagingcontrast/del_all_record_data');
 
 // ################################登录接口################################
 // 注册接口12
@@ -69,7 +70,6 @@ Route::any('/get_card_all_list', 'app/index/get_card_all_list');
 Route::any('/save_user_card_order', 'app/index/save_user_card_order');
 // 获取年级列表
 Route::any('/get_grade_list', 'app/index/get_grade_list');
-
 // ################################身体数据卡片接口################################
 // 报告页详情
 Route::any('/card_data_detailed', 'app/card/card_data_detailed');
@@ -77,21 +77,10 @@ Route::any('/card_data_detailed', 'app/card/card_data_detailed');
 Route::any('/card_manual_recording', 'app/card/card_manual_recording');
 // 修改初始体重/目标体重
 Route::any('/card_modify_weight', 'app/card/card_modify_weight');
-
-// // 获取所有记录接口(分组)
-// Route::any('/get_card_record_data_group', 'app/card/get_card_record_data_group');
-// // 获取所有记录接口(分页)
-// Route::any('/get_card_record_data_page', 'app/card/get_card_record_data_page');
-// 删除某个历史数据
-Route::any('/card_del_record_data', 'app/card/card_del_record_data');
-
 // 曲线页面图表
 Route::any('/card_curve_chart', 'app/card/card_curve_chart');
 // 曲线页面底部目标
 Route::any('/card_curve_target', 'app/card/card_curve_target');
-// // 数据对比
-// Route::any('/card_data_contrast', 'app/card/card_data_contrast');
-
 // ################################跳绳接口################################
 // 手动记录
 Route::any('/skip_manual_recording', 'app/skip/skip_manual_recording');
@@ -101,11 +90,12 @@ Route::any('/skip_today_data', 'app/skip/skip_today_data');
 Route::any('/skip_curve_chart', 'app/skip/skip_curve_chart');
 // 删除某个历史数据
 Route::any('/skip_del_record_data', 'app/skip/skip_del_record_data');
-
-// Route::any('/generateRandomJumpData', 'app/skip/generateRandomJumpData');
 // ################################肺活量接口################################
-// 今日数据
-Route::any('/vitalcapacity_data_set', 'app/vitalcapacity/vitalcapacity_data_set');
+// 记录数据
+Route::any('/vitalcapacity_save_record_data', 'app/vitalcapacity/vitalcapacity_save_record_data');
+// 报告数据(上次数据)
+Route::any('/vitalcapacity_data_report', 'app/vitalcapacity/vitalcapacity_data_report');
+
 // Route::any('/skip_device_check', 'app/skip/skip_device_check');
 // Route::any('/skip_device_check', 'app/skip/skip_device_check');
 // Route::any('/skip_device_check', 'app/skip/skip_device_check');
@@ -123,7 +113,7 @@ Route::any('/vitalcapacity_data_set', 'app/vitalcapacity/vitalcapacity_data_set'
 // Route::any('/generateRandomJumpData', 'app/skip/generateRandomJumpData');
 // Route::any('/skip_kcal_calculate', 'app/skip/skip_kcal_calculate');
 // Route::any('/readexcel', 'admin/execlaa/readexcel');
-// Route::any('/skip_kcal_calculate', 'app/card/skip_kcal_calculate');
+// Route::any('/vitalcapacity_standard_interval', 'app/vitalcapacity/vitalcapacity_standard_interval');
 
 
 // Route::any('/isNumericArray', 'app/base/isNumericArray');