From 3be4840f9c20f82e984dfdcbdef1b1610109746b Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Sat, 28 Sep 2024 15:48:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A8=A1=E6=8B=9F=E6=B5=8B=E8=AF=95=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/API/H5/ComboController.php    |  3 +-
 .../Http/Controllers/API/H5/NMRController.php | 39 ++++++++++++++++++-
 h5/config.js                                  |  4 +-
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/H5/ComboController.php b/Laravel/app/Http/Controllers/API/H5/ComboController.php
index 476e6a6..9becdc1 100644
--- a/Laravel/app/Http/Controllers/API/H5/ComboController.php
+++ b/Laravel/app/Http/Controllers/API/H5/ComboController.php
@@ -96,6 +96,7 @@ select combo_id as c_id,count(*) as count from orders where status in(2,4) group
 ) as b on a.combo_id=b.c_id  where a.status=1" . $sql, $canshu);
 
     foreach ($combos as $key => $combo) {
+      $combo->count=$combo->count?$combo->count:0;
       $tags = json_decode($combo->tags, true);
       $combo->tags2 = json_decode($combo->tags2, true);
       foreach ($tags as $k => $tag) {
@@ -216,7 +217,7 @@ select combo_id as c_id,count(*) as sale_count from orders where status in(2,4)
       $combo_info['combo_name'] = $combo->name;
       $combo_info['crowd_name'] = $combo->crowd_name;
       $combo_info['img'] = $combo->cover;
-      $combo_info['sale_count'] = $combo->sale_count;
+      $combo_info['sale_count'] = $combo->sale_count==null?0:$combo->sale_count;
       $tags = json_decode($combo->tags, true);
       $combo->tags2 = json_decode($combo->tags2, true);
       foreach ($tags as $k => $tag) {
diff --git a/Laravel/app/Http/Controllers/API/H5/NMRController.php b/Laravel/app/Http/Controllers/API/H5/NMRController.php
index e623c72..e79f4cf 100644
--- a/Laravel/app/Http/Controllers/API/H5/NMRController.php
+++ b/Laravel/app/Http/Controllers/API/H5/NMRController.php
@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\API\H5;
 
 use App\Http\Controllers\Controller;
+use DateTime;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
@@ -32,7 +33,14 @@ class NMRController extends Controller
   {
     $hospital_id =request('hospital');
     $date=request('date');
-
+// 获取前后各三天的日期
+    $dateTime = new DateTime($date);
+    $days7=[];
+    for ($i = -3; $i <= 3; $i++) {
+      $dateTimeClone = clone $dateTime; // 克隆对象以避免修改原对象
+      $dateTimeClone->modify("$i days"); // 修改日期
+      $days7[] = $dateTimeClone->format('Y-m-d'); // 按照需要的格式添加到结果数组
+    }
     $list=[
       [
         'id'=>1,
@@ -45,6 +53,33 @@ class NMRController extends Controller
         'time'=>'10:45'
       ]
     ];
-    return \Yz::Return(true,"查询完成",['list'=>$list]);
+    $weeklist=[[
+      'date'=>'2024-09-28',
+      'count'=>20,
+    ]
+
+    ];
+    $week7=[];
+    $k=0;
+    foreach ($days7 as $date) {
+      $xingqi=\App\Lib\Tools::GetWeekName($date);
+      $week7[]=[
+        'date'=>$date,
+        'count'=>0,
+        'xingqi'=>$xingqi
+      ];
+      foreach ($weeklist as $plan) {
+        if($plan['date'] == $date){
+          $week7[$k]=[
+            'date'=>$date,
+            'xingqi'=>$xingqi,
+            'count'=>$plan['count']
+          ];
+          break;
+        }
+      }
+      $k++;
+    }
+    return \Yz::Return(true,"查询完成",['list'=>$list,'weeklist'=>$week7]);
   }
 }
diff --git a/h5/config.js b/h5/config.js
index 3b12687..3822cc9 100644
--- a/h5/config.js
+++ b/h5/config.js
@@ -1,6 +1,6 @@
 const app_type = 'gzh'
-//const base_url="https://api.hainan2024.sa0.online" //开发环境
-const base_url="http://124.225.137.54:39080"  //正式环境
+const base_url="https://api.hainan2024.sa0.online" //开发环境
+//const base_url="http://124.225.137.54:39080"  //正式环境
 const config = {
 	api_map_url: base_url+'/api/ApiMap/h5',
 	base_assets_url: base_url,