From 72cbcfc0b5a1b13f649d5401c980c3b06ea0c69c Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Tue, 4 Nov 2025 12:07:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=94=B3=E8=AF=B7=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8F=E9=99=A2=E5=8F=B7=E3=80=81=E5=8C=BB=E7=94=9F=E4=BB=8E?=
 =?UTF-8?q?his=E8=B7=B3=E8=BD=AC=E8=8E=B7=E5=8F=96=E5=8C=BB=E7=94=9F?=
 =?UTF-8?q?=E5=BC=80=E5=8D=95=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/API/Admin/YeWu/WorkMainController.php  | 3 +++
 Laravel/resources/views/pdf/JianChaShenQingDan.blade.php    | 6 +++++-
 YiJi-admin/src/views/HisLogin.vue                           | 1 +
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php b/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php
index bd8aad4..e2ffaf9 100644
--- a/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php
+++ b/Laravel/app/Http/Controllers/API/Admin/YeWu/WorkMainController.php
@@ -117,6 +117,9 @@ class WorkMainController extends Controller
         if($userInfo[0]->group==2){
           //  $list=$list->whereIn('warddesc', explode(",", $userInfo[0]->ward));
             $list=$list->where(['wardcode'=> $department->department_number]);
+        }elseif($userInfo[0]->group==7){//如果是医生则查开立申请单的科室,用于his医生客户端直接跳转过来
+
+            $list=$list->where(['reservation_department'=>$department->department_name]);
         }else{
             $list=$list->where(['RISRAcceptDeptCode'=>$department->department_number]);
         }
diff --git a/Laravel/resources/views/pdf/JianChaShenQingDan.blade.php b/Laravel/resources/views/pdf/JianChaShenQingDan.blade.php
index ef55c3f..04e275d 100644
--- a/Laravel/resources/views/pdf/JianChaShenQingDan.blade.php
+++ b/Laravel/resources/views/pdf/JianChaShenQingDan.blade.php
@@ -61,7 +61,11 @@
             </tr>
             <tr style="border: none;">
                 <td style="border: none; text-align: left;">
-                    {{$printInfo->patient_type_label}}号:{{$printInfo->reg_num}}
+                    @if($printInfo->patient_type == 0)
+                        {{$printInfo->patient_type_label}}号:{{ substr($printInfo->episodeid, -10) }}
+                    @else
+                        {{$printInfo->patient_type_label}}号:{{$printInfo->reg_num}}
+                    @endif
                 </td>
                 @if($printInfo->patient_type==0)<td style="border: none; text-align: left;">病区:{{$printInfo->warddesc ?? ''}}</td>
                 <td style="border: none; text-align: left;">床号：{{$printInfo->bedno ?? ''}}</td>@endif
diff --git a/YiJi-admin/src/views/HisLogin.vue b/YiJi-admin/src/views/HisLogin.vue
index e24a1ee..08715b5 100644
--- a/YiJi-admin/src/views/HisLogin.vue
+++ b/YiJi-admin/src/views/HisLogin.vue
@@ -30,6 +30,7 @@
 					console.log(token)
 					if (token!=null && token == res.data.access_token) {
 						window.location.href = "./#/yewu/mainList"
+						//window.location.href = "./#/info/EntrustList"
 					}else{
 						ElMessage.error("登录失败")
 					}