From ad582a0628318084237c7e735393e99ba3c3b81a Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Thu, 10 Jul 2025 22:49:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=8D=E6=AC=A1=E8=B0=83=E6=95=B4pacs=20?=
 =?UTF-8?q?=E5=92=8C=20=E6=8A=A5=E5=88=B0=E6=9C=BA=E6=8E=A5=E5=8F=A3=20?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD=E5=B7=B2=E7=BC=B4=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../API/Third/CSharpController.php            | 26 ++++++++++++++++++-
 .../Controllers/API/Third/PacsController.php  |  2 +-
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/Laravel/app/Http/Controllers/API/Third/CSharpController.php b/Laravel/app/Http/Controllers/API/Third/CSharpController.php
index 44cc50e..8477460 100644
--- a/Laravel/app/Http/Controllers/API/Third/CSharpController.php
+++ b/Laravel/app/Http/Controllers/API/Third/CSharpController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\API\Third;
 
+use App\Http\Controllers\API\His\HisController;
 use App\Http\Controllers\Controller;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Http\Request;
@@ -41,6 +42,28 @@ class CSharpController extends Controller
 
         }
         if ($entrust) {
+            //查询his获取检查申请单
+            $patientHisTypeMap = [
+                0 => '03', // I - 住院
+                1 => 'O1', // O - 门诊
+                2 => '02', // E - 急诊
+                3 => '04', // H - 体检
+            ];
+            $sendHisData = [
+                'visitSqNo' => $entrust->episodeid,
+                'requestNo' => $entrust->app_num,
+                'visitTypeCode' => $patientHisTypeMap[$entrust->patient_type],
+                'moOrder' =>  $entrust->entrust_id,
+            ];
+            $hisInfo=[];
+            $His = new HisController();
+            $res = $His::Get("查询检查申请单", $sendHisData);
+            if ($res['code'] == 200) {
+                $res_data = $res['data'];
+                foreach ($res_data as $data_k => $data_v) {
+                    $hisInfo=$data_v;
+                }
+            }
             $patientTypeMap = [
                 0 => 'I', // I - 住院
                 1 => 'O', // O - 门诊
@@ -81,7 +104,8 @@ class CSharpController extends Controller
                                     'checkitemcode' => $entrust->entrust_code,
                                     'checkitemname' => $entrust->entrust,
                                 ],
-                            ]
+                            ],
+                            'hisinfo' => $hisInfo,
                         ]
                     ]
                 ]
diff --git a/Laravel/app/Http/Controllers/API/Third/PacsController.php b/Laravel/app/Http/Controllers/API/Third/PacsController.php
index 78fc79d..74bca68 100644
--- a/Laravel/app/Http/Controllers/API/Third/PacsController.php
+++ b/Laravel/app/Http/Controllers/API/Third/PacsController.php
@@ -52,7 +52,7 @@ class PacsController extends Controller
             "idCardNumber",
             "reservation_sources as reservation_sources_id",
 
-        )->where(['reservation_date'=>date('Y-m-d'),'is_del'=>0,'is_nullify'=>0]);
+        )->where(['reservation_date'=>date('Y-m-d'),'is_pay'=>1,'is_del'=>0,'is_nullify'=>0]);
         if(isset($dateRange)){
             if(!is_array($dateRange)) return \Yz::JsonError("日期范围必须是数组");
             $entrust_list=$entrust_list->whereBetween('entrust_date',[$dateRange[0],$dateRange[1]]);