患者预约建单不减去生效时间

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

@@ -501,7 +501,7 @@
                 <div class="tab borderB" nz-row style="padding: 4px 0">
                   <div
                     nz-col
-                    nzSpan="5"
+                    nzSpan="3"
                     [ngClass]="{
                       txtC: true,
                       cur: true,
@@ -513,7 +513,7 @@
                   </div>
                   <div
                     nz-col
-                    nzSpan="5"
+                    nzSpan="3"
                     [ngClass]="{
                       txtC: true,
                       cur: true,
@@ -525,7 +525,7 @@
                   </div>
                   <div
                     nz-col
-                    nzSpan="5"
+                    nzSpan="3"
                     [ngClass]="{
                       txtC: true,
                       cur: true,
@@ -537,7 +537,7 @@
                   </div>
                   <div
                     nz-col
-                    nzSpan="5"
+                    nzSpan="3"
                     [ngClass]="{
                       txtC: true,
                       cur: true,
@@ -547,23 +547,23 @@
                   >
                     <div class="text">历史药单查询</div>
                   </div>
-                  <!-- <div nz-col nzSpan="4" [ngClass]="{
+                  <div *ngIf="isShowBx" nz-col nzSpan="3" [ngClass]="{
                       txtC: true,
                       cur: true,
                       checked: checkedTableType == 'kjbx'
                     }" (click)="checkTable('kjbx')">
                     <div class="text">快捷报修</div>
                   </div>
-                  <div nz-col nzSpan="4" [ngClass]="{
+                  <div *ngIf="isShowBx" nz-col nzSpan="3" [ngClass]="{
                       txtC: true,
                       cur: true,
                       checked: checkedTableType == 'bxlb'
                     }" (click)="checkTable('bxlb')">
                     <div class="text">报修列表</div>
-                  </div> -->
+                  </div>
                   <div
                     nz-col
-                    nzSpan="4"
+                    nzSpan="{{isShowBx?6:12}}"
                     class="txtC h100p alignR display_flex justify-content_flex-end align-items_center"
                   >
                     <div class="btn txtC" *ngIf="mainRole&&loginUser.usertype.value != 1" (click)="toMain()">
@@ -1438,7 +1438,7 @@
                 </div>
               </div>
               <!-- 快捷报修 -->
-              <!-- <div *ngIf="checkedTableType == 'kjbx'" style="flex: 1; height: 100%;display:flex;">
+              <div *ngIf="checkedTableType == 'kjbx'&&isShowBx" style="flex: 1; height: 100%;display:flex;">
                 <form nz-form [formGroup]="bxForm" (ngSubmit)="submitBxForm()" class="bxForm bxFlex">
                   <nz-form-item>
                     <nz-form-label [nzSpan]="8" nzRequired nzFor="name">联系人</nz-form-label>
@@ -1499,9 +1499,9 @@
                     </tr>
                   </tbody>
                 </nz-table>
-              </div> -->
+              </div>
               <!-- 报修列表 -->
-              <!-- <div *ngIf="checkedTableType == 'bxlb'" style="flex: 1; height: 100%">
+              <div *ngIf="checkedTableType == 'bxlb'&&isShowBx" style="flex: 1; height: 100%">
                 <div class="
                     searchBox
                     display_flex
@@ -1566,7 +1566,7 @@
                     </div>
                   </div>
                 </div>
-              </div> -->
+              </div>
             </div>
             <div nz-col nzSpan="7" class="orders">
               <div
@@ -2042,7 +2042,7 @@
                   请填写预约建单时间!
                 </div>
                 <div class="red">
-                  请您在预约建单时至少在预约检查时间的基础上提前30分钟，以免错过检查!
+                  请您填写实际预约检查时间，系统会根据时间安排人员进行陪检!
                 </div>
               </nz-form-item>
               <!-- 预约建单时间 -->
@@ -2096,7 +2096,7 @@
                   请填写预约建单时间!
                 </div>
                 <div class="red">
-                  请您在预约建单时至少在预约检查时间的基础上提前30分钟，以免错过检查!
+                  请您填写实际预约检查时间，系统会根据时间安排人员进行陪检!
                 </div>
               </nz-form-item>
             </div>

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

@@ -881,13 +881,14 @@ export class HushijiandanComponent implements OnInit {
                 if (result.list && result.list.length > 0) {
                   this.appointmentBuildFlag =
                     result.list[0].appointmentSwitch + ""; //是否开启护士端预约建单
-                  this.leadTime = result.list[0].appointmentTime; //是否开启护士端预约建单
+                  // this.leadTime = result.list[0].appointmentTime; //生效时长
+                  this.leadTime = 0; //生效时长
                   this.followFlag = result.list[0].focusSwitch + ""; //是否开启护士端重点关注
                   this.allowUrgentFlag =
                     result.list[0].allowUrgent == 1 ? true : false; //是否允许加急（检查列表）
                 } else {
                   this.appointmentBuildFlag = "0"; //是否开启护士端预约建单
-                  this.leadTime = 0; //是否开启护士端预约建单
+                  this.leadTime = 0; //生效时长
                   this.followFlag = "0"; //是否开启护士端重点关注
                   this.allowUrgentFlag = false; //是否允许加急（检查列表）
                 }
@@ -2423,24 +2424,24 @@ export class HushijiandanComponent implements OnInit {
 
   // 页面中间部分tab切换
   checkedTableType: string = "other";
+  isShowBx = false;
   checkTable(type) {
     this.checkedTableType = type;
     if (type === "historySpecimen") {
       this.getHistorySpecimen();
     } else if (type === "historyDrugsbag") {
       this.getHistoryDrugsbag();
+    }else if (type === "bxlb" && this.isShowBx) {
+      this.getBxlb();
+    } else if (type === "kjbx" && this.isShowBx) {
+      this.getQuickBxlb();
+      // 获取报修的区域(所属院区)
+      this.getArea();
+      this.bxForm.controls.name.setValue(this.loginUser.name);
+      this.bxForm.controls.phone.setValue(this.loginUser.phone);
+      this.bxForm.controls.address.setValue(null);
+      this.bxForm.controls.content.setValue(null);
     }
-    // else if (type === "bxlb") {
-    //   this.getBxlb();
-    // } else if (type === "kjbx") {
-    //   this.getQuickBxlb();
-    //   // 获取报修的区域(所属院区)
-    //   this.getArea();
-    //   this.bxForm.controls.name.setValue(this.loginUser.name);
-    //   this.bxForm.controls.phone.setValue(this.loginUser.phone);
-    //   this.bxForm.controls.address.setValue(null);
-    //   this.bxForm.controls.content.setValue(null);
-    // }
   }
   //提交报修
   bxLoading = false;
@@ -2597,47 +2598,47 @@ export class HushijiandanComponent implements OnInit {
       });
   }
   // 报修列表查询表格数据
-  // bxlbList: any = [];
-  // bxlbPageIndex: number = 1; //表格当前页码
-  // bxlbPageSize: number = 10; //表格每页展示条数
-  // bxlbListLength: number = 10; //表格总数据量
-  // bxlbCodeSearchInp: string = ""; //标本编码搜索
-  // bxlbParentSearchInp: string = ""; //患者信息搜索
-  // bxlbLoading = false;
-  // getBxlb(idx?) {
-  //   if (idx) {
-  //     this.bxlbPageIndex = 1;
-  //   }
-  //   let current = JSON.parse(localStorage.getItem("user"));
-  //   this.bxlbLoading = true;
-  //   this.mainService
-  //     .listWxIncident({
-  //       "assignee": current.user.account,
-  //       "state": 0,
-  //       "idx": this.bxlbPageIndex - 1,
-  //       "sum": this.bxlbPageSize
-  //     })
-  //     .subscribe((data: any) => {
-  //       this.bxlbLoading = false;
-  //       this.bxlbList = data.data || [];
-  //       this.bxlbListLength = data.resultCount || 0;
-  //     });
-  // }
+  bxlbList: any = [];
+  bxlbPageIndex: number = 1; //表格当前页码
+  bxlbPageSize: number = 10; //表格每页展示条数
+  bxlbListLength: number = 10; //表格总数据量
+  bxlbCodeSearchInp: string = ""; //标本编码搜索
+  bxlbParentSearchInp: string = ""; //患者信息搜索
+  bxlbLoading = false;
+  getBxlb(idx?) {
+    if (idx) {
+      this.bxlbPageIndex = 1;
+    }
+    let current = JSON.parse(localStorage.getItem("user"));
+    this.bxlbLoading = true;
+    this.mainService
+      .listWxIncident({
+        "assignee": current.user.account,
+        "state": 0,
+        "idx": this.bxlbPageIndex - 1,
+        "sum": this.bxlbPageSize
+      })
+      .subscribe((data: any) => {
+        this.bxlbLoading = false;
+        this.bxlbList = data.data || [];
+        this.bxlbListLength = data.resultCount || 0;
+      });
+  }
 
   //快速报修列表
-  // quickBxlbLoading = false;
-  // quickBxlbList = [];
-  // getQuickBxlb() {
-  //   this.quickBxlbLoading = true;
-  //   this.mainService
-  //     .fetchListBx("incidentCategoryContent", { idx: 0, sum: 10 })
-  //     .subscribe((data: any) => {
-  //       this.quickBxlbLoading = false;
-  //       if (data.status == 200) {
-  //         this.quickBxlbList = data.list || [];
-  //       }
-  //     });
-  // }
+  quickBxlbLoading = false;
+  quickBxlbList = [];
+  getQuickBxlb() {
+    this.quickBxlbLoading = true;
+    this.mainService
+      .fetchListBx("incidentCategoryContent", { idx: 0, sum: 10 })
+      .subscribe((data: any) => {
+        this.quickBxlbLoading = false;
+        if (data.status == 200) {
+          this.quickBxlbList = data.list || [];
+        }
+      });
+  }
 
   // 意见箱-查看模态框
   adviceModal: boolean = false;