Parcourir la source

服务台预约建单

seimin il y a 10 mois
Parent
commit
2461247821

+ 1 - 1
proxy.conf.json

@@ -1,6 +1,6 @@
1 1
 {
2 2
   "/service": {
3
-    "target": "http://192.168.4.163",
3
+    "target": "http://192.168.3.108",
4 4
     "logLevel": "debug",
5 5
     "changeOrigin": true,
6 6
     "pathRewrite": {

+ 5 - 2
src/app/share/order-detail/order-detail.component.html

@@ -74,8 +74,8 @@
74 74
               }}
75 75
             </div>
76 76
             <div nz-col nzSpan="6">目标科室:{{ endDepts }}</div>
77
-            <div nz-col nzSpan="6" *ngIf="orderInfo.urgentDetails">
78
-              加急状态:{{ orderInfo.urgentDetails.checkStatus.name }}
77
+            <div nz-col nzSpan="6" *ngIf="orderInfo.yyjdTime">
78
+              预约时间:{{ orderInfo.yyjdTime | date: "MM-dd HH:mm" }}
79 79
             </div>
80 80
           </div>
81 81
           <div class="info" nz-row>
@@ -85,6 +85,9 @@
85 85
             <div nz-col nzSpan="6" *ngIf="orderInfo.inspectUsersNum">
86 86
               执行人数:{{ orderInfo.inspectUsersNum }}
87 87
             </div>
88
+            <div nz-col nzSpan="6" *ngIf="orderInfo.urgentDetails">
89
+              加急状态:{{ orderInfo.urgentDetails.checkStatus.name }}
90
+            </div>
88 91
           </div>
89 92
           <div class="info" nz-row *ngIf="orderInfo.urgentDetails">
90 93
             <div nz-col nzSpan="24" class="jiaji">

+ 49 - 0
src/app/views/fuwutai/fuwutai.component.ts

@@ -584,6 +584,54 @@ export class FuwutaiComponent implements OnInit {
584 584
       }
585 585
     })
586 586
   }
587
+  //获取检查页面任务类型
588
+  getInspectAndPatientTransportConfigTasktype() {
589
+    let postData = {
590
+      idx: 0,
591
+      sum: 10,
592
+      taskType: {
593
+        simpleQuery: true,
594
+        hosId: {
595
+          id: this.checkedHos
596
+        },
597
+        associationType: {
598
+          key:"association_types",
599
+          value: 'inspect'
600
+        }
601
+      }
602
+    };
603
+    this.mainService
604
+      .getFetchDataList("simple/data", "taskType", postData)
605
+      .subscribe((result) => {
606
+        if (result.status == 200) {
607
+          let tasktype:any = result.list[0] || {};
608
+          this.getInspectAndPatientTransportConfig(tasktype);
609
+        }
610
+      });
611
+  }
612
+  // 获取检查页面信息配置
613
+  getInspectAndPatientTransportConfig(tasktype) {
614
+    let postData = {
615
+      idx: 0,
616
+      sum: 10,
617
+      taskTypeConfig: {
618
+        taskTypeDTO: {
619
+          hosId: {
620
+            id: this.checkedHos
621
+          },
622
+          associationType: tasktype.associationType
623
+        }
624
+      }
625
+    };
626
+    this.mainService
627
+      .getFetchDataList("simple/data", "taskTypeConfig", postData)
628
+      .subscribe((result) => {
629
+        if (result.status == 200) {
630
+          let inspectAndPatientTransportConfig = result.list[0] || {};
631
+          this.inspectAndPatientTransportConfig = {...this.inspectAndPatientTransportConfig, ...inspectAndPatientTransportConfig};
632
+        }
633
+      });
634
+  }
587 635
   ngOnInit() {
588 636
     //防抖
589 637
     this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
@@ -634,6 +682,7 @@ export class FuwutaiComponent implements OnInit {
634 682
     this.moveMenu();
635 683
     this.getPhoneNum();
636 684
     this.getUnassignedBuilding2();
685
+    this.getInspectAndPatientTransportConfigTasktype();
637 686
   }
638 687
   ngOnDestroy() {
639 688
     clearInterval(this.refreshTimerId);

+ 2 - 3
src/app/views/performance-allocation/performance-allocation.component.ts

@@ -88,9 +88,8 @@ export class PerformanceAllocationComponent implements OnInit {
88 88
         this.loading = false;
89 89
         if (result.status == 200) {
90 90
           this.configs = result.list[0] || {};
91
-          let original_dept = this.grade_calculates.find(v => v.value == 'original_dept');
92
-          this.startCalculate = this.configs.startCalculate ? this.configs.startCalculate.id : (original_dept ? original_dept.id : undefined);
93
-          this.endCalculate = this.configs.endCalculate ? this.configs.endCalculate.id : (original_dept ? original_dept.id : undefined);
91
+          this.startCalculate = this.configs.startCalculate ? this.configs.startCalculate.id : undefined;
92
+          this.endCalculate = this.configs.endCalculate ? this.configs.endCalculate.id : undefined;
94 93
         }
95 94
       });
96 95
   }