调整对接核磁

Laravel/app/Http/Controllers/API/H5/NMRController.php

@@ -30,13 +30,19 @@ class NMRController extends Controller
     }
     $aspnet=new AspNetZhuanController();
     $list=[];
-    $nmr=$aspnet::GetNmrList(['yyid'=>6,'data'=>$days],uniqid());
+    $nmr=$aspnet::GetNmrList(['yyid'=>6,'data'=>$days ,'action'=>"1"],uniqid());
 
     //获取每日数量
     foreach($nmr as $k=>$v){
+      $t_v=[];
+      foreach ($v as $k1 => $v1) {
+        if($v1['keyong']==0){
+          $t_v[]=$v1;
+        }
+      }
       $list[]=[
         'date'=>$k,
-        'count'=>count($v)
+        'count'=>count($t_v)
       ];
     }
 
@@ -85,23 +91,31 @@ class NMRController extends Controller
 
     $aspnet=new AspNetZhuanController();
     $week7=[];
-    $nmr=$aspnet::GetNmrList(['yyid'=>6,'data'=>$days7],uniqid());
+
+    $nmr=$aspnet::GetNmrList(['yyid'=>6,'data'=>$days7,'action'=>"1"],uniqid());
     //获取每日数量
     foreach($nmr as $k=>$v){
+      $t_v=[];
+      foreach ($v as $k1 => $v1) {
+        if($v1['keyong']==0){
+          $t_v[]=$v1;
+        }
+      }
       $xingqi=\App\Lib\Tools::GetWeekName($k);
       $week7[]=[
         'date'=>$k,
-        'count'=>count($v),
+        'count'=>count($t_v),
         'xingqi'=>$xingqi
       ];
     }
+
     $list=[];
     if(isset($nmr[$date])){
       foreach($nmr[$date] as $k=>$v){
         $list[]=[
           'id'=>$v['TimeNum'],
           'time'=>$v['Time'],
-          'status'=>$v['State'],
+          'status'=>$v['keyong']==="0"?1:2,
         ];
       }