护士端科室类型是手术，并且搜索内容是空的时候则查询手术安排信息，搜索内容不是空的时候则查询患者信息

src/app/views/hushijiandan/hushijiandan.component.html

@@ -44,7 +44,7 @@
             class="checkItem checked"
             (click)="changeInfo()"
           >
-          {{currentDept.typeValue == 'surgery' ? '手术安排信息' : '患者信息'}}
+          {{(currentDept.typeValue == 'surgery' && !this.tabSearchCont) ? '手术安排信息' : '患者信息'}}
           </button>
         </div>
         <!-- 患者信息-复苏室科室类型 -->
@@ -178,7 +178,7 @@
           </overlay-scrollbars>
         </div>
         <!-- 患者信息 -->
-        <div class="checkedInfo patient" style="padding-bottom: 0" *ngIf="currentDept.typeValue != 'surgery' && currentDept.typeValue != 'recovery'">
+        <div class="checkedInfo patient" style="padding-bottom: 0" *ngIf="(currentDept.typeValue != 'surgery' || (currentDept.typeValue == 'surgery' && this.tabSearchCont)) && currentDept.typeValue != 'recovery'">
           <overlay-scrollbars #osComponentRef4 class="box">
             <div
               class="loading display_flex align-items_center justify-content_flex-center"
@@ -308,7 +308,7 @@
           </overlay-scrollbars>
         </div>
         <!-- 手术安排信息-手术室科室类型 -->
-        <div class="checkedInfo patient" style="padding-bottom: 0" *ngIf="currentDept.typeValue == 'surgery'">
+        <div class="checkedInfo patient" style="padding-bottom: 0" *ngIf="currentDept.typeValue == 'surgery' && !this.tabSearchCont">
           <overlay-scrollbars #osComponentRef4 class="box">
             <div
               class="loading display_flex align-items_center justify-content_flex-center"

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -175,7 +175,7 @@ export class HushijiandanComponent implements OnInit {
     this.getCloseTimeFlag();
     this.currentDept = this.tool.getCurrentUserDept();
     console.log(this.currentDept, this.tabSearchCont);
-    this.currentDept.typeValue == 'surgery' && this.getSurgeryConfig();
+    this.currentDept.typeValue == 'surgery' && !this.tabSearchCont && this.getSurgeryConfig();
     this.getSpecimenButton();
     //防抖
     this.getAccountList();
@@ -581,7 +581,7 @@ export class HushijiandanComponent implements OnInit {
   // 获取标本按钮
   specimenButton = "";
   getSpecimenButton() {
-    if(this.currentDept.typeValue == 'surgery'){
+    if(this.currentDept.typeValue == 'surgery' && !this.tabSearchCont){
       return;
     }
     let postData = {
@@ -677,7 +677,7 @@ export class HushijiandanComponent implements OnInit {
   yyDate = null; //预约日期-陪检
   yyDateZy = null; //预约日期-转运
   getRecentInfo(patientCode) {
-    if(this.currentDept.typeValue == 'surgery'){
+    if(this.currentDept.typeValue == 'surgery' && !this.tabSearchCont){
       return;
     }
     this.recentInfo = "";
@@ -859,7 +859,7 @@ export class HushijiandanComponent implements OnInit {
 
   // 急标普标数量
   getSpecimenWorkOrderMsg() {
-    if(this.currentDept.typeValue == 'surgery'){
+    if(this.currentDept.typeValue == 'surgery' && !this.tabSearchCont){
       return;
     }
     let that = this;
@@ -946,7 +946,7 @@ export class HushijiandanComponent implements OnInit {
   // 药品静配提示信息
   drugJpLoading = false;
   getJpDrugsWKOMsg() {
-    if(this.currentDept.typeValue == 'surgery'){
+    if(this.currentDept.typeValue == 'surgery' && !this.tabSearchCont){
       return;
     }
     let that = this;
@@ -1448,12 +1448,7 @@ export class HushijiandanComponent implements OnInit {
   // 获取患者信息
   snum = 0;
   getPatient(e?) {
-    if (
-      (this.currentDept.typeValue == "checkRoom2" ||
-        this.currentDept.typeValue == "outpatientDept" ||
-        this.currentDept.typeValue == "checkRoom") &&
-      !this.tabSearchCont
-    ) {
+    if ((this.currentDept.typeValue == "checkRoom2" || this.currentDept.typeValue == "outpatientDept" || this.currentDept.typeValue == "checkRoom") && !this.tabSearchCont) {
       this.pLoading = false;
       this.patientList = [];
       this.infoLength = 0;
@@ -1464,7 +1459,7 @@ export class HushijiandanComponent implements OnInit {
       idx: this.infoPageIdx - 1,
       sum: 10,
     };
-    if(this.currentDept.typeValue == 'surgery'){
+    if(this.currentDept.typeValue == 'surgery' && !this.tabSearchCont){
       // 手术安排信息-手术室类型
       postData["surgery"] = {
         searchKey: e ? e : this.tabSearchCont,
@@ -1496,7 +1491,8 @@ export class HushijiandanComponent implements OnInit {
       if (
         this.currentDept.typeValue == "checkRoom2" ||
         this.currentDept.typeValue == "outpatientDept" ||
-        this.currentDept.typeValue == "checkRoom"
+        this.currentDept.typeValue == "checkRoom" ||
+        (this.currentDept.typeValue == 'surgery' && this.tabSearchCont)
       ) {
         delete postData["patient"]["department"]; //搜索范围为全院在院患者
       } else {
@@ -1506,12 +1502,12 @@ export class HushijiandanComponent implements OnInit {
 
     this.snum++;
     this.mainService
-      .getFetchDataList(this.currentDept.typeValue == 'surgery' ? "simple/data" : 'nurse', this.currentDept.typeValue == 'surgery' ? "surgery" : 'patient', postData)
+      .getFetchDataList((this.currentDept.typeValue == 'surgery' && !this.tabSearchCont) ? "simple/data" : 'nurse', (this.currentDept.typeValue == 'surgery' && !this.tabSearchCont) ? "surgery" : 'patient', postData)
       .subscribe((data) => {
         this.snum--;
         if (data.list.length > 0) {
           data.list.forEach((item) => {
-            if(this.currentDept.typeValue == 'surgery'){
+            if(this.currentDept.typeValue == 'surgery' && !this.tabSearchCont){
               if (item.patientDTO && item.patientDTO.focusPatient === undefined) {
                 item.patientDTO.focusPatient = 0;
               }