From 364d239fd2cc9aea4da1656e4c7e5cf24ec8c384 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Thu, 19 Sep 2024 16:28:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=20=E5=AE=8C=E6=95=B4?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E4=B8=AD=E7=9A=84=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/API/ApiMapController.php |  1 +
 .../Controllers/API/H5/ReportController.php   | 21 +++++++++++++++----
 Laravel/routes/web.php                        |  1 +
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/ApiMapController.php b/Laravel/app/Http/Controllers/API/ApiMapController.php
index 9abc1c5..8859946 100644
--- a/Laravel/app/Http/Controllers/API/ApiMapController.php
+++ b/Laravel/app/Http/Controllers/API/ApiMapController.php
@@ -49,6 +49,7 @@ class ApiMapController extends Controller
       'OrderCreate' => $base_url . '/api/H5/OrderCreate',//创建订单
       'GetReportList' => $base_url . '/api/H5/GetReportList',//获取关联的所有体检人报告列表
       'GetReportJieLunJianYi' => $base_url . '/api/H5/GetReportJieLunJianYi',//获取报告结论建议页面数据
+      'GetReportDetaiList' => $base_url . '/api/H5/GetReportDetaiList',//完整报告中的列表
     ];
   }
 
diff --git a/Laravel/app/Http/Controllers/API/H5/ReportController.php b/Laravel/app/Http/Controllers/API/H5/ReportController.php
index 9f72e3c..e77ea37 100644
--- a/Laravel/app/Http/Controllers/API/H5/ReportController.php
+++ b/Laravel/app/Http/Controllers/API/H5/ReportController.php
@@ -78,12 +78,25 @@ class ReportController extends Controller
     if($report->体检状态=='报告未出') return \Yz::echoError1("此报告暂时未出");
     $items=DB::table('report_l2_items as b')->leftJoin('report_l3_base_items as c' ,'b.id','=','c.report_l2_id')->where(['b.reprort_l1_id'=>$report->id])->get();
     $list=[];
+
     foreach($items as $item){
-      $keshiName = $item->科室名称;
-      if (!isset($list[$keshiName])) {
-        $list[$keshiName] = [];
+      $ShouFeiName = $item->收费项目名称;
+      if (!isset($list[$ShouFeiName])) {
+        $error_count=0;
+        $list[$ShouFeiName] = ['id'=>$item->report_l2_id,'error_count'=>$error_count];
+      }
+      if($item->异常标识!=null and $item->异常标识!=''){
+        $error_count++;
       }
-      $list[$keshiName][] = $item;
+      $list[$ShouFeiName] = ['id'=>$item->report_l2_id,'error_count'=>$error_count];
+    }
+    return \Yz::Return(true,"查询完成",['list'=>$list]);
+  }
+  public function GetReportDetai(){
+    $id =request('id');
+    $items=DB::table('report_l3_base_items')->where(['report_l2_id'=>$id])->get();
+    foreach ($items as $item){
+
     }
   }
 
diff --git a/Laravel/routes/web.php b/Laravel/routes/web.php
index eef78ef..f2fd565 100644
--- a/Laravel/routes/web.php
+++ b/Laravel/routes/web.php
@@ -58,6 +58,7 @@ Route::group(['prefix' => 'api/H5'], function () {
   Route::post('/GetGroupCombo', 'App\Http\Controllers\API\H5\PersonController@GetGroupCombo');//获取团检套餐
   Route::post('/GetReportList', 'App\Http\Controllers\API\H5\ReportController@GetReportList');//获取关联的所有体检人报告列表
   Route::post('/GetReportJieLunJianYi', 'App\Http\Controllers\API\H5\ReportController@GetReportJieLunJianYi');//获取报告结论建议页面数据
+  Route::post('/GetReportDetaiList', 'App\Http\Controllers\API\H5\ReportController@GetReportDetaiList');//完整报告中的列表