From 29bca068613a154e7f608eef0af3c60f6dee1efe Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Fri, 25 Oct 2024 22:11:20 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AF=B9=E6=8E=A5=E6=A0=B8?=
 =?UTF-8?q?=E7=A3=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/API/H5/NMRController.php | 24 +++++++++++++++----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/NMRController.php b/Laravel/app/Http/Controllers/API/H5/NMRController.php
index c3fa580..fd51e93 100644
--- a/Laravel/app/Http/Controllers/API/H5/NMRController.php
+++ b/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,
         ];
       }