优化

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/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/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/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) {