BUG修复

src/app/components/incidentManagement/incident-handle-repair/incident-handle-repair.component.html

@@ -16,7 +16,7 @@
 </div>
 <div class="detailItem">
   <div class="name">详细地址：</div>
-  <div class="value">{{ incidentData.place ? incidentData.place.building.buildingName : '' }}{{ incidentData.place ? incidentData.place.floorName : '' }}{{ incidentData.houseNumber }}</div>
+  <div class="value">{{ incidentData.place ? incidentData.place.building.buildingName : '' }}{{ incidentData.place ? incidentData.place.floorName + '层' : '' }}{{ incidentData.houseNumber }}</div>
 </div>
 <div class="detailItem">
   <div class="name">报修图片：</div>

src/app/components/incidentManagement/incident-ser-visit/incident-ser-visit.component.html

@@ -13,7 +13,7 @@
             <div class="col">故障描述：{{item.description}}</div>
           </div>
           <div class="row">
-            <div class="col">详细地址：{{ item.place ? item.place.building.buildingName : '' }}{{ item.place ? item.place.floorName : '' }}{{ item.houseNumber }} <span [innerHTML]="item.overtimeRemark"></span></div>
+            <div class="col">详细地址：{{ item.place ? item.place.building.buildingName : '' }}{{ item.place ? item.place.floorName + '层' : '' }}{{ item.houseNumber }} <span [innerHTML]="item.overtimeRemark"></span></div>
           </div>
           <div class="row">
             <div class="col">申请时间：{{ item.startDate | date: 'yyyy-MM-dd HH:mm'}}</div>

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

@@ -435,7 +435,7 @@ export class FuwutaiComponent implements OnInit {
           if (go === "&go&") {
             this.applyDept = data["startDept"].id;
             this.applyStartDept = data["startDept"];
-            this.incidentModel.incomingPhone = this.callNumber = data["phone"];
+            this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
             this.showPromptModal("建单", true, "", "closeGo");
           } else {
             if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
@@ -473,7 +473,7 @@ export class FuwutaiComponent implements OnInit {
         if (go === "&go&") {
           this.applyDept = data["startDept"].id;
           this.applyStartDept = data["startDept"];
-          this.incidentModel.incomingPhone = this.callNumber = data["phone"];
+          this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
           this.showPromptModal("建单", true, "", "closeGo");
         } else {
           if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
@@ -535,7 +535,7 @@ export class FuwutaiComponent implements OnInit {
         if (go === "&go&") {
           this.applyDept = data["startDept"].id;
           this.applyStartDept = data["startDept"];
-          this.incidentModel.incomingPhone = this.callNumber = data["phone"];
+          this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data["phone"];
           this.showPromptModal("建单", true, "", "closeGo");
         } else {
           if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
@@ -1338,21 +1338,32 @@ export class FuwutaiComponent implements OnInit {
         console.log(data);
         console.log(this.incidentModel);
         this.websocketLoading = false;
-        this.incidentModel = {};
-        this.incidentMsg = {};
-        this.incidentModel.callID = data.callId || undefined;
+
+        // 200签入 201摘机 202来电
         if (data.status == 200 && data.phone) {
+          this.incidentModel = {};
+          this.incidentMsg = {};
+          this.incidentModel.callID = data.callId || undefined;
           this.msg.info('签入成功');
           this.cancelBindExtensionNumber();
         } else if (data.status == 201 && data.phone) {
-          this.incidentModel.incomingPhone = this.callNumber = data.phone;
+          this.incidentModel = {};
+          this.incidentMsg = {};
+          this.incidentModel.callID = data.callId || undefined;
+
+          this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = data.phone;
           this.searchBxDept();
         } else if (data.status == 201 && data.phone === "") {
+          this.incidentModel = {};
+          this.incidentMsg = {};
+          this.incidentModel.callID = data.callId || undefined;
           //没绑定科室
           if (!this.newOrderShow && !this.newOrderShowOpen) {
             this.applyDept = null;
             this.showNewOrder("no", data.phone, true, '来电弹屏');
           }
+        } else if (data.status == 202) {
+          this.msg.warning(data.msg);
         }
       });
     }else if(sign === 'callCenter'){
@@ -1382,7 +1393,7 @@ export class FuwutaiComponent implements OnInit {
           console.log(result);
           if (result.list.length > 0) {
             //绑定了科室
-            if (!this.newOrderShow && !this.newOrderShowOpen) {
+            // if (!this.newOrderShow && !this.newOrderShowOpen) {
               let incidentModel:any = Object.assign({}, this.incidentModel);
               let incidentMsg:any = Object.assign({}, this.incidentMsg);
               incidentModel.department = result.list[0];
@@ -1400,7 +1411,7 @@ export class FuwutaiComponent implements OnInit {
               this.searchApplicationRequester();
               this.applyDeptMiddle = result.list[0];
               this.showNewOrder("yes", this.incidentModel.incomingPhone, true, '来电弹屏');
-            }
+            // }
           } else {
             //没绑定科室
             console.log(this.newOrderShow);
@@ -3294,7 +3305,7 @@ export class FuwutaiComponent implements OnInit {
       phone !== "&ks&" &&
       phone !== "&go&"
     ) {
-      // this.incidentModel.incomingPhone = this.callNumber = phone;
+      // this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = phone;
       this.applyDept = null;
       this.noArrives = []; //近期配送
     } else if (phone === "&ks&") {
@@ -3302,7 +3313,7 @@ export class FuwutaiComponent implements OnInit {
         (item) => item.id == this.applyDept
       );
       console.log('filter', filter)
-      // this.incidentModel.incomingPhone = this.callNumber = filter[0].phone;
+      // this.incidentModel.incomingPhone = this.callNumber = this.incidentModel.contactsInformation = filter[0].phone;
       console.log(this.callNumber); //ceshi
       if (this.currentTabIndex == "255") {
         //患者转运

src/app/views/incident-management/incident-management.component.ts

@@ -301,7 +301,7 @@ export class IncidentManagementComponent implements OnInit {
       }
     }else{
         delete postData.incident.duty;
-        delete postData.incident.branch;
+        delete postData.incident.hosId;
     }
 
     postData.incident.queryTask = this.queryTask;
@@ -359,7 +359,7 @@ export class IncidentManagementComponent implements OnInit {
           }
         }else{
             delete incident.duty;
-            delete incident.branch;
+            delete incident.hosId;
         }
 
         incident.assignee = this.tool.getCurrentUserId();
@@ -558,10 +558,9 @@ export class IncidentManagementComponent implements OnInit {
   export() {
     let postData: any = {
       idx: 0,
-      sum: 9999,
+      sum: 99999,
       incident: {
         assignee: this.tool.getCurrentUserId(),
-        duty: this.tool.getCurrentHospital(),
         acceptDate: this.searchDTO.dateRange ? format(this.searchDTO.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
         acceptDateEnd: this.searchDTO.dateRange ? format(this.searchDTO.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
         incidentsign: this.searchDTO.incidentsign,
@@ -586,7 +585,7 @@ export class IncidentManagementComponent implements OnInit {
       }
     }else{
         delete postData.incident.duty;
-        delete postData.incident.branch;
+        delete postData.incident.hosId;
     }
 
     postData.incident.queryTask = this.queryTask;