护士端检查列表去掉

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

@@ -19,13 +19,10 @@
           <input nz-input [(ngModel)]='tabSearchCont' (ngModelChange)="searchTabInp($event)" placeholder="请输入关键字" />
         </div>
         <div class="checkBanner" nz-row>
-          <button nz-button nz-col nzSpan="12" [ngClass]="{'checkItem':true,'checked':checkedInfo=='patient'}"
-            (click)="changeInfo('patient')" [disabled]="checkedInfo!='patient'&&iLoading">患者信息</button>
-          <button nz-button nz-col nzSpan="12" [ngClass]="{'checkItem':true,'checked':checkedInfo=='inspect'}"
-            (click)="changeInfo('inspect')" [disabled]="checkedInfo!='inspect'&&pLoading">检查信息</button>
+          <button nz-button nz-col nzSpan="12" class="checkItem checked" (click)="changeInfo()">患者信息</button>
         </div>
         <!-- 患者信息 -->
-        <div class="checkedInfo patient" style="padding-bottom:0;" [hidden]='checkedInfo=="inspect"'>
+        <div class="checkedInfo patient" style="padding-bottom:0;">
           <overlay-scrollbars #osComponentRef4 class="box">
             <div class="loading display_flex align-items_center justify-content_flex-center"
               *ngIf="pLoading&&deptTaskTypeRules.openInspection">
@@ -82,52 +79,14 @@
             </div>
           </overlay-scrollbars>
         </div>
-        <!-- 检查信息 -->
-        <div class="checkedInfo inspect" [hidden]='checkedInfo=="patient"'>
-          <overlay-scrollbars #osComponentRef5 class="box">
-            <div class="loading display_flex align-items_center justify-content_flex-center"
-              *ngIf="iLoading&&deptTaskTypeRules.openInspection">
-              <div>
-                <img src="../../assets/images/loading.gif" alt="">
-                <div>加载中...</div>
-              </div>
-            </div>
-            <div class="loading display_flex align-items_center justify-content_flex-center"
-              *ngIf="!inspectList.length&&!iLoading">
-              <div>
-                <div>暂无数据</div>
-              </div>
-            </div>
-            <div *ngIf="inspectList.length&&!iLoading">
-              <div class="item" *ngFor="let item of inspectList">
-                <div class="row">
-                  <span [title]="item.inspectName" class="fl col"
-                    style="display:inline-block;width: 115px;overflow:hidden;text-overflow: ellipsis;white-space: nowrap;">{{item.inspectName}}</span>
-                  <span class="fr col">{{item.yyTime|date:'MM-dd HH:mm'}}</span>
-                </div>
-                <div class="row">
-                  <span class="fl col">{{item.execDept?item.execDept.dept:''}}</span>
-                  <span class="fr col">{{item.inspectState?item.inspectState.name:''}}</span>
-                </div>
-                <div class="row">
-                  <span class="fl col">{{item.patientName}}({{item.bedNum}})</span>
-                  <span class="fr col" *ngIf="item.residenceNo">住院号{{item.residenceNo}}</span>
-                </div>
-                <div class="btn" (click)="newInspectionOrder(item)"
-                  *ngIf="!item.gdId&&(item.inspectState.value == 1||item.inspectState.value == 30)">一键建单</div>
-                <!-- <div class="btn" style="visibility: hidden;" *ngIf="!(!item.gdId&&(item.inspectState.value == 1||item.inspectState.value == 30))">一键建单</div> -->
-              </div>
-            </div>
-          </overlay-scrollbars>
-        </div>
         <!-- 翻页 -->
-        <div class="paging" *ngIf="checkedInfo != 'patient'">
+        <!-- <div class="paging">
           <div>
             <nz-pagination [(nzPageIndex)]="infoPageIdx" [(nzTotal)]="infoLength" (nzPageIndexChange)="getPatient()"
               [nzPageSize]='5' nzSimple>
             </nz-pagination>
           </div>
-        </div>
+        </div> -->
       </div>
     </nz-sider>
     <nz-layout class="layout" style="background:#fff;position: relative;">
@@ -510,18 +469,20 @@
                 </div>
                 <div class="table">
                   <div class="box">
-                    <nz-table class="hospitalTable" #headerTable [nzData]="adviceList" nzSize="middle"
-                      [nzShowPagination]="false" [nzScroll]="{ y: tableHeight+'px' }">
+                    <nz-table class="hospitalTable" [nzData]="adviceList" nzSize="middle" [nzShowPagination]="false"
+                      [nzLoading]="adviceLoading">
                       <thead>
                         <tr class="thead">
+                          <th nzWidth="7%">序号</th>
                           <th nzWidth="15%">填写时间</th>
-                          <th nzWidth="43%">意见内容</th>
+                          <th nzWidth="36%">意见内容</th>
                           <th nzWidth="12%">状态</th>
                           <th nzWidth="30%">操作</th>
                         </tr>
                       </thead>
                       <tbody>
-                        <tr *ngFor="let data of adviceList">
+                        <tr *ngFor="let data of adviceList;let i = index;">
+                          <td>{{i+1}}</td>
                           <td>{{ data.createTime.slice(0,16) }}</td>
                           <td>
                             <span style="overflow: hidden;text-overflow: ellipsis;">
@@ -565,7 +526,7 @@
                 <div class="table">
                   <div class="box">
                     <nz-table class="hospitalTable" [nzData]="historySpecimenList" nzSize="middle"
-                      [nzShowPagination]="false" [nzScroll]="{ y: tableHeight+'px'}" [nzLoading]="hsLoading">
+                      [nzShowPagination]="false" [nzLoading]="hsLoading">
                       <thead>
                         <tr class="thead">
                           <th nzWidth="7%">序号</th>
@@ -606,8 +567,6 @@
                   </div>
                 </div>
               </div>
-              <!-- 服务规范 -->
-              <!-- <div *ngIf="checkedTableType=='service'">暂无</div> -->
             </div>
             <div nz-col nzSpan="7" class="orders">
               <div class="orderTit display_flex justify-content_space-between align-items_center">
@@ -674,10 +633,6 @@
                                   <p>{{step.operationName}}</p>
                                   <p class="time" *ngIf="step.record&&step.record[0]&&step.record[0].operationTime">
                                     {{step.record[0].operationTime|date:'MM-dd HH:mm'}}</p>
-                                  <!-- <p *ngIf="!step.record||!step.record[0]||!step[0].operationTime"></p> -->
-                                  <!-- <p *ngIf="step.record&&step.record.length&&step.record[0].dept"><span
-                                    *ngFor="let dept of step.record">{{dept.dept}},</span></p>
-                                <p *ngIf="step.record&&step.record.length">耗时{{filterTime(step.record)}}</p> -->
                                 </div>
                                 <div class="line"></div>
                               </div>
@@ -750,9 +705,6 @@
   </div>
 </div>
 
-
-
-
 <!-- 患者信息一键建单模态框 -->
 <div class="save display_flex align-items_center justify-content_flex-center patient" *ngIf="patientModal">
   <div class="modalBody" style="width: 500px;">
@@ -902,85 +854,6 @@
   </div>
 </div>
 
-<!-- 检查信息一键建单模态框 -->
-<div class="save display_flex align-items_center justify-content_flex-center inspect" *ngIf="inspectionModal">
-  <div class="modalBody">
-    <div class="title">患者送检<i class="icon_transport transport-guanbi" (click)="hideInspectionOrder()"></i></div>
-    <overlay-scrollbars #osComponentRef8 class="content" style="max-height:80vh">
-      <div *ngIf="inspMsg.status==100016" [ngClass]="{'jiTit':true, 'borderB':(inspMsg.data&&inspMsg.data.length)}">
-        提示：{{inspMsg.msg}}
-      </div>
-      <div *ngIf="inspMsg.data" [ngClass]="{'jiTit':true, 'borderB':(inspMsg.data&&inspMsg.data.length)}">
-        提示：您即将创建{{inspectionInfo.patientName}}患者前往{{inspectionInfo.execDept.dept}}进行{{inspectionInfo.inspectName}}检查，您确认吗？
-      </div>
-      <div>
-        <form nz-form [formGroup]="inspectionForm" class="inspectionForm">
-          <nz-form-item *ngIf="linkCheckInsLis.length">
-            <nz-form-label [nzSm]="24" [nzXs]="24" nzFor="linkCheck">此患者还有想关联检查可以选择合并工单</nz-form-label>
-            <nz-form-control class="datesGroup">
-              <nz-checkbox-group formControlName="linkCheck" class="linkCheckCheck" [(ngModel)]="linkCheckInsLis"
-                (ngModelChange)="linkCheckInsLisChange()">
-              </nz-checkbox-group>
-            </nz-form-control>
-          </nz-form-item>
-          <!-- 预约建单时间 -->
-          <nz-form-item class="yyTime" [ngClass]="{yyTimeError:!yyTimeInspect&&clickYYInspectFlag}"
-            *ngIf="inspMsg.status!=100016&&(hasTime1||hasYyTime)&&lessTime1&&appointmentBuildFlag === '1'&&allowUrgentInspect==0">
-            <nz-form-label [nzSm]="24" [nzXs]="24">预约建单时间</nz-form-label>
-            <nz-form-control [nzSm]="24" [nzXs]="24">
-              <nz-date-picker [nzShowToday]="false" nzFormat="yyyy-MM-dd HH:mm"
-                (nzOnOpenChange)="openYYTime($event,'inspect')" [nzDisabledDate]="disabledYYDate"
-                [nzDisabledTime]="disabledYYTime" [nzShowTime]="{nzDefaultOpenValue: timeDefaultValue}"
-                [ngModel]="yyTimeInspect" (ngModelChange)="yyTimeInspectChange($event)"
-                [ngModelOptions]="{standalone: true}"></nz-date-picker>
-            </nz-form-control>
-            <div class="red w100" *ngIf="!yyTimeInspect&&clickYYInspectFlag">请填写预约建单时间!</div>
-            <div class="red">请您在预约建单时至少在预约检查时间的基础上提前30分钟，以免错过检查!</div>
-          </nz-form-item>
-          <!-- 携带设备 -->
-          <nz-form-item *ngIf="goodsLis.length">
-            <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="goods" class="goods">携带设备</nz-form-label>
-            <nz-form-control>
-              <nz-checkbox-group formControlName="goods" [(ngModel)]="goodsLis">
-              </nz-checkbox-group>
-            </nz-form-control>
-          </nz-form-item>
-          <!-- 是否加急 -->
-          <nz-form-item *ngIf="allowUrgentFlag">
-            <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="allowUrgentInspect" class="goods">是否加急</nz-form-label>
-            <nz-form-control>
-              <nz-radio-group [(ngModel)]="allowUrgentInspect" formControlName="allowUrgentInspect">
-                <label nz-radio nzValue="1">是</label>
-                <label nz-radio nzValue="0">否</label>
-              </nz-radio-group>
-            </nz-form-control>
-          </nz-form-item>
-          <!-- 加急原因 -->
-          <nz-form-item *ngIf="allowUrgentFlag&&allowUrgentInspect == 1">
-            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="urgentReasonInspect" class="goods">加急原因
-            </nz-form-label>
-            <nz-form-control>
-              <textarea rows="4" placeholder="请输入加急原因" nz-input [(ngModel)]="urgentReasonInspect"
-                formControlName="urgentReasonInspect"></textarea>
-            </nz-form-control>
-          </nz-form-item>
-        </form>
-      </div>
-    </overlay-scrollbars>
-    <div class="btns display_flex justify-content_flex-center">
-      <button
-        *ngIf="inspMsg.status!=100016&&(hasTime1||hasYyTime)&&lessTime1&&appointmentBuildFlag === '1'&&allowUrgentInspect==0"
-        nz-button nzType="primary" [nzLoading]="btnLoading2" (click)="confirmInspection1()">预约建单</button>
-      <button
-        *ngIf="inspMsg.status!=100016&&((allowUrgentInspect == 1 && urgentReasonInspect.trim() !== '')||allowUrgentInspect == 0)"
-        nz-button nzType="default" [nzLoading]="btnLoading" (click)="confirmInspection()"
-        class="orderThis">直接建单</button>
-      <button class="btn cancel" nz-button nzType="default" (click)="hideInspectionOrder()">取消</button>
-    </div>
-  </div>
-</div>
-
-
 <!-- 标本一键建单模态框 其他-->
 <div class="save display_flex align-items_center justify-content_flex-center shortcut" *ngIf="shortcutModal">
   <div class="modalBody">

src/app/views/hushijiandan/hushijiandan.component.less

@@ -432,7 +432,7 @@
           z-index: 1;
 
           .checkItem {
-            width: 50%;
+            width: 100%;
             text-align: center;
             color: #fff;
             background: #284450;
@@ -940,10 +940,12 @@
               border: 1px solid #e5e9ed;
               padding-bottom: 60px;
               position: relative;
+              height: 100%;
 
               .hospitalTable {
-                padding: 21px 12px;
-                padding-bottom: 0;
+                padding: 24px 16px 0;
+                height: 100%;
+                overflow: auto;
 
                 .ant-table-fixed-header .ant-table-scroll .ant-table-header {
                   padding-bottom: 16px;

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

@@ -1,5 +1,4 @@
 import {
-  AfterViewInit,
   Component,
   ElementRef,
   OnInit,
@@ -31,7 +30,7 @@ import { differenceInCalendarDays, format, setSeconds } from "date-fns";
   templateUrl: "./hushijiandan.component.html",
   styleUrls: ["./hushijiandan.component.less"],
 })
-export class HushijiandanComponent implements OnInit, AfterViewInit {
+export class HushijiandanComponent implements OnInit {
   @ViewChild("remarksEle", { static: false }) remarksEle: ElementRef;
   @ViewChild("osComponentRef1", {
     read: OverlayScrollbarsComponent,
@@ -53,11 +52,6 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
     static: false,
   })
   osComponentRef4: OverlayScrollbarsComponent;
-  @ViewChild("osComponentRef5", {
-    read: OverlayScrollbarsComponent,
-    static: false,
-  })
-  osComponentRef5: OverlayScrollbarsComponent;
   @ViewChild("osComponentRef6", {
     read: OverlayScrollbarsComponent,
     static: false,
@@ -133,12 +127,6 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
     this.initRole();
     this.getWebsocket();
   }
-  ngAfterViewInit() {
-    this.windowResize();
-    window.addEventListener("resize", () => {
-      this.tableHeight = window.innerHeight - 426;
-    });
-  }
   ngOnDestroy() {
     console.log("关闭护士端", this.webs.ws);
     clearInterval(this.moveId);
@@ -163,7 +151,6 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
   hsPromptModalShow: boolean = true; //护士端科室切换提示框是否展示
 
   deptTaskTypeRules: any = {}; //当前登录科室任务类型信息规则
-  tableHeight: number; //表格动态高
 
   orderSelectList: any = []; //工单列表筛选选项
   orderSelected = "-1"; //工单列表下拉框选中
@@ -171,9 +158,6 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
   tabSearchCont: string = ""; //左侧tab搜索框内容
   pLoading: boolean = true; //患者信息loading
   patientList: any = []; //左侧tab患者信息list
-  iLoading: boolean = true; //检查信息loading
-  inspectList: any = []; //左侧tab检查信息list
-  checkedInfo: string = "patient"; //左侧tab
   infoPageIdx: number = 1; //左侧tab页码
   infoLength: number = 5; //左侧tab信息总数
 
@@ -238,17 +222,6 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
     return this.mainService.getFetchDataList("configuration", "taskType", list);
   }
 
-  // mainRole: boolean = false;//回到系统管理权限
-  // initRole() {
-  //   let roles = JSON.parse(localStorage.getItem('user')).user.role;
-  //   let that = this
-  //   roles.forEach(e => {
-  //     if (e.id == 25) {
-  //       that.mainRole = true;
-  //       return;
-  //     }
-  //   });
-  // }
   // 关闭其他建单保存结果
   closeModel(e) {
     console.log(e);
@@ -312,7 +285,6 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
         if (data && data.content) {
           that.createBasicNotification(data);
         }
-        that.windowResize();
       });
   }
 
@@ -581,16 +553,6 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
         }
       });
   }
-  // 打开搜索框
-  // openChange(type){
-  //   if (type == 'target') {
-  //     this.shortcutForm.controls.targetOffice.setValue(null)
-  //     this.patientForm.controls.targetOffice.setValue(null)
-  //   } else if (type == 'start') {
-  //     this.shortcutForm.controls.originOffice.setValue(null)
-  //     this.patientForm.controls.originOffice.setValue(null)
-  //   }
-  // }
   // 目标科室输入搜索
   searchDept(type, msg, e) {
     this.getDeptList(type, msg, e);
@@ -640,9 +602,8 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
   }
 
   // 切换左侧tab
-  changeInfo(type) {
+  changeInfo() {
     if (!this.deptTaskTypeRules.openInspection) return;
-    this.checkedInfo = type;
     this.infoPageIdx = 1;
     this.getPatient();
   }
@@ -652,51 +613,30 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
   getPatient(e?) {
     let that = this;
     that.pLoading = true;
-    that.iLoading = true;
     let postData = {
       idx: that.infoPageIdx - 1,
-      sum: that.checkedInfo == "patient" ? 9999 : 5,
+      sum: 9999,
     };
-    if (that.checkedInfo == "patient") {
-      // 患者信息
-      postData["patient"] = {
-        keyWord: e ? e : that.tabSearchCont,
-      };
-      postData["patient"]["department"] = { id: that.loginUserDeptId };
-      delete postData["inspect"];
-    } else if (that.checkedInfo == "inspect") {
-      // 检查信息
-      postData["inspect"] = {
-        hosId: this.currentHospital.id,
-        keyWord: e ? e : that.tabSearchCont,
-        searchDays: 10000,
-        platForm: 1,
-        applyDept: { id: that.loginUserDeptId },
-      };
-      delete postData["patient"];
-    }
+    // 患者信息
+    postData["patient"] = {
+      keyWord: e ? e : that.tabSearchCont,
+    };
+    postData["patient"]["department"] = { id: that.loginUserDeptId };
     this.snum++;
     that.mainService
-      .getFetchDataList("nurse", that.checkedInfo, postData)
+      .getFetchDataList("nurse", "patient", postData)
       .subscribe((data) => {
         this.snum--;
-        if (that.checkedInfo == "patient") {
-          if (data.list.length > 0) {
-            data.list.forEach((item) => {
-              if (item.focusPatient === undefined) {
-                item.focusPatient = 0;
-              }
-            });
-          }
-          that.patientList = data.list || [];
-          if (this.snum === 0) {
-            that.pLoading = false;
-          }
-        } else if (that.checkedInfo == "inspect") {
-          that.inspectList = data.list || [];
-          if (this.snum === 0) {
-            that.iLoading = false;
-          }
+        if (data.list.length > 0) {
+          data.list.forEach((item) => {
+            if (item.focusPatient === undefined) {
+              item.focusPatient = 0;
+            }
+          });
+        }
+        that.patientList = data.list || [];
+        if (this.snum === 0) {
+          that.pLoading = false;
         }
         that.infoLength = data.totalNum || 0;
       });
@@ -786,8 +726,6 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
   urgentReason: any = ""; //加急原因
 
   // 初始化form表单
-  allowUrgentInspect: any = "0";
-  urgentReasonInspect: any = "";
   initForm() {
     // 初始化患者信息一键建单表单
     this.patientForm = this.fb.group({
@@ -800,14 +738,6 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
       urgentReason: [null], //加急原因
     });
 
-    // 初始化检查信息一键建单表单
-    this.inspectionForm = this.fb.group({
-      goods: [null],
-      linkCheck: [null, []],
-      allowUrgentInspect: [null], //加急
-      urgentReasonInspect: [null], //加急原因
-    });
-
     // 初始化一键发起建单表单
     this.shortcutForm = this.fb.group({
       targetOffice: [null, [this.targetOfficeShortCutValidator]],
@@ -886,16 +816,6 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
     this.clickYYFlag = false;
     this.openYYTime(true, "parent");
   }
-  yyTimeInspectChange(e) {
-    if (e) {
-      this.yyTimeInspect = format(e, "yyyy-MM-dd HH:mm") + ":00";
-      this.timeOperate(this.yyTimeInspect);
-    } else {
-      this.yyTimeInspect = null;
-    }
-    this.clickYYInspectFlag = false;
-    this.openYYTime(true, "inspect");
-  }
   yyTimeZyChange(e) {
     if (e) {
       this.yyTimeZy = format(e, "yyyy-MM-dd HH:mm") + ":00";
@@ -945,8 +865,6 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
     ) {
       return;
     }
-    // console.log(this.patientForm.controls.checkedType.value,this.checkTypeLis )
-    // return;
     var that = this;
     for (const i in that.patientForm.controls) {
       that.patientForm.controls[i].markAsDirty();
@@ -1157,31 +1075,6 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
             this.showPromptModal("创建", false, data.msg);
           }
         });
-    } else if (this.accompanyType == "inspect") {
-      this.mainService
-        .postCustom(
-          "api",
-          this.accompanyYuyue ? "appointmentOrder" : "startOrder",
-          this.accompanyPostData
-        )
-        .subscribe((data) => {
-          this.hideInspectionOrder();
-          this.accompanyModal = false;
-          this.accompanyLoading = false;
-          if (data.status == 200) {
-            this.showPromptModal("创建", true, "");
-            this.goodsLis = [];
-            this.getOrderList();
-            this.getDeptTaskType();
-          } else if (data.status == 100042) {
-            this.showPromptModal("创建", true, data.msg);
-            this.goodsLis = [];
-            this.getOrderList();
-            this.getDeptTaskType();
-          } else {
-            this.showPromptModal("创建", false, data.msg);
-          }
-        });
     }
   }
   hideAccompanyModal() {
@@ -1232,36 +1125,10 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
             this.showPromptModal("创建", false, data.msg);
           }
         });
-    } else if (this.accompanyType == "inspect") {
-      this.mainService
-        .postCustom(
-          "api",
-          this.accompanyYuyue ? "appointmentOrder" : "startOrder",
-          this.accompanyPostData
-        )
-        .subscribe((data) => {
-          this.hideInspectionOrder();
-          this.accompanyModal = false;
-          this.cancenlLoading = false;
-          if (data.status == 200) {
-            this.showPromptModal("创建", true, "");
-            this.goodsLis = [];
-            this.getOrderList();
-            this.getDeptTaskType();
-          } else if (data.status == 100042) {
-            this.showPromptModal("创建", true, data.msg);
-            this.goodsLis = [];
-            this.getOrderList();
-            this.getDeptTaskType();
-          } else {
-            this.showPromptModal("创建", false, data.msg);
-          }
-        });
     }
   }
   // 切换患者送检检查项目
   checkedShowMsg: any = {}; //患者送检检查项目对应展示信息
-  // checkedShowFlag: any;//切换到患者检查
   current_allowUrgent = false; //当前任务类型是否允许加急
   changeCheckedType() {
     this.clickYYFlag = false;
@@ -1289,7 +1156,6 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
     // 判断这个任务类型是否允许加急 end
     let that = this;
     this.linkCheckLisTrue = true;
-    // this.checkedShowFlag = that.patientForm.controls.checkedType.value == 3;
     console.log(
       that.patientForm.controls.linkCheck.value,
       this.linkCheckLis,
@@ -1375,47 +1241,6 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
       );
     }
   }
-  // 患者送检检查项目-选择检查项目
-  hasTime1 = false; //是否有已选择,并且是否有预约时间(检查信息)
-  lessTime1 = false; //预约时间列表中预约时间少于生效时长，则是false
-  lessTime1List = []; //预约时间列表
-  linkCheckInsLisChange() {
-    this.clickYYInspectFlag = false;
-    this.lessTime1List = [];
-    if (this.initLessTime1) {
-      this.lessTime1List.push(this.initLessTime1);
-    }
-    let linkCheckInsLis = this.linkCheckInsLis.filter(
-      (item) => Boolean(item.yyTime) && item.checked
-    );
-    linkCheckInsLis.forEach((item) => {
-      this.lessTime1List.push(item.yyTime);
-    });
-    this.lessTime1 = this.lessTime1List.every((item) => {
-      return (
-        new Date(item).getTime() - new Date().getTime() >
-        this.leadTime * 60 * 1000
-      );
-    });
-    //回显预约时间2021年5月10日
-    if (this.lessTime1 && linkCheckInsLis.length) {
-      let timeList = linkCheckInsLis
-        .map((item) => new Date(item.yyTime).getTime())
-        .sort();
-      this.yyTimeInspect = format(
-        new Date(timeList[0] - this.leadTime * 60 * 1000),
-        "yyyy-MM-dd HH:mm"
-      );
-    }
-    let linkCheckInsLisTrue = this.linkCheckInsLis.some((item) => item.checked);
-    if (!linkCheckInsLisTrue) {
-      this.hasTime1 = false;
-    } else {
-      this.hasTime1 = this.linkCheckInsLis.some(
-        (item) => Boolean(item.yyTime) && item.checked
-      );
-    }
-  }
   // 日期禁用
   range(start: number, end: number): number[] {
     const result: number[] = [];
@@ -1501,227 +1326,6 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
       };
     };
   }
-  // 检查信息一键建单
-  inspectionModal: boolean = false; //检查信息一键建单模态框
-  inspectionInfo; //检查信息
-  inspMsg: any = {}; //检查信息提示
-  // 打开检查信息一键建单模态框
-  hasYyTime = false;
-  initLessTime1 = "";
-  newInspectionOrder(info) {
-    console.log(info);
-    if (info.yyTime) {
-      this.hasYyTime = true;
-      this.lessTime1List.push(info.yyTime);
-      this.initLessTime1 = info.yyTime;
-      this.lessTime1 =
-        new Date(info.yyTime).getTime() - new Date().getTime() >
-        this.leadTime * 60 * 1000;
-      //回显预约时间
-      if (this.lessTime1) {
-        this.yyTimeInspect = format(
-          new Date(new Date(info.yyTime).getTime() - this.leadTime * 60 * 1000),
-          "yyyy-MM-dd HH:mm"
-        );
-      }
-    } else {
-      this.hasYyTime = false;
-    }
-    let that = this;
-    that.linkCheckInsLis = [];
-    that.inspMsg = {};
-    that.inspectionInfo = info;
-    if (this.allowUrgentFlag) {
-      this.allowUrgentInspect = "0"; //加急
-      this.urgentReasonInspect = ""; //加急原因
-    }
-    let postData = {
-      type: 1,
-      inspectId: info.id,
-    };
-    this.maskFlag = this.message.loading("正在加载中..", {
-      nzDuration: 0,
-    }).messageId;
-    that.mainService
-      .postCustom("nurse", "workOrder/buildTrip2", postData)
-      .subscribe((data) => {
-        this.message.remove(this.maskFlag);
-        this.maskFlag = false;
-        that.inspectionModal = true;
-        that.inspMsg = data;
-        that.goodsLis = [];
-        if (data.goods && data.goods.length) {
-          data.goods.forEach((e) => {
-            that.goodsLis.push({
-              label: e.name,
-              value: e.id,
-              checked: false,
-            });
-          });
-        }
-        if (data.data && data.data.length) {
-          let arr = [];
-          data.data.forEach((e) => {
-            arr.push({
-              yyTime: e.yyTime,
-              label:
-                (e.yyTime || "") +
-                " " +
-                e.execDept.dept +
-                " 进行 " +
-                (e.inspectName || "检查"),
-              value: e.id,
-              checked: false,
-            });
-          });
-          that.linkCheckInsLis = arr;
-        } else {
-          that.linkCheckInsLis = [];
-        }
-      });
-  }
-  hideInspectionOrder() {
-    this.clickYYInspectFlag = false;
-    this.inspectionModal = false;
-    this.lessTime1List = [];
-    this.initLessTime1 = "";
-  }
-  btnLoading2 = false;
-  confirmInspection1() {
-    this.confirmInspection("yuyue");
-  }
-  inspectionForm: FormGroup; //信息检查一键建单表单
-  // 检查信息一键建单关联检查
-  linkCheckInsLis: any = [];
-  // 检查信息保存
-  clickYYInspectFlag = false; //是否点击预约建单
-  confirmInspection(yuyue?) {
-    if (yuyue) {
-      this.clickYYInspectFlag = true;
-    } else {
-      this.clickYYInspectFlag = false;
-    }
-    //预约时间不能为空
-    if (!this.yyTimeInspect) {
-      return;
-    }
-    var that = this;
-    for (const i in that.inspectionForm.controls) {
-      that.inspectionForm.controls[i].markAsDirty();
-      that.inspectionForm.controls[i].updateValueAndValidity();
-    }
-    if (that.inspectionForm.invalid) return;
-    if (yuyue) {
-      that.btnLoading2 = true;
-    } else {
-      that.btnLoading = true;
-    }
-
-    let typeId;
-    that.patientMsgList.forEach((e) => {
-      if (e.associationType.value == "inspect") {
-        typeId = e.id;
-      }
-    });
-    console.log(that.inspectionForm);
-    let postData: any = {
-      workOrder: {
-        taskType: { id: typeId },
-        createDept: that.loginUserDeptId,
-        startDept: { id: that.loginUserDeptId },
-        patient: {
-          patientCode: that.inspectionInfo.patientCode,
-        },
-        checkList: [],
-      },
-    };
-    if (
-      that.inspectionForm.value.linkCheck &&
-      that.inspectionForm.value.linkCheck.length
-    ) {
-      that.inspectionForm.value.linkCheck.forEach((e) => {
-        if (e.checked) {
-          postData.workOrder["checkList"].push({ id: e.value });
-        }
-      });
-    }
-    postData.workOrder["checkList"].push({ id: that.inspectionInfo.id });
-
-    // 携带设备
-    let goods = "";
-    if (
-      that.inspectionForm.value.goods &&
-      that.inspectionForm.value.goods.length
-    ) {
-      that.inspectionForm.value.goods.forEach((e) => {
-        if (e.checked) {
-          goods += e.value + ",";
-        }
-      });
-      goods = goods.slice(0, goods.length - 1);
-    }
-    postData.workOrder["goods"] = goods;
-    if (!yuyue && that.allowUrgentFlag) {
-      postData.workOrder["urgentDetails"] = {
-        checkStatus: { id: 329 },
-        urgentReason: that.urgentReasonInspect,
-      };
-    }
-    // 添加预约时间
-    if (yuyue) {
-      postData.workOrder.yyTime = format(
-        new Date(this.yyTimeInspect),
-        "yyyy-MM-dd HH:mm:ss"
-      );
-    }
-    console.log(this.inspectionInfo);
-    //是否需要医护陪同检查
-    let isAccompany = false;
-    if (this.inspectionInfo.careLevel && !isAccompany) {
-      //特级护理或一级护理
-      if (
-        this.inspectionInfo.careLevel.value === "0" ||
-        this.inspectionInfo.careLevel.value === "1"
-      ) {
-        isAccompany = true;
-        this.btnLoading = false;
-        this.btnLoading2 = false;
-        this.accompany(postData, yuyue, "inspect");
-        return;
-      }
-    }
-    if (this.inspectionInfo.illnessState && !isAccompany) {
-      //病危或病重
-      if (
-        this.inspectionInfo.illnessState.value === "2" ||
-        this.inspectionInfo.illnessState.value === "3"
-      ) {
-        this.btnLoading = false;
-        this.btnLoading2 = false;
-        this.accompany(postData, yuyue, "inspect");
-        return;
-      }
-    }
-    postData.workOrder.isAccompany = 0; //是否需要医护陪同检查
-    that.mainService
-      .postCustom("api", yuyue ? "appointmentOrder" : "startOrder", postData)
-      .subscribe((data) => {
-        that.hideInspectionOrder();
-        if (data.status == 200) {
-          that.showPromptModal("创建", true, "");
-          that.goodsLis = [];
-          that.getOrderList();
-          that.getDeptTaskType();
-        } else if (data.status == 100042) {
-          that.showPromptModal("创建", true, data.msg);
-          that.goodsLis = [];
-          that.getOrderList();
-          that.getDeptTaskType();
-        } else {
-          that.showPromptModal("创建", false, data.msg);
-        }
-      });
-  }
 
   // 快捷一键发起建单
   shortcutMsg; //一键发起信息
@@ -1838,9 +1442,6 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
           { id: that.buildMsg.end.end.list[0].id },
         ];
       }
-      // if (that.buildMsg.status == 100013 || that.buildMsg.status == 100012) {
-      //   delete postData.workOrder['endDepts'];
-      // }
     }
     console.log(postData);
     that.mainService
@@ -1961,7 +1562,6 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
   checkedTableType: string = "other";
   checkTable(type) {
     this.checkedTableType = type;
-    this.tableHeight = window.innerHeight - 426;
   }
 
   // 意见箱表格数据
@@ -1970,6 +1570,7 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
   advicePageSize: number = 10; //表格每页展示条数
   adviceListLength: number = 10; //表格总数据量
   adviceSearchInp: string = ""; //意见箱搜索
+  adviceLoading = false;
   getAdvice() {
     let that = this;
     let postData = {
@@ -1985,9 +1586,11 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
       idx: that.advicePageIndex - 1 < 0 ? 0 : that.advicePageIndex - 1,
       sum: that.advicePageSize,
     };
+    this.adviceLoading = true;
     that.mainService
       .getFetchDataList("adviceCollection", "advice", postData)
       .subscribe((data) => {
+        this.adviceLoading = false;
         that.adviceList = data.list || [];
         that.adviceListLength = data.totalNum || 0;
       });
@@ -2122,7 +1725,6 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
     this.detailModel = true;
     let user = JSON.parse(localStorage.getItem("user"));
     let postData = {
-      // hosIds: user.infoPermission.hospitals[0].id,
       deptId: user.user.dept.id,
       urgent: speDetailType,
     };
@@ -2397,7 +1999,6 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
   showPromptModal(con, success, promptInfo?, back?) {
     this.btnLoading = false;
     this.btnLoading1 = false;
-    this.btnLoading2 = false;
     this.promptModalShow = false;
     this.promptContent = con;
     this.ifSuccess = success;
@@ -2427,11 +2028,6 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
     });
   }
 
-  // window resize事件 获取表格动态高
-  windowResize() {
-    this.tableHeight = window.innerHeight - 426;
-  }
-
   // 格式化时分秒
   // （时间小于一分钟则显示秒，时间大于一分钟则显示分钟数，如超出一小时则显示小时和分钟。）time单位:秒
   formatTime(time) {
@@ -2455,7 +2051,6 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
 
   // 计算历史记录耗时
   filterTime(step) {
-    // step = [{ difTime: 2 }, { difTime: 6 }]
     let num = 0;
     step.forEach((e) => {
       num += e.difTime;
@@ -2523,7 +2118,6 @@ export class HushijiandanComponent implements OnInit, AfterViewInit {
 
   mainRole: boolean = false; //回到系统管理权限
   initRole() {
-    // let roles = JSON.parse(localStorage.getItem('user')).user.role;
     let menus = JSON.parse(localStorage.getItem("menu"));
     let that = this;
     console.log("菜单数量" + menus.length);