检查科室异常配置

src/app/services/main.service.ts

@@ -518,16 +518,4 @@ export class MainService {
       headers: this.headers,
     });
   }
-  // 获取检查科室异常配置列表
-  getUnusualDept(data) {
-    return this.http.post(host.host + "/dept/unusualDept", data, {
-      headers: this.headers,
-    });
-  }
-  // 修改,删除检查科室异常配置
-  upDictionary(data) {
-    return this.http.post(host.host + "/common/common/upDictionary", data, {
-      headers: this.headers,
-    });
-  }
 }

src/app/views/check-dept-exception/check-dept-exception.component.html

@@ -4,7 +4,7 @@
       <div nz-col nzXl='12' class="list-template__searchBox">
       </div>
       <div nz-col nzXl="12" class="list-template__btns">
-        <!-- <button nz-button *ngIf="coopBtns.add" class="btn default ml8" (click)="addModal()">新增</button> -->
+        <button nz-button *ngIf="coopBtns.add" class="btn default ml8" (click)="addModal()">新增</button>
       </div>
     </div>
     <div class="list-template__bottom">
@@ -20,15 +20,15 @@
           </tr>
         </thead>
         <tbody>
-          <tr *ngFor="let data of listOfData;let i = index" (click)="selectedListData(data[4])">
+          <tr *ngFor="let data of listOfData;let i = index" (click)="selectedListData(data.id)">
             <td>{{ i+1 }}</td>
-            <td>{{ data[0] }}</td>
-            <td>{{ data[2] }}</td>
-            <td>{{ data[3] }}</td>
+            <td>{{ data.dept }}</td>
+            <td>{{ data.code }}</td>
+            <td>{{ data.matchingDept }}</td>
             <td>
               <div class="coop">
                 <span *ngIf="coopBtns.edit" (click)="edit($event,data)">修改</span>
-                <span *ngIf="coopBtns.del" (click)="showDelModal($event,data[4],'您确认要删除吗？','删除','del')">删除</span>
+                <span *ngIf="coopBtns.del" (click)="showDelModal($event,data.id,'您确认要删除吗？','删除','del')">删除</span>
               </div>
             </td>
           </tr>
@@ -52,11 +52,12 @@
           <nz-form-item>
             <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="startDepartment">检查原科室</nz-form-label>
             <nz-form-control nzErrorTip="请选择检查原科室!">
-              <nz-select [nzDisabled]="!add" [nzDropdownMatchSelectWidth]="false" formControlName="startDepartment"
-                nzShowSearch nzAllowClear nzPlaceHolder="请选择检查原科室" nzServerSearch
-                (nzOnSearch)="changeInp($event,'form')" (nzOpenChange)="changeForm($event)">
+              <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="startDepartment" nzShowSearch
+                nzAllowClear nzPlaceHolder="请选择检查原科室" nzServerSearch (nzOnSearch)="changeInp($event,'form')"
+                (nzOpenChange)="changeForm($event)">
                 <ng-container *ngFor="let data of department">
-                  <nz-option *ngIf="!isLoading" nzLabel="{{data.dept}}" nzValue="{{data.id}}"></nz-option>
+                  <nz-option *ngIf="!isLoading" nzLabel="{{data.dept}}"
+                    nzValue="{{data.id+'&&'+data.dept+'&&'+data.type.id}}"></nz-option>
                 </ng-container>
                 <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
                   <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -68,26 +69,24 @@
             <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="keyword">关键字</nz-form-label>
             <nz-form-control nzErrorTip="请输入关键字!">
               <nz-input-group>
-                <input nz-input formControlName="keyword" placeholder="请输入关键字" [disabled]="!add" />
+                <input nz-input formControlName="keyword" placeholder="请输入关键字" />
               </nz-input-group>
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
             <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="endDepartment">匹配的科室</nz-form-label>
             <nz-form-control nzErrorTip="请选择匹配的科室!">
-              <!-- <nz-select [nzMode]="'multiple'" [nzDropdownMatchSelectWidth]="false" formControlName="endDepartment"
-                nzShowSearch nzAllowClear nzPlaceHolder="请选择匹配的科室" nzServerSearch
-                (nzOnSearch)="changeInp($event,'formEnd')" (nzOpenChange)="changeFormEnd($event)">
+              <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="endDepartment" nzShowSearch nzAllowClear
+                nzPlaceHolder="请选择匹配的科室" nzServerSearch (nzOnSearch)="changeInp($event,'formEnd')"
+                (nzOpenChange)="changeFormEnd($event)">
                 <ng-container *ngFor="let data of department1">
-                  <nz-option *ngIf="!isLoading" nzLabel="{{data.dept}}" nzValue="{{data.id}}"></nz-option>
+                  <nz-option *ngIf="!isLoading" nzLabel="{{data.dept}}" nzValue="{{data.id+'&&'+data.dept}}">
+                  </nz-option>
                 </ng-container>
                 <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
                   <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
                 </nz-option>
-              </nz-select> -->
-              <nz-input-group>
-                <input nz-input formControlName="endDepartment" placeholder="请输入匹配的科室" />
-              </nz-input-group>
+              </nz-select>
             </nz-form-control>
           </nz-form-item>
         </form>

src/app/views/check-dept-exception/check-dept-exception.component.ts

@@ -230,17 +230,22 @@ export class CheckDeptExceptionComponent implements OnInit {
     let postData = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
+      inspectDeptAbnormalSettings: {
+        hospitalId: this.hosId,
+      },
     };
     this.mapOfCheckedId = {};
     this.checkedDepIds = [];
     this.loading1 = true;
-    this.mainService.getUnusualDept(postData).subscribe((result: any) => {
-      this.loading1 = false;
-      if (result.status == 200) {
-        this.listOfData = result.list;
-        this.listLength = result.totalNum;
-      }
-    });
+    this.mainService
+      .getFetchDataList("simple/data", "inspectDeptAbnormalSettings", postData)
+      .subscribe((result: any) => {
+        this.loading1 = false;
+        if (result.status == 200) {
+          this.listOfData = result.list;
+          this.listLength = result.totalNum;
+        }
+      });
   }
 
   // 新增/编辑弹框
@@ -276,28 +281,50 @@ export class CheckDeptExceptionComponent implements OnInit {
       return;
     }
     let data = {};
+    let startDepartmentInfo =
+      this.validateForm.controls.startDepartment.value.split("&&");
+    let endDepartmentInfo =
+      this.validateForm.controls.endDepartment.value.split("&&");
 
     if (this.add) {
-      //新增
+      //新增baba
+      data = {
+        hospitalId: this.hosId,
+        deleteFlag: 0, //1是删除，0是不删除
+        dept: startDepartmentInfo[1], //原科室名字
+        deptId: startDepartmentInfo[0], //原科室id
+        type: startDepartmentInfo[2], //原科室的科室类型id
+        matchingDept: endDepartmentInfo[1], //匹配科室名称
+        matchingDeptId: endDepartmentInfo[0], //匹配科室id
+        code: this.validateForm.controls.keyword.value, //关键字
+      };
     } else {
       //编辑
       data = {
         id: this.coopId,
-        deleted: false,
-        desc: this.validateForm.controls.endDepartment.value,
+        hospitalId: this.hosId,
+        deleteFlag: 0, //1是删除，0是不删除
+        dept: startDepartmentInfo[1], //原科室名字
+        deptId: startDepartmentInfo[0], //原科室id
+        type: startDepartmentInfo[2], //原科室的科室类型id
+        matchingDept: endDepartmentInfo[1], //匹配科室名称
+        matchingDeptId: endDepartmentInfo[0], //匹配科室id
+        code: this.validateForm.controls.keyword.value, //关键字
       };
     }
-    this.mainService.upDictionary(data).subscribe((result: any) => {
-      this.btnLoading = false;
-      this.hideAddModal();
-      this.initForm();
-      if (result.status == 200) {
-        this.listLength++;
-        this.showPromptModal(this.add ? "新增" : "修改", true, "");
-      } else {
-        this.showPromptModal(this.add ? "新增" : "修改", false, "");
-      }
-    });
+    this.mainService
+      .simplePost("addData", "inspectDeptAbnormalSettings", data)
+      .subscribe((result: any) => {
+        this.btnLoading = false;
+        this.hideAddModal();
+        this.initForm();
+        if (result.status == 200) {
+          this.listLength++;
+          this.showPromptModal(this.add ? "新增" : "修改", true, "");
+        } else {
+          this.showPromptModal(this.add ? "新增" : "修改", false, "");
+        }
+      });
   }
 
   // 编辑
@@ -305,62 +332,23 @@ export class CheckDeptExceptionComponent implements OnInit {
   edit(e, data) {
     e.stopPropagation();
     this.add = false;
-    this.coopId = data[4];
-    this.validateForm.controls.keyword.setValue(data[2]); //关键字
-    this.validateForm.controls.endDepartment.setValue(data[3]); //匹配的科室
-    // --------检查原科室---
-    let startDeptArr = []; //临时检查原科室数组
-    let startDept = data[1]; //科室id
-    let startDeptShow = data[0]; //科室名称
-    startDeptArr.push({ id: startDept, dept: startDeptShow });
-    let startDept$ = this.mainService.getFetchDataList("data", "department", {
-      department: {
-        hospital: { id: data.hospital },
+    this.coopId = data.id;
+    this.validateForm.controls.keyword.setValue(data.code); //关键字
+    this.department = [
+      {
+        id: data.deptId,
+        dept: data.dept,
+        type: { id: data.type },
       },
-      idx: 0,
-      sum: 10,
-    });
-    // --------/检查原科室---
-    // --------匹配的科室---
-    // let targetDeptArr = []; //临时匹配的科室数组
-    // let targetDept = data.targetDept.split(","); //科室id
-    // let targetDeptShow = data.targetDeptShow.split(","); //科室名称
-    // targetDept.forEach((item, index) => {
-    //   targetDeptArr.push({ id: item, dept: targetDeptShow[index] });
-    // });
-    // let targetDept$ = this.mainService.getFetchDataList("data", "department", {
-    //   department: {
-    //     hospital: { id: data.hospital },
-    //     type: { id: 282 },
-    //   },
-    //   idx: 0,
-    //   sum: 20,
-    // });
-    // --------/匹配的科室---
-    this.maskFlag = this.message.loading("正在加载中..", {
-      nzDuration: 0,
-    }).messageId;
-    forkJoin(startDept$).subscribe((res) => {
-      this.message.remove(this.maskFlag);
-      this.maskFlag = false;
-      this.modal = true;
-      //检查原科室
-      if (res[0]["status"] == 200) {
-        let add = startDeptArr.filter(
-          (item) => !res[0]["list"].some((ele) => ele.id == item.id)
-        ); //过滤掉已有的选项
-        this.department = add.concat(res[0]["list"]); //拼接数组
-        this.validateForm.controls.startDepartment.setValue(data[1] + ""); //检查原科室
-      }
-      //匹配的科室
-      // if (res[2]["status"] == 200) {
-      //   let add = targetDeptArr.filter(
-      //     (item) => !res[2]["list"].some((ele) => ele.id == item.id)
-      //   ); //过滤掉已有的选项
-      //   this.department1 = add.concat(res[2]["list"]); //拼接数组
-      //   this.validateForm.controls.endDepartment.setValue(targetDept); //匹配的科室
-      // }
-    });
+    ];
+    this.validateForm.controls.startDepartment.setValue(
+      `${data.deptId}&&${data.dept}&&${data.type}`
+    ); //检查原科室
+    this.department1 = [{ id: data.matchingDeptId, dept: data.matchingDept }];
+    this.validateForm.controls.endDepartment.setValue(
+      `${data.matchingDeptId}&&${data.matchingDept}`
+    ); //匹配的科室
+    this.modal = true;
   }
 
   // 展示信息提示框（con:提示信息，success:操作是否成功，promptInfo:操作结果提示信息）
@@ -406,8 +394,12 @@ export class CheckDeptExceptionComponent implements OnInit {
     this.btnLoading = true;
     if (this.confirmDelType === "del") {
       //删除
+      let postData = {
+        id: this.coopId,
+        deleteFlag: 1,
+      };
       this.mainService
-        .upDictionary({ id: this.coopId, deleted: true })
+        .simplePost("addData", "inspectDeptAbnormalSettings", postData)
         .subscribe((data: any) => {
           this.btnLoading = false;
           this.delModal = false;