优化

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

@@ -653,7 +653,7 @@ export class ConfigurationCategoryComponent implements OnInit {
           userGroup: this.validateConfigForm.value.userGroup,
           groupId: this.validateConfigForm.value.groupId || undefined,
           userId: this.validateConfigForm.value.userGroup === 1 ? this.validateConfigForm.value.userId : undefined,
-          hosId: this.currentHospital.id,
+          hosId: this.hospitalConfig === 1 ? this.currentHospital.id  : this.validateConfigForm.value.hosId,
         }
       };
     } else {

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

@@ -2244,7 +2244,7 @@
       </div>
       <div class="btns display_flex justify-content_flex-center align-items_center">
         <ng-container *ngIf="applyDept && currentTabIndex !== '99999'">
-          <button nz-button class="btn" nzType="primary" (click)="newOrderOk('go')" [nzLoading]="isGoLoading">
+          <button nz-button class="btn" nzType="primary" (click)="newOrderOk('&go&')" [nzLoading]="isGoLoading">
             继续建单
           </button>
           <button nz-button class="btn" nzType="primary" (click)="newOrderOk()" [nzLoading]="isOkLoading">

src/app/views/fuwutai/fuwutai.component.less

@@ -6,7 +6,7 @@
   padding: 16px;
   display: flex;
   flex-direction: column;
-  ::ng-deep .yyTime .ant-form-item-label {
+  ::ng-deep .bottomWrap .bottom .ant-form-item-label {
     line-height: 24px;
   }
 }

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

@@ -438,6 +438,9 @@ export class FuwutaiComponent implements OnInit {
             this.incidentModel.incomingPhone = this.callNumber = data["phone"];
             this.showPromptModal("建单", true, "", "closeGo");
           } else {
+            if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
+              // this.jry_shixian();
+            }
             this.showPromptModal("建单", true, "", "close");
           }
         } else {
@@ -473,6 +476,9 @@ export class FuwutaiComponent implements OnInit {
           this.incidentModel.incomingPhone = this.callNumber = data["phone"];
           this.showPromptModal("建单", true, "", "closeGo");
         } else {
+          if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
+            // this.jry_shixian();
+          }
           this.showPromptModal("建单", true, "", "close");
         }
       } else {
@@ -532,6 +538,9 @@ export class FuwutaiComponent implements OnInit {
           this.incidentModel.incomingPhone = this.callNumber = data["phone"];
           this.showPromptModal("建单", true, "", "closeGo");
         } else {
+          if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
+            // this.jry_shixian();
+          }
           this.showPromptModal("建单", true, "", "close");
         }
       } else {
@@ -707,7 +716,6 @@ export class FuwutaiComponent implements OnInit {
     if(this.incomingService.getSign() === 'box'){
       this.getPhoneNum();
     }else if(this.incomingService.getSign() === 'callCenter'){
-      let _this = this;
       setTimeout(this.getPhoneNum.bind(this), 2000)
     }else{
       this.websocketLoading = false;
@@ -1250,12 +1258,12 @@ export class FuwutaiComponent implements OnInit {
   // 保存工单信息
   confirmOrderScope(data){
     if (data.status == 200) {
-      this.websocketLoading = true;
+      // this.websocketLoading = true;
       this.cancelOrderScope();
       this.showPromptModal("保存", true, "");
       // 关闭phone的websocket
-      this.incomingService.closeWs(true);
-      this.getPhoneNum(false);
+      // this.incomingService.closeWs(true);
+      // this.getPhoneNum(false);
       this.user.user.scope = data.data;
       localStorage.setItem("user", JSON.stringify(this.user));
       this.initOrderScope();
@@ -1338,7 +1346,7 @@ export class FuwutaiComponent implements OnInit {
           //没绑定科室
           if (!this.newOrderShow && !this.newOrderShowOpen) {
             this.applyDept = null;
-            this.showNewOrder("no", data.phone, true);
+            this.showNewOrder("no", data.phone, true, '来电弹屏');
           }
         }
       });
@@ -1370,15 +1378,28 @@ export class FuwutaiComponent implements OnInit {
           if (result.list.length > 0) {
             //绑定了科室
             if (!this.newOrderShow && !this.newOrderShowOpen) {
+              let incidentModel:any = Object.assign({}, this.incidentModel);
+              let incidentMsg:any = Object.assign({}, this.incidentMsg);
+              incidentModel.department = result.list[0];
+              incidentModel.department && incidentModel.department.hospital && (incidentModel.hosId = incidentModel.department.hospital.parent ? incidentModel.department.hospital.parent.id : incidentModel.department.hospital.id);
+              incidentModel.department && incidentModel.department.building && (incidentModel.area = incidentModel.department.building.id);
+              incidentModel.department && incidentModel.department.floor && (incidentModel.place = incidentModel.department.floor.id);
+              incidentModel.department && incidentModel.department.address && (incidentModel.houseNumber = incidentModel.department.address);
+              incidentModel.department && (incidentMsg.deptManyPhone = incidentModel.department.manyPhone);
+              incidentModel.department && (incidentMsg.deptName = incidentModel.department.dept);
+
+              incidentModel.department && (incidentModel.department = incidentModel.department.id);
+              this.incidentModel = incidentModel;
+              this.incidentMsg = incidentMsg;
               this.applyDeptMiddle = result.list[0];
-              this.showNewOrder("yes", this.incidentModel.incomingPhone, true);
+              this.showNewOrder("yes", this.incidentModel.incomingPhone, true, '来电弹屏');
             }
           } else {
             //没绑定科室
             console.log(this.newOrderShow);
             if (!this.newOrderShow && !this.newOrderShowOpen) {
               this.applyDept = null;
-              this.showNewOrder("no", this.incidentModel.incomingPhone, true);
+              this.showNewOrder("no", this.incidentModel.incomingPhone, true, '来电弹屏');
             }
           }
         }
@@ -2230,11 +2251,18 @@ export class FuwutaiComponent implements OnInit {
   resetOrderData(){
     this.applicationRequesterList = [];
     this.fileList = [];
+    this.repairImgs = [];
   }
   // 打开新建工单
   deathTasktypeId; //获取这个写死的任务类型的id,送病人回病房
   deathTasktypeIdPatient; //获取这个写死的任务类型的id,转出院记录
   async showNewOrder(des = '', phone = '', isInit = false, buildType = '') {
+    if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
+      //进入弹窗,强制示忙
+      setTimeout(()=>{
+        tlwsa.tlaAcw();
+      },0)
+    }
     this.buildType = buildType;
     if(this.itsmData.mdv2Switch){
       this.resetOrderData();
@@ -2323,11 +2351,12 @@ export class FuwutaiComponent implements OnInit {
         this.searchTaskList.forEach((item) => {
           item.sid = item.associationTypeId + "_" + item.id;
         });
-        if(phone){
-          this.getAutoWorkTypes(true, isInit);
-        }else{
-          this.getAutoWorkTypes(false, isInit);
-        }
+        // if(phone){
+        //   this.getAutoWorkTypes(true, isInit);
+        // }else{
+        //   this.getAutoWorkTypes(false, isInit);
+        // }
+        this.getAutoWorkTypes(false, isInit);
       }
     });
   }
@@ -2389,16 +2418,10 @@ export class FuwutaiComponent implements OnInit {
 
       let deptObj = this.applicationDeptList.find(v => v.id == this.incidentModel.department);
 
-      if(this.applyDept !== this.incidentModel.department){
+      if(this.applyDept != this.incidentModel.department){
         this.applyDept = this.incidentModel.department;
         this.searchApplicationDepartment('hsms', deptObj ? deptObj.dept : '', undefined, this.incidentModel.department);
       }
-
-      // 回显事件来源
-      let source = this.applicationSourceList.find(v => v.value === 'phone');
-      if(!this.incidentModel.source && source){
-        this.incidentModel.source = source.id;
-      }
     }else if(this.currentTabIndex === '99999'){
       if(this.incidentModel.department){
         this.rightTitle_tab = [
@@ -2410,7 +2433,7 @@ export class FuwutaiComponent implements OnInit {
 
       let deptObj = this.applicationDepartmentList.find(v => v.id == this.applyDept);
 
-      if(this.incidentModel.department !== this.applyDept && !isInit){
+      if(this.incidentModel.department != this.applyDept && (!isInit || this.buildType !== '来电弹屏')){
         this.incidentModel.department = this.applyDept;
         this.searchApplicationDepartment('itsm', deptObj ? deptObj.dept : '', undefined, this.applyDept);
       }
@@ -2927,6 +2950,11 @@ export class FuwutaiComponent implements OnInit {
         this.isLoading = false;
         if (data.status == 200) {
           this.applicationPriorityList = data.list;
+          // 回显事件来源
+          let source = this.applicationSourceList.find(v => v.value === 'phone');
+          if(!this.incidentModel.source && source){
+            this.incidentModel.source = source.id;
+          }
         }
       });
   }
@@ -3073,6 +3101,8 @@ export class FuwutaiComponent implements OnInit {
             let ids = this.applicationDeptList.map(v => v.id);
             isInit && !ids.includes(this.incidentModel.department) && (this.applicationDeptList.unshift({id: this.incidentModel.department, dept: this.incidentMsg.deptName}))
             console.log(this.applicationDeptList);
+            console.log(this.incidentModel);
+            console.log(this.incidentMsg);
             deptId && this.changeApplyDept(deptId);
           }
         }
@@ -3105,7 +3135,7 @@ export class FuwutaiComponent implements OnInit {
 
     let deptObj = this.applicationDepartmentList.find(v => v.id == e);
 
-    if(this.incidentModel.department !== e){
+    if(this.incidentModel.department != e){
       this.incidentModel.department = e;
       this.searchApplicationDepartment('itsm', deptObj ? deptObj.dept : '', undefined, e);
     }
@@ -3124,7 +3154,7 @@ export class FuwutaiComponent implements OnInit {
 
     let deptObj = this.applicationDeptList.find(v => v.id == e);
 
-    if(this.applyDept !== e){
+    if(this.applyDept != e){
       this.applyDept = e;
       this.searchApplicationDepartment('hsms', deptObj ? deptObj.dept : '', undefined, e);
     }
@@ -3483,6 +3513,9 @@ export class FuwutaiComponent implements OnInit {
       this.incidentModel.group = undefined;
       this.showPromptModal("操作", true, "", "");
     }else{
+      if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
+        // this.jry_shixian();
+      }
       this.newOrderShow = false; //关闭弹窗
       this.newOrderShowOpen = false; //此时可出现新的弹窗
       this.showPromptModal("操作", true, "", "");
@@ -3992,7 +4025,11 @@ export class FuwutaiComponent implements OnInit {
     this.fixedTab = '';
   }
 
+  // 取消
   newOrderCancel(): void {
+    if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
+      // this.jry_shixian();
+    }
     this.newOrderShow = false;
     this.newOrderShowOpen = false;
     this.currentTabIndex = "";

src/app/views/hospital-config/hospital-config.component.ts

@@ -441,7 +441,7 @@ export class HospitalConfigComponent implements OnInit {
    * @returns
    */
   getGroupList(hosId) {
-    let postData = { idx: 0, sum: 100, group2: { hospitals: hosId, type: 1 } };
+    let postData = { idx: 0, sum: 100, group2: { hospitals: hosId, typeIds: '1,3' } };
     return this.mainService
       .getFetchDataList("data", "group2", postData)
       .toPromise();