护士端报修功能修改

src/app/components/incidentManagement/incident-create/incident-create.component copy.html

@@ -1,70 +0,0 @@
-<!--
- * @Author: seimin
- * @Date: 2024-10-24 13:47:40
- * @LastEditors: seimin
- * @LastEditTime: 2024-10-24 13:58:19
- * @Description: 创建
--->
-<div class="save display_flex justify-content_flex-center align-items_center add">
-  <div class="modalBody">
-    <div class="title">回访<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
-    <div class="content">
-      <overlay-scrollbars #osComponentRef1 class="workingArea">
-        <div class="tabs">
-          <div class="tab" *ngFor="let item of tabs" (click)="clickTbab(item)" [ngClass]="{ active: activeTabValue === item.value }">{{ item.name }}</div>
-        </div>
-        <div class="detail">
-          <ng-container *ngIf="activeTabValue === 1">
-            <!-- <app-incident-handle-repair [incidentData]="incidentData"></app-incident-handle-repair> -->
-          </ng-container>
-          <ng-container *ngIf="activeTabValue === 2">
-            <!-- <app-incident-handle-handle [incidentData]="incidentData"></app-incident-handle-handle> -->
-          </ng-container>
-        </div>
-      </overlay-scrollbars>
-      <form nz-form [formGroup]="validateForm" class="addForm">
-        <nz-form-item>
-          <nz-form-label [nzSpan]="6" nzRequired nzFor="degree">满意度评价</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择满意度评价!">
-            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="degree" nzPlaceHolder="请选择满意度评价" nzServerSearch>
-              <ng-container *ngFor="let data of deferralDayList">
-                <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
-              </ng-container>
-              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
-                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
-              </nz-option>
-            </nz-select>
-          </nz-form-control>
-        </nz-form-item>
-        <nz-form-item>
-          <nz-form-label [nzSpan]="6" nzRequired nzFor="handleResult">回访处理结果</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择回访处理结果!">
-            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="handleResult" nzPlaceHolder="请选择回访处理结果" nzServerSearch>
-              <ng-container *ngFor="let data of repairTypeList">
-                <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
-              </ng-container>
-              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
-                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
-              </nz-option>
-            </nz-select>
-          </nz-form-control>
-        </nz-form-item>
-        <nz-form-item>
-          <nz-form-label [nzSpan]="6" nzFor="visitRemarks" style="text-indent: 11px;">回访备注</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请输入回访备注!">
-            <nz-input-group>
-              <textarea formControlName="visitRemarks" nz-input rows="3" placeholder="请输入回访备注"></textarea>
-            </nz-input-group>
-          </nz-form-control>
-        </nz-form-item>
-      </form>
-    </div>
-    <div class="display_flex justify-content_flex-center">
-      <button nz-button nzType="primary" (click)="submitForm()"[nzLoading]="isLoading">确认</button>
-      <button nz-button nzType="default" class="btn cancel" (click)="hideModal()">取消</button>
-    </div>
-  </div>
-</div>
-
-<!-- 遮罩 -->
-<app-mask *ngIf="maskFlag"></app-mask>

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

@@ -10,13 +10,17 @@
         </div>
         <div class="info" nz-row>
           <div nz-col nzSpan="8">报修类别：{{orderInfo.category?orderInfo.category.category:''}}</div>
-          <div nz-col nzSpan="8">报修地址：<ng-container *ngIf="orderInfo.place">{{ orderInfo.place.area.area }} {{ orderInfo.place.place }} {{ orderInfo.houseNumber }}</ng-container></div>
+          <div nz-col nzSpan="8">报修地址：<ng-container *ngIf="orderInfo.place">{{ orderInfo.place.building.buildingName }} {{ orderInfo.place.floorName }}层 {{ orderInfo.houseNumber }}</ng-container></div>
           <div nz-col nzSpan="24">报修内容：{{orderInfo.description}}</div>
           <div nz-col nzSpan="24">报修图片：
-            <app-image-viewer [imageUrl]="imgs_wechatRequesterIncident" *ngIf="imgs_wechatRequesterIncident.length"></app-image-viewer>
+            <div class="thumbList" *ngIf="imgs_wechatRequesterIncident.length > 0">
+              <div class="thumb" *ngFor="let item of imgs_wechatRequesterIncident;let index = index;" (click)="previewImageHandler(imgs_wechatRequesterIncident, index)"><img [src]="item.thumbFilePath" alt=""></div>
+            </div>
           </div>
           <div nz-col nzSpan="24">处理图片：
-            <app-image-viewer [imageUrl]="imgs_incident" *ngIf="imgs_incident.length"></app-image-viewer>
+            <div class="thumbList" *ngIf="imgs_incident.length > 0">
+              <div class="thumb" *ngFor="let item of imgs_incident;let index = index;" (click)="previewImageHandler(imgs_incident, index)"><img [src]="item.thumbFilePath" alt=""></div>
+            </div>
           </div>
           <div nz-col nzSpan="8">维修人：<ng-container *ngIf="orderInfo.handlingPersonnelUser">{{ orderInfo.handlingPersonnelUser.name }}</ng-container></div>
           <div nz-col nzSpan="8">维修人电话：<ng-container *ngIf="orderInfo.handlingPersonnelUser">{{ orderInfo.handlingPersonnelUser.phone }}</ng-container></div>
@@ -51,66 +55,14 @@
           <!-- 流程图 end -->
         </div>
       </div>
-      <div class="bottom" *ngIf="orderInfo.urgentDetails&&showCoop">
-        <div class="urgent">
-          <div>
-            <ng-container *ngIf="amplificationShow&&orderInfo.urgentDetails&&showCoop">
-                加急原因：{{orderInfo.urgentDetails.urgentReason}}
-              <button *ngIf="orderInfo.urgentDetails.checkStatus.id==329" class=" btn default" nz-button nzType="primary"
-                [nzLoading]="urgentLoading" nzGhost (click)="urgent()">确认加急</button>
-            </ng-container>
-          </div>
-          <div class="amplification">
-            <button
-              nz-button
-              nzType="primary"
-              class="btn default"
-              (click)="amplification()"
-            >
-              {{ amplificationShow ? "放大" : "还原" }}
-            </button>
-          </div>
-        </div>
-      </div>
     </div>
   </overlay-scrollbars>
   <div class="btns display_flex justify-content_flex-center">
-    <button nz-button nzType="primary" (click)="goToSummary()" *ngIf="orderInfo.duty && orderInfo.duty.addSummary == 1">汇总单</button>
+    <button nz-button nzType="primary" (click)="goToSummary()" *ngIf="orderInfo.state.value == 'close' && itsmSummarySheet.value == 1 && orderInfo.summaryId">汇总单</button>
     <button class=" btn cancel" nz-button nzType="default" (click)="close()">取消</button>
   </div>
 </div>
 
-<!-- 撤回工单 -->
-<div class="recallOrder" *ngIf="recallOrderShow">
-  <div class="modalBody">
-    <div class="title">提示<i class="icon_transport transport-guanbi" (click)="closeRecallOrderModal()"></i></div>
-    <div class="content">
-      <div class="icon"><i class="icon_transport transport-wenhao"></i></div>
-      <div class="defeat">您确认要撤回此工单吗？</div>
-    </div>
-    <div class="btns display_flex justify-content_flex-center">
-      <button nz-button nzType="primary" [nzLoading]='btnLoading' (click)="confirmRec()">确认</button>
-      <button nz-button nzType="primary" [nzLoading]='recLoading' nzGhost (click)="recAndDel()">撤回并删除</button>
-      <button class=" btn cancel" nz-button nzType="default" (click)="closeRecallOrderModal()">取消</button>
-    </div>
-  </div>
-</div>
-
-<!-- 删除工单 -->
-<div class="recallOrder delModel" *ngIf="delOrderShow">
-  <div class="modalBody">
-    <div class="title">提示<i class="icon_transport transport-guanbi" (click)="closeDelOrderModal()"></i></div>
-    <div class="content">
-      <div class="icon"><i class="icon_transport transport-wenhao"></i></div>
-      <div class="defeat">您确认要删除此工单吗？</div>
-    </div>
-    <div class="btns display_flex justify-content_flex-center">
-      <button nz-button nzType="primary" [nzLoading]='btnLoading' (click)="confirmDel()">确认</button>
-      <button class="btn cancel" nz-button nzType="default" (click)="closeDelOrderModal()">关闭</button>
-    </div>
-  </div>
-</div>
-
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
   [info]="promptInfo" (closeModel)="close()">
@@ -119,3 +71,6 @@
 <app-incident-details *ngIf="isShowIncidentDetails" (close)="closeIncidentDetails()" [incidentId]="orderInfo.id"></app-incident-details>
 <!-- 遮罩 -->
 <app-mask *ngIf="maskFlag"></app-mask>
+
+<!-- 图片预览 -->
+<app-image-viewer [imageUrl]="imgs" hidden *ngIf="isPreview" [isPreviewNow]="true" [initialViewIndex]="initialViewIndex"></app-image-viewer>

src/app/share/detail-bx/detail-bx.component.less

@@ -13,6 +13,27 @@
   align-items: center;
 }
 
+.thumbList{
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+  gap: 8px;
+  .thumb{
+    width: 64px;
+    height: 64px;
+    padding: 4px;
+    border-radius: 4px;
+    border: 1px solid rgba(0,0,0,0.15);
+    img{
+      width: 100%;
+      height: 100%;
+      object-fit: cover;
+      object-position: center;
+      cursor: pointer;
+    }
+  }
+}
+
 .detail {
   width: 1000px;
   height: calc(100vh - 100px);

src/app/share/detail-bx/detail-bx.component.ts

@@ -47,7 +47,11 @@ export class DetailBxComponent implements OnInit {
 
   isShowIncidentDetails:boolean = false;
 
+  hosId:any;
+
   ngOnInit() {
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.getHospitalConfig();
     this.tool.getDeptDisplay().subscribe((result) => {
       if (result.status == 200) {
         this.deptDisplay = result.list[0].valueconfig;
@@ -85,22 +89,58 @@ export class DetailBxComponent implements OnInit {
     this.isShowIncidentDetails = false;
   }
 
+  // 获取院区配置信息
+  itsmSummarySheet:any = {};//是否需要填写汇总单
+  getHospitalConfig() {
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      hospitalConfig: {
+        model: "itsm",
+        hosId: this.hosId,
+      },
+    }
+    this.mainService
+      .getFetchDataList("simple/data", "hospitalConfig", postData)
+      .subscribe((result) => {
+        let list = result.list || [];
+        this.itsmSummarySheet = list.find(v => v.key == 'itsmSummarySheet') || {};
+      });
+  }
+
   // 获取图片信息
   getImgsData(type) {
     let id = this.orderInfo.id;
     this.mainService
-      .listAttachment(type, id)
+      .getPreviewImage(type, id)
       .subscribe((res:any)=> {
         // this.imgs = ['https://img2.woyaogexing.com/2022/08/19/1f5e056b1d076920!400x400.jpg','https://img2.woyaogexing.com/2022/08/19/359346943c3c489f!400x400.jpg']
-        for (var i = 0; i < res.data.length; i++) {
-          this['imgs_' + type].push(location.origin + '/file' + res.data[i].relativeFilePath);
-        }
+        res.data.forEach(v => {
+          v.previewUrl = location.origin + "/file" + v.relativeFilePath;
+          v.thumbFilePath = location.origin + "/file" + v.thumbFilePath;
+        })
+        this['imgs_' + type] = res.data;
       });
   }
 
+  // 预览图片
+  imgs = [];
+  isPreview = false;
+  initialViewIndex:number = 0;
+  previewImageHandler(data = [], index = 0) {
+    this.initialViewIndex = index;
+    console.log(index)
+    this.isPreview = false;
+    data = data || [];
+    this.imgs = data.map((v) => location.origin + '/file' + v.relativeFilePath);
+    setTimeout(() => {
+      this.isPreview = true;
+    }, 0)
+  }
+
   //获取处理进度
   getProgressInfo() {
-    this.mainService .fetchListBx("incidentLog", {
+    this.mainService.getFetchDataList("simple/data", "incidentLog", {
       "idx": 0,
       "sum": 9999,
       "incidentLog": {
@@ -120,31 +160,7 @@ export class DetailBxComponent implements OnInit {
 
   // 获取工单详情
   getDetail() {
-    return this.mainService.fetchDataBx("incident", this.id);
-  }
-
-  // 确认加急
-  urgent() {
-    let that = this;
-    that.urgentLoading = true;
-    let postData = {
-      urgentDetails: {
-        workerOrder: this.orderInfo["id"],
-        checkStatus: {
-          id: 330,
-        },
-        urgentReason: this.orderInfo["urgentDetails"].urgentReason,
-        id: this.orderInfo["urgentDetails"].id,
-      },
-    };
-    that.mainService.coopWorkerOrder("urge", postData).subscribe((data) => {
-      that.urgentLoading = false;
-      if (data.status == 200) {
-        that.showPromptModal("加急", true, "");
-      } else {
-        that.showPromptModal("加急", false, data.msg);
-      }
-    });
+    return this.mainService.getFetchData("simple/data", "incident", this.id);
   }
 
   // 关闭弹框
@@ -168,117 +184,4 @@ export class DetailBxComponent implements OnInit {
     // return this.mainService.getWorkOrderLog(this.id);
     return Promise.resolve(111);
   }
-
-  // 派单
-  allotWorker() {
-    this.router.navigateByUrl(
-      "dispatchingDesk/allotWorker/" +
-        this.id +
-        "/" +
-        this.orderInfo["gdState"]["id"]
-    );
-  }
-
-  // 撤回
-  recallOrderShow: boolean = false;
-  openRecallModal(): void {
-    this.recallOrderShow = true;
-  }
-  // 撤回并删除
-  recAndDel() {
-    let that = this;
-    that.recLoading = true;
-    that.mainService.delOrder(that.id).subscribe((data) => {
-      console.log(data);
-      that.recLoading = false;
-      that.closeDelOrderModal();
-      if (data.status == 200) {
-        that.showPromptModal("删除", true, "");
-      } else {
-        that.showPromptModal("删除", false, data.msg);
-      }
-    });
-  }
-  // 确认撤回
-  confirmRec() {
-    let that = this;
-    that.btnLoading = true;
-    let postData = {
-      workOrder: {
-        id: that.id,
-      },
-    };
-    that.mainService
-      .coopWorkerOrder("excuteWorkOrder/recall", postData)
-      .subscribe((data) => {
-        that.btnLoading = false;
-        that.closeRecallOrderModal();
-        if (data.status == 200) {
-          that.showPromptModal("撤回", true, "");
-        } else {
-          that.showPromptModal("撤回", false, data.msg);
-        }
-      });
-  }
-  // 关闭撤回弹框
-  closeRecallOrderModal() {
-    this.recallOrderShow = false;
-  }
-
-  // 删除
-  // 打开模态框
-  delOrderShow: boolean = false;
-  openDelModal() {
-    this.delOrderShow = true;
-  }
-  // 确认删除
-  confirmDel() {
-    let that = this;
-    that.btnLoading = true;
-    that.mainService.delOrder(that.id).subscribe((data) => {
-      that.btnLoading = false;
-      that.closeDelOrderModal();
-      if (data.status == 200) {
-        that.showPromptModal("删除", true, "");
-      } else {
-        that.showPromptModal("删除", false, data.msg);
-      }
-    });
-  }
-
-  // 关闭模态框
-  closeDelOrderModal() {
-    this.delOrderShow = false;
-  }
-
-  // 格式化时分秒
-  // （时间小于一分钟则显示秒，时间大于一分钟则显示分钟数，如超出一小时则显示小时和分钟。）time单位:秒
-  formatTime(time) {
-    let timeStr = "";
-    if (time >= 0 && time < 60) {
-      // 秒
-      timeStr = time + "秒";
-    } else if (time >= 60 && time < 3600) {
-      // 分钟
-      timeStr = Math.floor(time / 60) + "分钟";
-    } else if (time >= 3600) {
-      // 时 + 分
-      let h = "";
-      let m = "";
-      h = Math.floor(time / 3600) + "小时";
-      m = time % 3600 >= 60 ? Math.floor((time % 3600) / 60) + "分钟" : "";
-      timeStr = h + m;
-    }
-    return timeStr;
-  }
-
-  // 计算历史记录耗时
-  filterTime(step) {
-    // step = [{ difTime: 2 }, { difTime: 6 }]
-    let num = 0;
-    step.forEach((e) => {
-      num += e.difTime;
-    });
-    return this.formatTime(num / 1000);
-  }
 }

src/app/share/dialog-bx/dialog-bx.component.html

@@ -19,11 +19,11 @@
         <div class="right" nz-col nzSpan="12">
           <div class="item display_flex  justify-content_space-between align-items_flex-start">
             <span>楼栋</span>
-            <span>{{extraData.place?.area?.area}}</span>
+            <span>{{extraData.floor?.building?.buildingName}}</span>
           </div>
           <div class="item display_flex  justify-content_space-between align-items_flex-start">
             <span>楼层</span>
-            <span>{{extraData.place?.place}}</span>
+            <span>{{extraData.floor?.floorName}}</span>
           </div>
         </div>
       </div>

src/app/share/image-viewer/image-viewer.component.less

@@ -1,5 +1,7 @@
 .imgViewHelp {
   img {
     margin-right: 8px;
+    width: 64px;
+    height: 64px;
   }
 }

src/app/share/incident-details/incident-details.component.ts

@@ -36,7 +36,7 @@ export class IncidentDetailsComponent implements OnInit {
     this.maskFlag = this.message.loading("正在加载中..", {
       nzDuration: 0,
     }).messageId;
-    this.mainService.querySummaryDoc({incidentId: this.incidentId}).subscribe((res:any) => {
+    this.mainService.querySummaryDocNew({incidentId: this.incidentId}).subscribe((res:any) => {
       this.message.remove(this.maskFlag);
       this.maskFlag = false;
       if(res.status == 200){

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

@@ -2683,11 +2683,11 @@ export class FuwutaiComponent implements OnInit {
   }
   // 修改故障现象
   incidentCategoryConfig:any = {};//当前匹配的故障现象规则
-  changeApplyCategory(e){
+  changeApplyCategory(e, isCoverage = false){
     console.log(e)
     // 知识库
     this.getKnowageList();
-    if(e){
+    if(e && !isCoverage){
       // 根据故障现象带出故障描述
       if(this.incidentModel.description){
         this.incidentModel.description = this.incidentModel.description + '；' + this.applicationCategoryList.find(v => v.id == e).mutiCategory;
@@ -4741,8 +4741,11 @@ export class FuwutaiComponent implements OnInit {
     incidentModel.source && (incidentModel.source = incidentModel.source.id);
     incidentModel.area && (incidentModel.area = incidentModel.area.id);
     incidentModel.place && (incidentModel.place = incidentModel.place.id);
+    incidentModel.category && (this.applicationCategoryList = [cloneDeep(incidentModel.category)]);
+    incidentModel.category && (incidentModel.category = incidentModel.category.id);
     this.incidentModel = incidentModel;
     this.incidentMsg = incidentMsg;
+    this.incidentModel.category && this.changeApplyCategory(this.incidentModel.category, true);
     console.log('this.applicationDeptList:', this.applicationDeptList)
     console.log('incidentModel:', incidentModel)
     this.showNewOrder('', '', true, '报修转事件');

src/app/views/hushijiandan/hushijiandan.component.html

@@ -1934,7 +1934,7 @@
                       >
                         <nz-option
                           [nzLabel]="data.name"
-                          [nzValue]="data.id"
+                          [nzValue]="data.value"
                           *ngFor="let data of incidentStateList"
                         ></nz-option>
                       </nz-select>
@@ -1983,7 +1983,7 @@
                           <td>
                             <!-- <button (click)="viewBx(data)">查看</button> -->
                             <button class="btn1 mr8 mb8 mt8" (click)="detailBx(data)">查看</button>
-                            <button class="btn1 mr8 mb8 mt8" (click)="showAppraiseBx(data.id)" *ngIf="data.state && data.state.value == 'close' && !data.wxdegree">评价</button>
+                            <button class="btn1 mr8 mb8 mt8" (click)="showAppraiseBx(data)" *ngIf="data.state && data.state.value == 'close' && !data.wxdegree">评价</button>
                           </td>
                         </tr>
                       </tbody>
@@ -3588,7 +3588,7 @@
             <nz-select [nzDropdownMatchSelectWidth]="false" style="width:120px;" class="mr8" type="building"
               nzShowSearch formControlName="building" nzPlaceHolder="请选择楼栋"
               (ngModelChange)="changeBuilding($event)">
-              <nz-option [nzLabel]="data.area" [nzValue]="data.id" *ngFor="let data of buildings">
+              <nz-option [nzLabel]="data.buildingName" [nzValue]="data.id" *ngFor="let data of buildings">
               </nz-option>
             </nz-select>
           </nz-form-control>
@@ -3596,7 +3596,7 @@
           <nz-form-control style="display: inline-block;">
             <nz-select [nzDropdownMatchSelectWidth]="false" style="width:120px;" class="mr8" type="floor" nzShowSearch
              formControlName="floor" nzPlaceHolder="请选择楼层" [nzLoading]="floorLoading">
-              <nz-option [nzLabel]="data.place" [nzValue]="data.id" *ngFor="let data of floors"></nz-option>
+              <nz-option [nzLabel]="data.floorName" [nzValue]="data.id" *ngFor="let data of floors"></nz-option>
             </nz-select>
           </nz-form-control>
           <nz-form-label [nzSm]="4" [nzXs]="4" nzRequired nzFor="officeAddress" hidden></nz-form-label>
@@ -3609,19 +3609,10 @@
       </form>
     </overlay-scrollbars>
     <div class="display_flex justify-content_flex-center">
-      <button
-        nz-button
-        nzType="primary"
-        (click)="confirmBx()"
-      >
+      <button nz-button nzType="primary" (click)="confirmBx()">
         确认
       </button>
-      <button
-        class="btn cancel"
-        nz-button
-        nzType="default"
-        (click)="hideBxModal()"
-      >
+      <button class="btn cancel" nz-button nzType="default" (click)="hideBxModal()">
         取消
       </button>
     </div>

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -1147,17 +1147,17 @@ export class HushijiandanComponent implements OnInit {
       contacts: [this.loginUser.name, [Validators.required]],
       contactsInformation: [this.loginUser.phone, [Validators.required]],
     });
-    this.getDeptByCode(this.currentDept.pcode);
+    this.getDeptById(this.currentDept.id);
   }
-  // 根据科室Code获取详情
+  // 根据科室ID获取详情
   deptDto:any = {};
-  getDeptByCode(code){
+  getDeptById(id){
     this.mainService
-      .fetchListBx("department", {
+      .getFetchDataList("simple/data", "department", {
         idx: 0,
         sum: 1,
         department: {
-          eqCode: code,
+          id,
         }
       })
       .subscribe((data:any) => {
@@ -1166,13 +1166,13 @@ export class HushijiandanComponent implements OnInit {
         console.log(this.deptDto);
         this.changeHosp();
         // 回显楼栋
-        if(this.deptDto.place){
-          this.validateBxForm.controls.building.setValue(this.deptDto.place.area.id);
+        if(this.deptDto.building){
+          this.validateBxForm.controls.building.setValue(this.deptDto.building.id);
         }
 
         // 回显楼层
-        if(this.deptDto.place){
-          this.validateBxForm.controls.floor.setValue(this.deptDto.place.id);
+        if(this.deptDto.floor){
+          this.validateBxForm.controls.floor.setValue(this.deptDto.floor.id);
         }
       });
   }
@@ -1184,12 +1184,12 @@ export class HushijiandanComponent implements OnInit {
     let data = {
       idx: 0,
       sum: 9999,
-      area: {
-        branch: this.deptDto.branch,
+      building: {
+        hosId: this.deptDto.hospital.id,
       }
     };
     this.mainService
-      .fetchListBx("area", data)
+      .getFetchDataList("simple/data", "building", data)
       .subscribe((data:any) => {
         this.buildings = data.list || [];
         this.floors = [];
@@ -1212,13 +1212,13 @@ export class HushijiandanComponent implements OnInit {
     let data = {
       idx: 0,
       sum: 9999,
-      place: {
-        area: { id: buildingId },
+      floor: {
+        buildId: buildingId,
       }
     };
     this.floorLoading = true;
     this.mainService
-      .fetchListBx("place", data)
+      .getFetchDataList("simple/data", "floor", data)
       .subscribe((data:any) => {
         this.floorLoading = false;
         this.message.remove(this.maskFlag);
@@ -1268,11 +1268,9 @@ export class HushijiandanComponent implements OnInit {
     }).messageId;
     if(type == 1){
       this.btnLoading = true;
-      let loginUser:any = {
-        account: this.loginUser.account,
-      };
-      if(this.deptDto.branch){
-        loginUser.branch = { id: this.deptDto.branch };
+      let loginUser:any = cloneDeep(this.loginUser);
+      if(this.deptDto.hospital){
+        loginUser.hospital = { id: this.deptDto.hospital.id };
       }
       if(this.deptDto){
         loginUser.dept = {id: this.deptDto.id};
@@ -1280,18 +1278,18 @@ export class HushijiandanComponent implements OnInit {
       if(this.validateBxForm.value.contacts){
         loginUser.name = this.validateBxForm.value.contacts;
       }
-      if(this.validateBxForm.value.floor){
-        loginUser.place = {id: this.validateBxForm.value.floor, area: { id: this.validateBxForm.value.building }};
-      }
-      if(this.validateBxForm.value.officeAddress){
-        loginUser.houseNumber = this.validateBxForm.value.officeAddress;
-      }
+      // if(this.validateBxForm.value.floor){
+      //   loginUser.place = {id: this.validateBxForm.value.floor, area: { id: this.validateBxForm.value.building }};
+      // }
+      // if(this.validateBxForm.value.officeAddress){
+      //   loginUser.houseNumber = this.validateBxForm.value.officeAddress;
+      // }
       if(this.validateBxForm.value.contactsInformation){
         loginUser.phone = this.validateBxForm.value.contactsInformation;
       }
-      let result:any = await this.mainService.saveUser({loginUser}).toPromise();
+      let result:any = await this.mainService.coopData("updData", "user", { user: loginUser }).toPromise();
       console.log(result);
-      if(result.state != 200){
+      if(result.status != 200){
         this.hideReqModal();
         this.btnLoading = false;
         this.message.remove(this.maskFlag);
@@ -1302,38 +1300,34 @@ export class HushijiandanComponent implements OnInit {
     }else{
       this.cancenlLoading = true;
     }
-    this.mainService.getDictionaryByITSM({key: "incident_source", type: "list"}).subscribe((source:any) => {
-      let incidentSourceList = source.data || [];
+    this.mainService.getDictionary("list", "incident_source").subscribe((source:any) => {
+      let incidentSourceList = source || [];
       let im = incidentSourceList.find(v => v.value === 'im');
-      this.mainService.wxbx({}).subscribe((result) => {
-        if ((result as any).status == 200) {
-          let bxcode = (result as any).data; //生成微信报修号
+      this.mainService.getDictionary("list", "repair_incident_type").subscribe((result) => {
+        let repairIncidentTypeList = result || [];
+        let repairIncidentType = repairIncidentTypeList.find(v => v.value === 'dept');
+        if (repairIncidentType) {
           let postData: any = {
             incident: {
-              "incidentsign": bxcode,
-              "deleteFlag": 0,
-              "department": { id: this.deptDto.id },
-              "contactsInformation": this.validateBxForm.value.contactsInformation,
-              "contacts": this.validateBxForm.value.contacts,
-              "branch": this.deptDto.branch,
-              "area": { id: this.validateBxForm.value.building },
-              "place": { id: this.validateBxForm.value.floor },
-              "houseNumber": this.validateBxForm.value.officeAddress,
-              "source": im,
-              "description": this.validateBxForm.value.description,
-              "repairType": 2,
-              "requester": this.loginUser,
-              "acceptUser": this.loginUser,
+              repairIncidentType,
+              place: { id: this.deptDto.floor.id },
+              department: { id: this.deptDto.id},
+              description: this.validateBxForm.value.description,
+              houseNumber: this.validateBxForm.value.officeAddress,
+              contacts: this.validateBxForm.value.contacts,
+              contactsInformation: this.validateBxForm.value.contactsInformation,
+              hosId: this.deptDto.hospital.id,
+              source: im,
+              fromWx: true,
+              requester: this.loginUser,
+              acceptUser: this.loginUser,
+              deleteFlag: 0,
             },
-            loginUser: {
-              account: this.loginUser.account,
-              id: this.loginUser.id,
-            }
           };
           if (this.coopBx.category) {
             postData.incident.category = this.coopBx.category;
           }
-          this.mainService.addWxIncident(postData).subscribe((res) => {
+          this.mainService.flowPost("incident/task/request", postData).subscribe((res) => {
             this.btnLoading = false;
             this.cancenlLoading = false;
             this.message.remove(this.maskFlag);
@@ -1349,7 +1343,7 @@ export class HushijiandanComponent implements OnInit {
           });
         } else {
           this.btnLoading = false;
-          this.showPromptModal("提交", false, "");
+          this.showPromptModal("提交", false, "缺少【科室内报修】数据字典");
         }
       });
     })
@@ -1358,13 +1352,10 @@ export class HushijiandanComponent implements OnInit {
   // 获取星级
   degrees = [];
   getDegrees() {
-    let postData = { type: "list", key: "incident_degree" };
     this.iLoading = true;
-    this.mainService.getDictionaryByITSM(postData).subscribe((data: any) => {
+    this.mainService.getDictionary("list", "incident_degree").subscribe((data: any) => {
       this.iLoading = false;
-      if (data.status == 200) {
-        this.degrees = data.data || [];
-      }
+      this.degrees = data || [];
     });
   }
   iLoading = false;
@@ -3842,7 +3833,15 @@ export class HushijiandanComponent implements OnInit {
   }
   // 获取事件状态
   incidentStateId = undefined;
-  incidentStateList = [];
+  incidentStateList = [
+    {name: '全部', value: 0},
+    {name: '待受理', value: 'accept,storage'},
+    {name: '处理中', value: 'pending,handler,reassign'},
+    {name: '待评价', value: 'close0', hasWxdegree: 0},
+    {name: '已关闭', value: 'close1', hasWxdegree: 1},
+    {name: '不受理', value: 'reject'},
+    {name: '撤销', value: 'cancel'},
+  ];
   // getIncidentState() {
   //   let postData = { type: "list", key: "wxincident_state" };
   //   this.iLoading = true;
@@ -3862,45 +3861,41 @@ export class HushijiandanComponent implements OnInit {
   bxlbParentSearchInp: string = ""; //患者信息搜索
   processing: number = 0; //处理中的数量
   bxlbLoading = false;
+  repairIncidentTypeList = [];//科室报修或公共报修
   getBxlb(idx, isInitState = false) {
     // 获取事件状态
-    let postData = { type: "list", key: "incident_status" };
     this.iLoading = true;
     this.bxlbLoading = true;
-    this.mainService.getDictionaryByITSM(postData).subscribe((data: any) => {
+    this.mainService.getDictionary('list', 'repair_incident_type').subscribe((data: any) => {
       this.iLoading = false;
-      if (data.status == 200) {
-        let incidentStateList = data.data || [];
-        incidentStateList.unshift({id: 0, name: '全部', value: 0});
-        this.incidentStateList = incidentStateList;
-        if(isInitState){
-          let valueObj2 = this.incidentStateList.find(v => v.value == 0);
-          this.incidentStateId = valueObj2 ? valueObj2.id : undefined;
-        }
+      this.repairIncidentTypeList = data || [];
+      if(isInitState){
+        let valueObj2 = this.incidentStateList.find(v => v.value == 0);
+        this.incidentStateId = valueObj2 ? valueObj2.value : undefined;
+      }
 
-        // 报修列表查询表格数据
-        if (idx) {
-          this.bxlbPageIndex = 1;
-        }
-        let current = JSON.parse(localStorage.getItem("user"));
-        this.mainService
-          .listWxIncident({
-            idx: this.bxlbPageIndex - 1,
-            sum: this.bxlbPageSize,
-            incident: {
-              // assignee: current.user.account,
-              statusId: this.incidentStateId || undefined,
-              department: { pcode: current.user.dept.pcode },
-            }
-          })
-          .subscribe((data: any) => {
-            this.bxlbLoading = false;
-            this.bxlbList = data.list || [];
-            this.bxlbListLength = data.totalNum || 0;
-            this.processing = data.totalNum || 0;
-          });
+      // 报修列表查询表格数据
+      if (idx) {
+        this.bxlbPageIndex = 1;
       }
-    });
+      let current = JSON.parse(localStorage.getItem("user"));
+      this.mainService
+        .getFetchDataList("simple/data", "incident", {
+          idx: this.bxlbPageIndex - 1,
+          sum: this.bxlbPageSize,
+          incident: {
+            repairIncidentType: { id: this.repairIncidentTypeList.find(v => v.value === 'dept').id },
+            statesValues: this.incidentStateId || undefined,
+            department: { id: current.user.dept.id },
+          }
+        })
+        .subscribe((data: any) => {
+          this.bxlbLoading = false;
+          this.bxlbList = data.list || [];
+          this.bxlbListLength = data.totalNum || 0;
+          this.processing = data.totalNum || 0;
+        });
+    })
   }
 
   //快速报修列表
@@ -4065,7 +4060,7 @@ export class HushijiandanComponent implements OnInit {
   reqModal: boolean = false;
   extraData:any = {};
   showReqModal() {
-    this.extraData.place = this.floors.find(v => v.id == this.validateBxForm.value.floor);
+    this.extraData.floor = this.floors.find(v => v.id == this.validateBxForm.value.floor);
     // this.reqModal = true;
     this.confirmBxNext(0);
   }
@@ -4279,9 +4274,9 @@ export class HushijiandanComponent implements OnInit {
   appraiseModalBx: boolean = false;
   starNumBx: number = 5; //评价星
   appraiseContentBx: string = ""; //评级
-  appraiseIdBx: number;
-  showAppraiseBx(id) {
-    this.appraiseIdBx = id;
+  appraiseDataBx: any;
+  showAppraiseBx(data) {
+    this.appraiseDataBx = data;
     this.appraiseModalBx = true;
     this.starNumBx = 5;
     this.appraiseContentBx = "";
@@ -4293,12 +4288,14 @@ export class HushijiandanComponent implements OnInit {
     this.btnLoading = true;
     let id = this.degrees.find(v=>v.value == this.starNumBx).id;
     let postData = {
-      degree: id,
-      degreeRemark: this.appraiseContentBx,
-      id: this.appraiseIdBx,
+      incident: {
+        ...this.appraiseDataBx,
+        wxdegree: { id },
+        wxdegreeremark: this.appraiseContentBx,
+      }
     };
     this.mainService
-      .degree(postData)
+      .flowPost("incident/task/resolve", postData)
       .subscribe((data:any) => {
         this.hideAppraiseBx();
         if (data.state == 200) {