diff --git a/application/app/controller/Card.php b/application/app/controller/Card.php
index 10fa5d0..cafc8cf 100644
--- a/application/app/controller/Card.php
+++ b/application/app/controller/Card.php
@@ -263,14 +263,16 @@ class Card extends Controller{
     // 身体数据对比
     function body_data_contrast($data = ['acd_id'=>'2','data'=>[1,10]]){
         $between_num = implode(',',$data['data']);
-        dump($between_num);
-        
+        $calculate_arr = [];
         $result = Db::query("
         select 
         acbd.id,
         acbd.height,
         acbd.weight,
         acbd.bmi,
+        acbd.fat_w,
+        acbd.record_time,
+        REPLACE(CONVERT(varchar(10), acbd.record_time, 23), '-', '/') AS b_time,
         aud.nickname,
         aud.gender,
         aud.birthday
@@ -278,9 +280,37 @@ class Card extends Controller{
         left join app_user_data as aud on acbd.aud_id=aud.id  
         where acbd.id in (".$between_num.")
         ");
-        
-        dump($result);
-        die;
+        if(!$result || count($result)<2){
+            return $this->msg(10001,'数据查询错误');
+        }
+        foreach ($data['data'] as $key => $value) {
+            foreach ($result as $k => $v) {
+                if($value == $v['id']){
+                    array_push($calculate_arr, $v);
+                }
+            }
+        }
+
+        $return_data['nickname'] = $calculate_arr[0]['nickname'];
+        if($calculate_arr[0]['gender']==1){
+            $return_data['gender'] = '男';
+        }else if ($calculate_arr[0]['gender']==2) {
+            $return_data['gender'] = '女';
+        }else{
+            $return_data['gender'] = '保密';
+        }
+        // bcsub(,,20)
+        $return_data['age'] = $this->calculate_age($calculate_arr[0]['birthday']);
+        $return_data['time'] = $this->daysSince($calculate_arr[0]['record_time'],$calculate_arr[1]['record_time']);
+        $return_data['weight_loss'] = bcsub($calculate_arr[1]['weight'],$calculate_arr[0]['weight'],1);
+        $return_data['reduce_fat'] = bcsub(explode(',',$calculate_arr[1]['fat_w'])[0],explode(',',$calculate_arr[0]['fat_w'])[0],2);
+        $return_data['between_time'] = $calculate_arr[0]['b_time'].'-'.$calculate_arr[1]['b_time'];
+        $return_data['execl_data']['height'] = ['身高',bcsub($calculate_arr[1]['height'],$calculate_arr[0]['height'],1),$calculate_arr[0]['height'],$calculate_arr[1]['height']];
+        $return_data['execl_data']['weight'] = ['体重',bcsub($calculate_arr[1]['weight'],$calculate_arr[0]['weight'],1),$calculate_arr[0]['weight'],$calculate_arr[1]['weight']];
+        $return_data['execl_data']['bmi'] = ['BMI',bcsub($calculate_arr[1]['bmi'],$calculate_arr[0]['bmi'],1),$calculate_arr[0]['bmi'],$calculate_arr[1]['bmi']];
+        // dump($return_data);
+        // die;
+        return $this->msg(0,'success',$return_data);
     }