From e3768dd500d32e7a69267ea5e0a6855a3e68a6a1 Mon Sep 17 00:00:00 2001
From: sa0ChunLuyu <sa0Chun_luyu@aliyun.com>
Date: Thu, 30 Jul 2026 11:19:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E9=81=93=E6=9C=BA=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20=E5=8A=A0=20=20=E9=97=A8=E8=AF=8A=E5=8F=B7?=
 =?UTF-8?q?=20=E4=BD=8F=E9=99=A2=E5=8F=B7=20=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/API/Third/PacsController.php   | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/Laravel/app/Http/Controllers/API/Third/PacsController.php b/Laravel/app/Http/Controllers/API/Third/PacsController.php
index c968e2a..3356d7e 100644
--- a/Laravel/app/Http/Controllers/API/Third/PacsController.php
+++ b/Laravel/app/Http/Controllers/API/Third/PacsController.php
@@ -16,10 +16,11 @@ public function GetEntrustInfo(){
         $visitSqNo = request('visitSqNo');//门诊挂号流水号/住院流水号
         $dateRange = request('dateRange');//医嘱开单日期
         $requestNo = request('requestNo');//申请单号
+        $visitNo = request('visitNo');//通用查询编号：门诊查reg_num，住院查episodeid
         $dev = request('dev');//开发调试模式
         $testdate = request('testdate');//测试日期
         // 判断所有字段是否都为空
-        if (empty($orderNo) && empty($idCardNumber) && empty($visitSqNo) && empty($dateRange) && empty($requestNo)) {
+        if (empty($orderNo) && empty($idCardNumber) && empty($visitSqNo) && empty($dateRange) && empty($requestNo) && empty($visitNo)) {
             return \Yz::JsonError("缺失查询条件");
         }
 
@@ -87,6 +88,16 @@ public function GetEntrustInfo(){
         if(isset($idCardNumber)){
             $entrust_list=$entrust_list->where('idCardNumber',$idCardNumber);
         }
+        if(isset($visitNo)){
+            $entrust_list=$entrust_list->where(function($q) use ($visitNo) {
+                $q->where('reg_num', $visitNo)
+                  ->where('patient_type', 1)
+                  ->orWhere(function($q2) use ($visitNo) {
+                      $q2->where('episodeid', 'ZY001' . $visitNo)
+                         ->where('patient_type', 0);
+                  });
+            });
+        }
         $entrust_list=$entrust_list->get();