From c6036f8e765a36e05cb82ea4836805a25f26d477 Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Thu, 30 Jul 2026 10:46:46 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E9=81=93=E6=9C=BA=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=20=E6=97=B6=E9=97=B4=E5=AD=97=E6=AE=B5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/API/Third/PacsController.php    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/Third/PacsController.php b/Laravel/app/Http/Controllers/API/Third/PacsController.php
index 41f624c..c968e2a 100644
--- a/Laravel/app/Http/Controllers/API/Third/PacsController.php
+++ b/Laravel/app/Http/Controllers/API/Third/PacsController.php
@@ -27,7 +27,9 @@ public function GetEntrustInfo(){
         if ($dev == 1 && !empty($testdate)) {
             $queryDate = $testdate;
         }
-        $entrust_list=DB::table('s_list')->select(
+        $entrust_list=DB::table('s_list')
+            ->leftJoin('s_period', 's_list.reservation_time', '=', 's_period.id')
+            ->select(
             "list_status",
             "is_nullify",
             "reg_num",
@@ -48,7 +50,7 @@ public function GetEntrustInfo(){
             "episodeid",
             "RISRAcceptDeptCode",
             "reservation_date",
-            "reservation_time",
+            's_period.period_begin_time as reservation_time',
             "canel_time as cancel_time",
             "warddesc",
             "wardcode",
@@ -62,9 +64,9 @@ public function GetEntrustInfo(){
             "reservation_department_code",
             "doctor_code",
 
-        )->where('reservation_date', $queryDate)
-            ->where('is_del', 0)
-            ->where('is_nullify', 0)
+        )->where('s_list.reservation_date', $queryDate)
+            ->where('s_list.is_del', 0)
+            ->where('s_list.is_nullify', 0)
             ->where(function($q) {
                 $q->where('patient_type', 0)  // 住院类型不限制支付状态
                 ->orWhere('is_pay', 1);     // 其他类型必须已支付