在系统配置管理中增加护士科室切换提示自动关闭设置

src/app/share/hs-prompt-modal/hs-prompt-modal.component.html

@@ -1,13 +1,17 @@
 <div class="modal display_flex justify-content_flex-center align-items_center" *ngIf="show">
   <div class="modalBody" *ngIf="changeShow">
-    <div class="title">当前科室<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="title">当前科室<i *ngIf="closeTimeFlag<=0||closeTimeFlag>0&&closeTime===0"
+        class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
     <div class="content">
       <div class="defeat">{{currentDept.dept}}</div>
-      <div class="countDown">关闭倒计时<em>{{closeTime}}s</em></div>
+      <div class="countDown" *ngIf="closeTimeFlag<0||closeTimeFlag>0&&closeTime>0"><span
+          *ngIf="closeTimeFlag<0">关闭</span>倒计时<em>{{closeTime}}s</em></div>
     </div>
     <div class="display_flex justify-content_flex-center">
-      <button class="btn know" nz-button nzType="primary" (click)="hideModal()">知道了</button>
-      <button class="btn know" nz-button nzType="primary" nzGhost (click)="changeModal()">切换科室</button>
+      <button *ngIf="closeTimeFlag<=0||closeTimeFlag>0&&closeTime===0" class="btn know" nz-button nzType="primary"
+        (click)="hideModal()">知道了</button>
+      <button *ngIf="closeTimeFlag<=0||closeTimeFlag>0&&closeTime===0" class="btn know" nz-button nzType="primary"
+        nzGhost (click)="changeModal()">切换科室</button>
     </div>
   </div>
   <div class="modalBody modalBody-search" *ngIf="!changeShow">

src/app/share/hs-prompt-modal/hs-prompt-modal.component.ts

@@ -23,6 +23,7 @@ export class HsPromptModalComponent implements OnInit {
   @Input() show: Boolean;
   @Input() changeShow: Boolean;
   @Input() closeTime: Number;
+  @Input() closeTimeFlag;
 
   @Output() closeModelHs = new EventEmitter<any>(); //1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
   @Output() clearModelHs = new EventEmitter<any>(); //1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件

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

@@ -1268,7 +1268,7 @@
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
   [info]="promptInfo" [back]="back" (closeModel)="closeModel($event)"></app-prompt-modal>
 <!-- 护士端科室切换提示框 -->
-<app-hs-prompt-modal [changeShow]="changeShow" [closeTime]="closeTime" [show]="hsPromptModalShow"
+<app-hs-prompt-modal [changeShow]="changeShow" [closeTime]="closeTime" [closeTimeFlag]="closeTimeFlag" [show]="hsPromptModalShow"
   (closeModelHs)="closeModelHs($event)" (clearModelHs)="clearModelHs($event)"></app-hs-prompt-modal>
 <!-- 标本历史记录查看 -->
 <app-history-prompt-modal *ngIf="historyPromptModalShow" [show]="historyPromptModalShow" [scode]="scode"

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

@@ -122,6 +122,7 @@ export class HushijiandanComponent implements OnInit {
   }
   // 关闭倒计时
   closeTime = 3;
+  closeTimeFlag;
   timerCloseTime = null;
   changeShow = true;
   currentHospital; //当前院区
@@ -130,6 +131,7 @@ export class HushijiandanComponent implements OnInit {
   logTime = 0; //综合日志自动刷新秒数
   logTimeConst = 30; //综合日志自动刷新秒数
   ngOnInit() {
+    this.getCloseTimeFlag();
     this.currentUser = this.tool.getCurrentUserDept();
     console.log(this.currentUser, this.tabSearchCont);
     //防抖
@@ -140,7 +142,7 @@ export class HushijiandanComponent implements OnInit {
       this.getDeptTaskType(v);
     });
     this.currentHospital = this.tool.getCurrentHospital();
-    this.changeKs();
+
     this.initLogin();
     this.getDeptTaskType();
     this.initForm();
@@ -210,6 +212,25 @@ export class HushijiandanComponent implements OnInit {
     this.remarksEle.nativeElement.focus();
     this.workOrderRemark += item;
   }
+  // 获取护士端弹窗的配置
+  // (1)	当用户设置为正数时，用户必须查看此窗体指定秒数。
+  // (2)	当用户设置为负数时，用户可点击知道了也可倒计时自动关闭。
+  // (3)	如果用户填写0则为无自动关闭和强制查看时间。
+  getCloseTimeFlag() {
+    let postData = {
+      idx: 0,
+      sum: 1,
+      systemConfiguration: { keyconfig: "nurseDeptSwitchTip" },
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "systemConfiguration", postData)
+      .subscribe((result) => {
+        if (result.status == 200) {
+          this.closeTimeFlag = result.list[0].valueconfig - 0;
+          this.changeKs();
+        }
+      });
+  }
   //获取综合日志
   rLoading = false;
   listDeptOrderRecords: any = [];
@@ -349,12 +370,20 @@ export class HushijiandanComponent implements OnInit {
   // 切换科室
   changeKs() {
     this.hsPromptModalShow = true;
-    this.closeTime = 3;
+    // (1)	当用户设置为正数时，用户必须查看此窗体指定秒数。
+    // (2)	当用户设置为负数时，用户可点击知道了也可倒计时自动关闭。
+    // (3)	如果用户填写0则为无自动关闭和强制查看时间。
+    if (this.closeTimeFlag === 0) {
+      return;
+    }
+    this.closeTime = Math.abs(this.closeTimeFlag);
     clearInterval(this.timerCloseTime);
     this.timerCloseTime = setInterval(() => {
-      this.closeTime = Math.max(--this.closeTime, -1);
-      if (this.closeTime === -1) {
-        this.hsPromptModalShow = false;
+      this.closeTime = Math.max(--this.closeTime, 0);
+      if (this.closeTime === 0) {
+        if (this.closeTimeFlag <= 0) {
+          this.hsPromptModalShow = false;
+        }
         clearInterval(this.timerCloseTime);
       }
     }, 1000);

src/app/views/sys-config/sys-config.component.html

@@ -92,6 +92,13 @@
             </nz-select>
           </nz-form-control>
         </nz-form-item>
+        <nz-form-item class="formItem">
+          <nz-form-label [nzSpan]="13" nzFor="nurseDeptSwitchTip" nzRequired class="label">护士科室切换提示自动关闭设置
+          </nz-form-label>
+          <nz-form-control [nzSpan]="11" nzErrorTip="护士科室切换提示自动关闭设置是必填项!">
+            <nz-input-number class="w100" formControlName="nurseDeptSwitchTip" [nzStep]="1"></nz-input-number>
+          </nz-form-control>
+        </nz-form-item>
       </div>
     </form>
   </div>

src/app/views/sys-config/sys-config.component.ts

@@ -37,6 +37,7 @@ export class SysConfigComponent implements OnInit {
       orderClearUserSwitch: [null, [Validators.required]],
       deptQRCode: [null, [Validators.required]],
       workOrderSettings: [5, [Validators.required]],
+      nurseDeptSwitchTip: [0, [Validators.required]],
       defaultRoleOfNurse: [null, [Validators.required]],
       formUrl: [{ value: null, disabled: true }, [Validators.required]],
       serviceUrl: [{ value: null, disabled: true }, [Validators.required]],
@@ -94,6 +95,7 @@ export class SysConfigComponent implements OnInit {
         item.keyconfig === "orderClearUserSwitch" ||
         item.keyconfig === "deptQRCode" ||
         item.keyconfig === "workOrderSettings" ||
+        item.keyconfig === "nurseDeptSwitchTip" ||
         item.keyconfig === "defaultRoleOfNurse" ||
         item.keyconfig === "busiViewDeptId"
     );
@@ -109,6 +111,8 @@ export class SysConfigComponent implements OnInit {
         item.valueconfig = this.validateForm.controls.deptQRCode.value;
       } else if (item.keyconfig === "workOrderSettings") {
         item.valueconfig = this.validateForm.controls.workOrderSettings.value;
+      } else if (item.keyconfig === "nurseDeptSwitchTip") {
+        item.valueconfig = this.validateForm.controls.nurseDeptSwitchTip.value;
       } else if (item.keyconfig === "defaultRoleOfNurse") {
         item.valueconfig = this.validateForm.controls.defaultRoleOfNurse.value;
       } else if (item.keyconfig === "busiViewDeptId") {
@@ -176,6 +180,9 @@ export class SysConfigComponent implements OnInit {
                 case "workOrderSettings":
                   this.validateForm.controls.workOrderSettings.setValue(c[1]);
                   break;
+                case "nurseDeptSwitchTip":
+                  this.validateForm.controls.nurseDeptSwitchTip.setValue(c[1]);
+                  break;
                 case "defaultRoleOfNurse":
                   this.validateForm.controls.defaultRoleOfNurse.setValue(
                     c[1] - 0