调整申请单住院号、医生从his跳转获取医生开单记录

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]);
         }

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

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("登录失败")
 					}