Merge branch 'master' into develop

src/app/components/configurationCenter/configuration-category/configuration-category.component.ts

@@ -78,6 +78,7 @@ export class ConfigurationCategoryComponent implements OnInit {
     }
     this.getCategoryList(1);
     this.getHospitals(1);
+    this.getHospitals(2);
     this.getPrioritys();
     this.getScores();
   }
@@ -293,10 +294,10 @@ export class ConfigurationCategoryComponent implements OnInit {
     this.validateConfigForm.controls.userId.setValue(null);
     this.validateConfigForm.controls.groupId.setValue(null);
 
-    this.dutyList = [];
+    // this.dutyList = [];
     this.userList = [];
     this.groupList = [];
-    this.getHospitals(2, id);
+    // this.getHospitals(2, id);
   }
 
   // 获取院区
@@ -308,14 +309,14 @@ export class ConfigurationCategoryComponent implements OnInit {
       this.hospitalList = this.tool.getHospitalList().filter(v => !v.parent);
       return;
     }
-    if(type === 2 && !parentId){
-      this.isLoading = false;
-      this.dutyList = [];
-      return;
-    }
+    // if(type === 2 && !parentId){
+    //   this.isLoading = false;
+    //   this.dutyList = [];
+    //   return;
+    // }
     let postData = {
       hospital: {
-        parent: { id: parentId },
+        // parent: { id: parentId },
         type: { key: 'hospital_type', value: '6' },
       },
       idx: 0,
@@ -616,7 +617,7 @@ export class ConfigurationCategoryComponent implements OnInit {
     }else if(data.userGroup === 2){
       this.requiredConfigChange('userId', false);
     }
-    data.hosId && this.getHospitals(2, data.hosId);
+    // data.hosId && this.getHospitals(2, data.hosId);
     data.dutyId && this.getUsers('', true);
     data.dutyId && this.getGroups('', true);
   }

src/app/components/incidentManagement/incident-detail/incident-detail.component.html

@@ -21,7 +21,7 @@
               <div class="col">故障描述：{{incidentData.description}}</div>
             </div>
             <div class="row">
-              <div class="col">详细地址：{{ incidentData.place?.building?.buildingName }}{{ incidentData.place?.floorName }}{{ incidentData.houseNumber }}</div>
+              <div class="col">详细地址：{{ incidentData.place?.building?.buildingName }}{{ incidentData.place ? incidentData.place.floorName + '层' : '' }}{{ incidentData.houseNumber }}</div>
             </div>
             <div class="row">
               <div class="col thumbs">

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/clinical-users-management/clinical-users-management.component.ts

@@ -335,6 +335,7 @@ export class ClinicalUsersManagementComponent implements OnInit {
         phone: that.validateForm.value.deptPhone,
         hospital: { id: that.add ? that.tool.getCurrentHospital().id : that.hosId },
         weixin: that.validateForm.value.weixin,
+        engineer: this.userTypes.find(v => v.id == that.validateForm.value.usertype).value == 4 ? 1 : 0,
       },
     };
     if (!that.validateForm.value.userGroup) {

src/app/views/fuwutai/fuwutai.component.html

@@ -220,7 +220,7 @@
 
                   <div class="didian">
                     <span class="left">
-                      <span nz-tooltip [nzTooltipTitle]="(data.data.place ? data.data.place.building.buildingName : '') + (data.data.place ? data.data.place.floorName : '') + data.data.houseNumber">{{ data.data.place ? data.data.place.building.buildingName : '' }}{{ data.data.place ? data.data.place.floorName : '' }}{{ data.data.houseNumber }}</span>
+                      <span nz-tooltip [nzTooltipTitle]="(data.data.place ? data.data.place.building.buildingName : '') + (data.data.place ? data.data.place.floorName + '层' : '') + data.data.houseNumber">{{ data.data.place ? data.data.place.building.buildingName : '' }}{{ data.data.place ? data.data.place.floorName + '层' : '' }}{{ data.data.houseNumber }}</span>
                       <i class="icon_transport transport-a-11111 ml8" *ngIf="data.data.reqAttachment"></i>
                     </span>
                   </div>
@@ -431,7 +431,7 @@
 
                   <div class="didian">
                     <span class="left">
-                      <span nz-tooltip [nzTooltipTitle]="(data.data.place ? data.data.place.building.buildingName : '') + (data.data.place ? data.data.place.floorName : '') + data.data.houseNumber">{{ data.data.place ? data.data.place.building.buildingName : '' }}{{ data.data.place ? data.data.place.floorName : '' }}{{ data.data.houseNumber }}</span>
+                      <span nz-tooltip [nzTooltipTitle]="(data.data.place ? data.data.place.building.buildingName : '') + (data.data.place ? data.data.place.floorName + '层' : '') + data.data.houseNumber">{{ data.data.place ? data.data.place.building.buildingName : '' }}{{ data.data.place ? data.data.place.floorName + '层' : '' }}{{ data.data.houseNumber }}</span>
                       <i class="icon_transport transport-a-11111 ml8" *ngIf="data.data.reqAttachment"></i>
                     </span>
                   </div>
@@ -635,7 +635,7 @@
 
                   <div class="didian">
                     <span class="left">
-                      <span nz-tooltip [nzTooltipTitle]="(data.data.place ? data.data.place.building.buildingName : '') + (data.data.place ? data.data.place.floorName : '') + data.data.houseNumber">{{ data.data.place ? data.data.place.building.buildingName : '' }}{{ data.data.place ? data.data.place.floorName : '' }}{{ data.data.houseNumber }}</span>
+                      <span nz-tooltip [nzTooltipTitle]="(data.data.place ? data.data.place.building.buildingName : '') + (data.data.place ? data.data.place.floorName + '层' : '') + data.data.houseNumber">{{ data.data.place ? data.data.place.building.buildingName : '' }}{{ data.data.place ? data.data.place.floorName + '层' : '' }}{{ data.data.houseNumber }}</span>
                       <i class="icon_transport transport-a-11111 ml8" *ngIf="data.data.reqAttachment"></i>
                     </span>
                   </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.html

@@ -79,7 +79,7 @@
             <td class="text_align_left">
               {{ data.hosName || '无' }}<br>
               {{ data.department?.dept || '无' }}<br>
-              {{ data.place ? data.place.building.buildingName : '' }}{{ data.place ? data.place.floorName : '' }}{{ data.houseNumber }}
+              {{ data.place ? data.place.building.buildingName : '' }}{{ data.place ? data.place.floorName + '层' : '' }}{{ data.houseNumber }}
             </td>
             <td class="text_align_left">
               {{ data.requester?.name || '无' }}<br>

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;

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

@@ -418,6 +418,7 @@ export class UsersManagementComponent implements OnInit {
         hospital: { id: that.hosId },
         weixin: that.validateForm.value.weixin,
         companyId: that.validateForm.value.companyId || undefined,
+        engineer: that.validateForm.value.usertype == 4 ? 1 : 0,
       },
     };
     if (!that.validateForm.value.userGroup) {