立即执行功能

src/app/services/main.service.ts

@@ -434,4 +434,22 @@ export class MainService {
       headers: this.headers,
     });
   }
+  // 护士端定时预约工单立即执行
+  executeNow(id) {
+    return this.http.get(host.host + "/api/directStartOrder/" + id, {
+      headers: this.headers,
+    });
+  }
+  //定时下班列表立即执行
+  executeNowClassesJob(data) {
+    return this.http.post(host.host + "/configuration/directOffDuty", data, {
+      headers: this.headers,
+    });
+  }
+  //轮巡计划列表立即执行
+  executeNowOrderPlan(id) {
+    return this.http.get(host.host + "/orderPlan/directOrderPlan/" + id, {
+      headers: this.headers,
+    });
+  }
 }

src/app/services/tool.service.ts

@@ -91,6 +91,9 @@ export class ToolService {
         case "deleted":
           coopBtns.deleted = true; //已删除
           break;
+        case "executeNow":
+          coopBtns.executeNow = true; //立即执行
+          break;
       }
     });
     console.log(coopBtns);

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

@@ -615,7 +615,7 @@
             </div>
             <div nz-col nzSpan="7" class="orders">
               <div class="orderTit display_flex justify-content_space-between align-items_center">
-                <span>工单列表</span>
+                <span>工单列表<b style="font-size: 14px;">({{orderListTime}}秒)</b></span>
                 <div>
                   <nz-select style="width: 100px;" [(ngModel)]="orderStateSelected"
                     (ngModelChange)="changeOrderState($event)" nzPlaceHolder="请选择工单状态">
@@ -705,6 +705,8 @@
                           <div
                             *ngIf="item.gdState.id==69||item.gdState.id==70||item.gdState.id==71||item.gdState.id==433"
                             class="btn flex_1 revocation borderR" (click)="openRecallModal(item.id)">撤销</div>
+                          <div *ngIf="item.gdState.id==433" class="btn flex_1 revocation borderR"
+                            (click)="openExecModal(item)">立即执行</div>
                           <div
                             *ngIf="(item.gdState.id==69||item.gdState.id==71)&&item.taskType.allowUrgent==1&&!item.urgentDetails"
                             class="btn flex_1 urgent" (click)="showJiaji(item.id)">加急
@@ -1109,7 +1111,9 @@
 <!-- 撤销工单 -->
 <app-dialog-delete [delModal]="recallOrderModal" (hideDelModalEvent)="closeRecallOrderModal()" [btnLoading]="btnLoading"
   (confirmDelEvent)="confirmRec()" content="您确认要撤销工单吗？撤销工单我们会通知服务台、支助人员不再执行此工单，请谨慎操作，如确认撤销请点击确认。"></app-dialog-delete>
-
+<!-- 立即执行定时预约工单 -->
+<app-dialog-delete [delModal]="execModal" (hideDelModalEvent)="closeExecModal()" [btnLoading]="btnLoading"
+  (confirmDelEvent)="confirmExec()" content="您确认要立即执行该工单吗？"></app-dialog-delete>
 <!-- 评价模态框 -->
 <div class="save display_flex align-items_center justify-content_flex-center appraise" *ngIf="appraiseModal">
   <div class="modalBody">

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

@@ -133,7 +133,10 @@ export class HushijiandanComponent implements OnInit {
   currentUser; //当前用户
   logTimer = null; //综合日志定时器
   logTime = 0; //综合日志自动刷新秒数
-  logTimeConst = 30; //综合日志自动刷新秒数
+  logTimeConst = 60; //综合日志自动刷新秒数
+  orderListTimer = null; //工单列表定时器
+  orderListTime = 0; //工单列表自动刷新秒数
+  orderListTimeConst = 60; //工单列表自动刷新秒数
   deptDisplay; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
   ngOnInit() {
     this.tool.getDeptDisplay().subscribe((result) => {
@@ -166,6 +169,7 @@ export class HushijiandanComponent implements OnInit {
     this.initRole();
     this.getWebsocket();
     this.listDeptOrderRecord();
+    // 综合日志倒计时 start
     this.logTime = this.logTimeConst;
     clearInterval(this.logTimer);
     this.logTimer = setInterval(() => {
@@ -175,6 +179,18 @@ export class HushijiandanComponent implements OnInit {
         this.listDeptOrderRecord();
       }
     }, 1000);
+    // 综合日志倒计时 end
+    // 工单列表倒计时 start
+    this.orderListTime = this.orderListTimeConst;
+    clearInterval(this.orderListTimer);
+    this.orderListTimer = setInterval(() => {
+      this.orderListTime--;
+      if (this.orderListTime === 0) {
+        this.orderListTime = this.orderListTimeConst;
+        this.getOrderList();
+      }
+    }, 1000);
+    // 工单列表倒计时 end
   }
   ngOnDestroy() {
     console.log("关闭护士端", this.webs.ws);
@@ -182,6 +198,7 @@ export class HushijiandanComponent implements OnInit {
     clearInterval(this.moveId1);
     clearInterval(this.msgTimerId);
     clearInterval(this.logTimer);
+    clearInterval(this.orderListTimer);
     this.webs.closeWs();
   }
   loginUser: any = localStorage.getItem("user")
@@ -232,6 +249,62 @@ export class HushijiandanComponent implements OnInit {
     this.remarksEle1.nativeElement.focus();
     this.workOrderRemark1 += item;
   }
+  // 立即执行
+  coopItem: any = {};
+  execModal: boolean = false;
+  // 打开立即执行模态框
+  openExecModal(item) {
+    this.coopItem = item;
+    this.execModal = true;
+  }
+  // 确认立即执行
+  confirmExec() {
+    this.btnLoading = true;
+    // let postData: any = {
+    //   workOderId: this.coopItem.id,
+    //   workOrder: {
+    //     sourceId: this.coopItem.sourceId,
+    //     taskType: {
+    //       id: this.coopItem.taskType.id,
+    //     },
+    //     startDept: {
+    //       id: this.coopItem.startDept.id,
+    //     },
+    //     endDepts: this.coopItem.endDepts.map((v) => ({ id: v.id })),
+    //     createDept: this.coopItem.createDept,
+    //     patient: {
+    //       patientCode: this.coopItem.patient.patientCode,
+    //     },
+    //     goods: this.coopItem.goods,
+    //     platform: 2,
+    //     isAccompany: this.coopItem.isAccompany,
+    //   },
+    // };
+    // if (this.coopItem.isRemand !== undefined) {
+    //   postData.workOrder.isRemand = this.coopItem.isRemand;
+    // }
+    // if (this.coopItem.taskType.associationType.value == 'inspect') {
+    //   postData.workOrder.taskType.isHalfInspect = this.coopItem.taskType.isHalfInspect;
+    // }
+    // checkList:[
+    //   {
+    //     "id": 1165517
+    //   }
+    // ]
+    this.mainService.executeNow(this.coopItem.id).subscribe((result: any) => {
+      this.closeExecModal();
+      if (result.status == 200) {
+        this.showPromptModal("立即执行", true, "");
+        this.getOrderList();
+      } else {
+        this.showPromptModal("立即执行", false, result.msg);
+      }
+    });
+  }
+  // 关闭立即执行模态框
+  closeExecModal() {
+    this.execModal = false;
+  }
   // 获取护士端更新提示
   updateTipsForNurses = "";
   getUpdateTipsForNurses() {
@@ -791,7 +864,12 @@ export class HushijiandanComponent implements OnInit {
 
   // 切换左侧tab
   changeInfo() {
-    if (!this.deptTaskTypeRules.openInspection&&!this.deptTaskTypeRules.openPatientTransport) return;
+    if (
+      !this.deptTaskTypeRules.openInspection &&
+      !this.deptTaskTypeRules.openPatientTransport
+    ) {
+      return;
+    }
     this.infoPageIdx = 1;
     this.getPatient();
   }
@@ -850,7 +928,12 @@ export class HushijiandanComponent implements OnInit {
 
   // tab输入搜索节流阀
   searchTabInp(e) {
-    if (!this.deptTaskTypeRules.openInspection&&!this.deptTaskTypeRules.openPatientTransport) return;
+    if (
+      !this.deptTaskTypeRules.openInspection &&
+      !this.deptTaskTypeRules.openPatientTransport
+    ) {
+      return;
+    }
     this.searchTabInpSubject.next(e);
   }
   // 下一日(陪检)

src/app/views/regular-off-duty/regular-off-duty.component.html

@@ -16,8 +16,8 @@
             <th nzWidth="10%">重复策略</th>
             <th nzWidth="15%">定时发送时间</th>
             <th nzWidth="10%">状态</th>
-            <th nzWidth="35%">定时下班班次</th>
-            <th nzWidth="15%">操作</th>
+            <th nzWidth="25%">定时下班班次</th>
+            <th nzWidth="25%">操作</th>
           </tr>
         </thead>
         <tbody>
@@ -44,6 +44,7 @@
                 <span *ngIf="coopBtns.del" (click)="showDelModal(data,'您确认要删除吗？','删除','del')">删除</span>
                 <span *ngIf="coopBtns.isStartUp"
                   (click)="showDelModal(data,data.active?'您确认要停用吗？':'您确认要启用吗？',data.active?'停用':'启用','switch',data.active)">{{data.active?'停用':'启用'}}</span>
+                <span *ngIf="coopBtns.executeNow" (click)="openExecModal(data)">立即执行</span>
               </div>
             </td>
           </tr>
@@ -161,5 +162,8 @@
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
   [info]="promptInfo">
 </app-prompt-modal>
+<!-- 立即执行 -->
+<app-dialog-delete [delModal]="execModal" (hideDelModalEvent)="closeExecModal()" [btnLoading]="btnLoading"
+  (confirmDelEvent)="confirmExec()" content="您确认要立即执行该定时下班策略吗？"></app-dialog-delete>
 <!-- 遮罩 -->
 <app-mask *ngIf="maskFlag"></app-mask>

src/app/views/regular-off-duty/regular-off-duty.component.ts

@@ -59,6 +59,31 @@ export class RegularOffDutyComponent implements OnInit {
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.initForm();
   }
+  // 立即执行
+  coopItem: any = {};
+  execModal: boolean = false;
+  // 打开立即执行模态框
+  openExecModal(item) {
+    this.coopItem = item;
+    this.execModal = true;
+  }
+  // 确认立即执行
+  confirmExec() {
+    this.btnLoading = true;
+    let posData = this.coopItem.classesIds.split(',');
+    this.mainService.executeNowClassesJob(posData).subscribe((result: any) => {
+      this.closeExecModal();
+      if (result.status == 200) {
+        this.showPromptModal("当前班次下班", true, "");
+      } else {
+        this.showPromptModal("当前班次下班", false, result.msg);
+      }
+    });
+  }
+  // 关闭立即执行模态框
+  closeExecModal() {
+    this.execModal = false;
+  }
   // 新增/编辑弹框
   add: boolean; //true:新增；false:编辑
   addModal() {

src/app/views/round-robin/round-robin.component.html

@@ -74,6 +74,7 @@
                 <span *ngIf="coopBtns.del" (click)="showDelModal(data.id,'您确认要删除此轮巡计划吗？','删除','del')">删除</span>
                 <span *ngIf="coopBtns.isStartUp"
                   (click)="showDelModal(data.id,data.flag?'您确认要停用该计划吗？':'您确认要启用该计划吗？',data.flag?'停用':'启用','switch',data.flag)">{{data.flag?'停用':'启用'}}</span>
+                <span *ngIf="coopBtns.executeNow" (click)="openExecModal(data)">立即执行</span>
               </div>
             </td>
           </tr>
@@ -248,6 +249,9 @@
 </app-prompt-modal>
 <!-- 查看详情 -->
 <router-outlet></router-outlet>
+<!-- 立即执行 -->
+<app-dialog-delete [delModal]="execModal" (hideDelModalEvent)="closeExecModal()" [btnLoading]="btnLoading"
+  (confirmDelEvent)="confirmExec()" content="您确认要立即执行该轮巡计划吗？"></app-dialog-delete>
 <!-- 遮罩 -->
 <app-mask *ngIf="maskFlag"></app-mask>
 <!-- 批量建单设置 -->

src/app/views/round-robin/round-robin.component.ts

@@ -646,7 +646,32 @@ export class RoundRobinComponent implements OnInit {
       this.oneOption[1]["checked"] = true;
     }
   }
-
+  // 立即执行
+  coopItem: any = {};
+  execModal: boolean = false;
+  // 打开立即执行模态框
+  openExecModal(item) {
+    this.coopItem = item;
+    this.execModal = true;
+  }
+  // 确认立即执行
+  confirmExec() {
+    this.btnLoading = true;
+    this.mainService
+      .executeNowOrderPlan(this.coopItem.id)
+      .subscribe((result: any) => {
+        this.closeExecModal();
+        if (result.status == 200) {
+          this.showPromptModal("立即执行", true, "");
+        } else {
+          this.showPromptModal("立即执行", false, result.msg);
+        }
+      });
+  }
+  // 关闭立即执行模态框
+  closeExecModal() {
+    this.execModal = false;
+  }
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
   showPromptModal(con, success, promptInfo?) {
     this.promptModalShow = false;