服务台预约建单

proxy.conf.json

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

src/app/share/order-detail/order-detail.component.html

@@ -74,8 +74,8 @@
               }}
             </div>
             <div nz-col nzSpan="6">目标科室：{{ endDepts }}</div>
-            <div nz-col nzSpan="6" *ngIf="orderInfo.urgentDetails">
-              加急状态：{{ orderInfo.urgentDetails.checkStatus.name }}
+            <div nz-col nzSpan="6" *ngIf="orderInfo.yyjdTime">
+              预约时间：{{ orderInfo.yyjdTime | date: "MM-dd HH:mm" }}
             </div>
           </div>
           <div class="info" nz-row>
@@ -85,6 +85,9 @@
             <div nz-col nzSpan="6" *ngIf="orderInfo.inspectUsersNum">
               执行人数：{{ orderInfo.inspectUsersNum }}
             </div>
+            <div nz-col nzSpan="6" *ngIf="orderInfo.urgentDetails">
+              加急状态：{{ orderInfo.urgentDetails.checkStatus.name }}
+            </div>
           </div>
           <div class="info" nz-row *ngIf="orderInfo.urgentDetails">
             <div nz-col nzSpan="24" class="jiaji">

src/app/views/fuwutai/fuwutai.component.ts

@@ -584,6 +584,54 @@ export class FuwutaiComponent implements OnInit {
       }
     })
   }
+  //获取检查页面任务类型
+  getInspectAndPatientTransportConfigTasktype() {
+    let postData = {
+      idx: 0,
+      sum: 10,
+      taskType: {
+        simpleQuery: true,
+        hosId: {
+          id: this.checkedHos
+        },
+        associationType: {
+          key:"association_types",
+          value: 'inspect'
+        }
+      }
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "taskType", postData)
+      .subscribe((result) => {
+        if (result.status == 200) {
+          let tasktype:any = result.list[0] || {};
+          this.getInspectAndPatientTransportConfig(tasktype);
+        }
+      });
+  }
+  // 获取检查页面信息配置
+  getInspectAndPatientTransportConfig(tasktype) {
+    let postData = {
+      idx: 0,
+      sum: 10,
+      taskTypeConfig: {
+        taskTypeDTO: {
+          hosId: {
+            id: this.checkedHos
+          },
+          associationType: tasktype.associationType
+        }
+      }
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "taskTypeConfig", postData)
+      .subscribe((result) => {
+        if (result.status == 200) {
+          let inspectAndPatientTransportConfig = result.list[0] || {};
+          this.inspectAndPatientTransportConfig = {...this.inspectAndPatientTransportConfig, ...inspectAndPatientTransportConfig};
+        }
+      });
+  }
   ngOnInit() {
     //防抖
     this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
@@ -634,6 +682,7 @@ export class FuwutaiComponent implements OnInit {
     this.moveMenu();
     this.getPhoneNum();
     this.getUnassignedBuilding2();
+    this.getInspectAndPatientTransportConfigTasktype();
   }
   ngOnDestroy() {
     clearInterval(this.refreshTimerId);

src/app/views/performance-allocation/performance-allocation.component.ts

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