seimin 1 年之前
父節點
當前提交
1ab01b51ef

+ 1 - 1
src/app/views/hushijiandan/hushijiandan.component.html

@@ -406,7 +406,7 @@
406
           >
406
           >
407
             <span>护士端<span class="todayNum">当日建单数:{{ todayNum }}</span></span>
407
             <span>护士端<span class="todayNum">当日建单数:{{ todayNum }}</span></span>
408
             <p class="updateTipsForNurses red">{{ updateTipsForNurses }}</p>
408
             <p class="updateTipsForNurses red">{{ updateTipsForNurses }}</p>
409
-            <span class="todayNum">等待陪检:<span class="red">{{queuingInformationList[0]}}</span>&emsp;陪检中:<span class="red">{{queuingInformationList[1]}}</span></span>
409
+            <span class="todayNum" *ngIf="inspectAndPatientTransportConfig.queuingInformation == 1">等待陪检:<span class="red">{{queuingInformationList[0]}}</span>&emsp;陪检中:<span class="red">{{queuingInformationList[1]}}</span></span>
410
             <div class="nurseCode" (click)="showNurseCode()">
410
             <div class="nurseCode" (click)="showNurseCode()">
411
               <i class="nurseCodeIcon icon_transport transport-erweima"></i
411
               <i class="nurseCodeIcon icon_transport transport-erweima"></i
412
               >二维码
412
               >二维码

+ 2 - 2
src/app/views/hushijiandan/hushijiandan.component.ts

@@ -110,7 +110,7 @@ export class HushijiandanComponent implements OnInit {
110
     private mainService: MainService,
110
     private mainService: MainService,
111
     private notification: NzNotificationService,
111
     private notification: NzNotificationService,
112
     private webs: WebsocketNurseService,
112
     private webs: WebsocketNurseService,
113
-    private tool: ToolService
113
+    public tool: ToolService
114
   ) {
114
   ) {
115
     this.othersListOptions = {
115
     this.othersListOptions = {
116
       onUpdate: (event: any) => {
116
       onUpdate: (event: any) => {
@@ -473,7 +473,7 @@ export class HushijiandanComponent implements OnInit {
473
       .subscribe((result) => {
473
       .subscribe((result) => {
474
         if (result.status == 200) {
474
         if (result.status == 200) {
475
           let inspectAndPatientTransportConfig = result.list[0] || {};
475
           let inspectAndPatientTransportConfig = result.list[0] || {};
476
-          this.inspectAndPatientTransportConfig = {...this.inspectAndPatientTransportConfig, inspectAndPatientTransportConfig};
476
+          this.inspectAndPatientTransportConfig = {...this.inspectAndPatientTransportConfig, ...inspectAndPatientTransportConfig};
477
 
477
 
478
           // 是否显示排队信息
478
           // 是否显示排队信息
479
           if(this.inspectAndPatientTransportConfig.queuingInformation == 1){
479
           if(this.inspectAndPatientTransportConfig.queuingInformation == 1){

+ 1 - 1
src/app/views/main/main.component.ts

@@ -40,7 +40,7 @@ export class MainComponent implements OnInit {
40
     private msg: NzMessageService,
40
     private msg: NzMessageService,
41
     private notification: NzNotificationService,
41
     private notification: NzNotificationService,
42
     private webs: WebsocketMainService,
42
     private webs: WebsocketMainService,
43
-    private tool: ToolService
43
+    public tool: ToolService
44
   ) {}
44
   ) {}
45
   ngOnInit() {
45
   ngOnInit() {
46
     this.highlightMenuByUrl();
46
     this.highlightMenuByUrl();

+ 1 - 1
src/app/views/pharmacy/pharmacy.component.ts

@@ -25,7 +25,7 @@ export class PharmacyComponent implements OnInit {
25
     static: false,
25
     static: false,
26
   })
26
   })
27
   osComponentRef3: OverlayScrollbarsComponent;
27
   osComponentRef3: OverlayScrollbarsComponent;
28
-  constructor(private mainService: MainService, public router: Router, private tool: ToolService) {}
28
+  constructor(private mainService: MainService, public router: Router, public tool: ToolService) {}
29
   //待配药数据
29
   //待配药数据
30
   codes = [];
30
   codes = [];
31
   // 待配药
31
   // 待配药

+ 1 - 1
src/app/views/pharmacy2/pharmacy2.component.ts

@@ -36,7 +36,7 @@ export class Pharmacy2Component implements OnInit, OnDestroy {
36
     static: false,
36
     static: false,
37
   })
37
   })
38
   osComponentRef5: OverlayScrollbarsComponent;
38
   osComponentRef5: OverlayScrollbarsComponent;
39
-  constructor(private mainService: MainService, public router: Router, private tool: ToolService) {}
39
+  constructor(private mainService: MainService, public router: Router, public tool: ToolService) {}
40
   // 今日药单量
40
   // 今日药单量
41
   todayTotal: undefined;
41
   todayTotal: undefined;
42
   // 今日已完成
42
   // 今日已完成

+ 1 - 1
src/app/views/specimen-view2/specimen-view2.component.ts

@@ -36,7 +36,7 @@ export class SpecimenView2Component implements OnInit, OnDestroy {
36
     static: false,
36
     static: false,
37
   })
37
   })
38
   osComponentRef5: OverlayScrollbarsComponent;
38
   osComponentRef5: OverlayScrollbarsComponent;
39
-  constructor(private mainService: MainService, public router: Router, private tool: ToolService) {}
39
+  constructor(private mainService: MainService, public router: Router, public tool: ToolService) {}
40
   // 今日药单量
40
   // 今日药单量
41
   todayTotal: undefined;
41
   todayTotal: undefined;
42
   // 今日已完成
42
   // 今日已完成