标本信息改造

src/app/views/specimen-search/specimen-search.component.html

@@ -45,6 +45,30 @@
             [(ngModel)]="searchCriteria.parent"
           />
         </div>
+        <div class="list-template__searchItem">
+          <span class="label">状态：</span>
+          <nz-select
+            [nzDropdownMatchSelectWidth]="false"
+            class="formItem"
+            nzServerSearch
+            nzShowSearch
+            nzAllowClear
+            nzPlaceHolder="请选择状态"
+            [(ngModel)]="searchCriteria.speState"
+            (nzOpenChange)="changeSearch1($event)"
+          >
+            <ng-container *ngFor="let data of types">
+              <nz-option
+                *ngIf="!isLoading1"
+                nzLabel="{{ data.name }}"
+                nzValue="{{ data.id }}"
+              ></nz-option>
+            </ng-container>
+            <nz-option *ngIf="isLoading1" nzDisabled nzCustomContent>
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+            </nz-option>
+          </nz-select>
+        </div>
       </div>
       <div nz-col nzXl="8" class="list-template__btns">
         <button

src/app/views/specimen-search/specimen-search.component.ts

@@ -1,45 +1,51 @@
-import { Component, OnInit } from '@angular/core';
-import { MainService } from "../../services/main.service"
-import { ToolService } from '../../services/tool.service';
-import { Subject } from 'rxjs';
-import { debounceTime } from 'rxjs/operators';
+import { Component, OnInit } from "@angular/core";
+import { MainService } from "../../services/main.service";
+import { ToolService } from "../../services/tool.service";
+import { Subject } from "rxjs";
+import { debounceTime } from "rxjs/operators";
 @Component({
-  selector: 'app-specimen-search',
-  templateUrl: './specimen-search.component.html',
-  styleUrls: ['./specimen-search.component.less']
+  selector: "app-specimen-search",
+  templateUrl: "./specimen-search.component.html",
+  styleUrls: ["./specimen-search.component.less"],
 })
 export class SpecimenSearchComponent implements OnInit {
+  constructor(private mainService: MainService, private tool: ToolService) {}
 
-  constructor(
-    private mainService: MainService,
-    private tool: ToolService
-  ) { }
-
-  searchCriteria = {//搜索条件
-    scode: '',
-    parent: '',
+  searchCriteria = {
+    //搜索条件
+    scode: "",
+    parent: "",
     hospital: null,
-    department: null
+    department: null,
+    speState: null,
   };
-  departmentSearch = [];// 院区下的科室列表(搜索框)
-  allHospital: any = [];//院区下拉框
-  listOfData: any[] = [];//表格数据
-  pageIndex: number = 1;//表格当前页码
-  pageSize: number = 10;//表格每页展示条数
-  listLength: number = 10;//表格总数据量
+  types = []; // 类型列表(搜索框)
+  departmentSearch = []; // 院区下的科室列表(搜索框)
+  allHospital: any = []; //院区下拉框
+  listOfData: any[] = []; //表格数据
+  pageIndex: number = 1; //表格当前页码
+  pageSize: number = 10; //表格每页展示条数
+  listLength: number = 10; //表格总数据量
   changeInpSubject = new Subject();
   ngOnInit() {
-    this.changeInpSubject.pipe(debounceTime(500)).subscribe(v => {
+    this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
       this.searchDepartment(v[0], v[1]);
-    })
-    this.getAllHospital()
+    });
+    this.getAllHospital();
+  }
+  // 搜索类型
+  isLoading1 = false;
+  searchTypes() {
+    this.isLoading1 = true;
+    this.mainService.getDictionary("list", "speState").subscribe((res) => {
+      this.isLoading1 = false;
+      this.types = res;
+    });
   }
   // 清空标本
   delModal: boolean = false; //删除模态框
   tipsMsg1: string; //提示框信息
-  showDelModal(
-    tipsMsg1: string
-  ) {
+  showDelModal(tipsMsg1: string) {
     this.delModal = true;
     this.tipsMsg1 = tipsMsg1;
   }
@@ -52,7 +58,7 @@ export class SpecimenSearchComponent implements OnInit {
   confirmDel() {
     this.btnLoading = true;
     this.mainService
-      .coopDataM("api/emptySpecimenData", {"hosId":1,"isEmpty":'ok'})
+      .coopDataM("api/emptySpecimenData", { hosId: 1, isEmpty: "ok" })
       .subscribe((data) => {
         this.btnLoading = false;
         this.delModal = false;
@@ -79,36 +85,44 @@ export class SpecimenSearchComponent implements OnInit {
     this.getList(0);
   }
   // 查看标本历史记录
-  historyPromptModalShow = false;//标本历史记录弹窗开关
-  scode = '';//查看历史记录携带
+  historyPromptModalShow = false; //标本历史记录弹窗开关
+  scode = ""; //查看历史记录携带
   viewSpecimenHistory(data) {
     this.scode = data.scode;
     this.historyPromptModalShow = true;
   }
   // 关闭标本历史记录弹窗
   closeModelHistory(e) {
-    this.historyPromptModalShow = JSON.parse(e).show
+    this.historyPromptModalShow = JSON.parse(e).show;
   }
   // 重置
   reset() {
-    this.searchCriteria = {//搜索条件
-      scode: '',
-      parent: '',
-      hospital: this.allHospital[0] ? this.allHospital[0]['id'] + '' : null,
-      department: null
+    this.searchCriteria = {
+      //搜索条件
+      scode: "",
+      parent: "",
+      hospital: this.allHospital[0] ? this.allHospital[0]["id"] + "" : null,
+      department: null,
+      speState: null,
     };
     this.getList(1);
   }
   // 选择院区
   changeHospital(id, type) {
-    if (type === 'search') {
+    if (type === "search") {
       this.searchCriteria.department = null;
     }
   }
   // 打开搜索框
+  changeSearch1(flag) {
+    if (flag) {
+      this.searchTypes();
+    }
+  }
+  // 打开搜索框
   changeSearch(flag) {
     if (flag) {
-      this.changeInp('no', 'search');
+      this.changeInp("no", "search");
     }
   }
   // 边输边搜节流阀
@@ -117,11 +131,11 @@ export class SpecimenSearchComponent implements OnInit {
     if (!dept) {
       return;
     }
-    if (dept === 'no') {
-      dept = '';
+    if (dept === "no") {
+      dept = "";
     }
     this.isLoading = true;
-    this.changeInpSubject.next([dept, type])
+    this.changeInpSubject.next([dept, type]);
   }
   // 搜索科室
   snum = 0;
@@ -130,24 +144,26 @@ export class SpecimenSearchComponent implements OnInit {
       department: {
         dept,
         hospital: {
-          id: this.searchCriteria.hospital
-        }
+          id: this.searchCriteria.hospital,
+        },
       },
       idx: 0,
-      sum: 20
-    }
+      sum: 20,
+    };
     this.snum++;
-    this.mainService.getFetchDataList('data', 'department', data).subscribe(data => {
-      this.snum--;
-      if (data.status == 200) {
-        if (type === 'search') {
-          if (this.snum === 0) {
-            this.isLoading = false;
+    this.mainService
+      .getFetchDataList("data", "department", data)
+      .subscribe((data) => {
+        this.snum--;
+        if (data.status == 200) {
+          if (type === "search") {
+            if (this.snum === 0) {
+              this.isLoading = false;
+            }
+            this.departmentSearch = data.list;
           }
-          this.departmentSearch = data.list;
         }
-      }
-    })
+      });
   }
 
   // 获取所有院区
@@ -158,38 +174,47 @@ export class SpecimenSearchComponent implements OnInit {
    */
   getAllHospital() {
     this.allHospital = [this.tool.getCurrentHospital()];
-    this.searchCriteria.hospital = this.tool.getCurrentHospital().id + '';
+    this.searchCriteria.hospital = this.tool.getCurrentHospital().id + "";
     this.getList(1);
-    this.changeHospital(this.searchCriteria.hospital, 'search');
+    this.changeHospital(this.searchCriteria.hospital, "search");
   }
 
-
   // 表格数据
   loading1 = false;
   getList(type) {
     if (type == 1) {
-      this.pageIndex = 1
+      this.pageIndex = 1;
     }
     let postData = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
       specimen: {
-        "hosId": this.searchCriteria.hospital,
-        "sickRoom": {
-          "id": this.searchCriteria.department
-        },
-        "scode": !this.searchCriteria.scode ? null : this.searchCriteria.scode,
-        "keyWord": !this.searchCriteria.parent ? null : this.searchCriteria.parent
-      }
-    }
+        hosId: this.searchCriteria.hospital,
+        sickRoom: this.searchCriteria.department
+          ? {
+              id: this.searchCriteria.department,
+            }
+          : undefined,
+        scode: !this.searchCriteria.scode
+          ? undefined
+          : this.searchCriteria.scode,
+        keyWord: !this.searchCriteria.parent
+          ? undefined
+          : this.searchCriteria.parent,
+        speState: this.searchCriteria.speState
+          ? { id: this.searchCriteria.speState }
+          : undefined,
+      },
+    };
     this.loading1 = true;
-    this.mainService.getFetchDataList('simple/data', 'specimen', postData).subscribe(data => {
-      this.loading1 = false;
-      if (data.status == 200) {
-        this.listOfData = data.list;
-        this.listLength = data.totalNum;
-      }
-    })
+    this.mainService
+      .getFetchDataList("simple/data", "specimen", postData)
+      .subscribe((data) => {
+        this.loading1 = false;
+        if (data.status == 200) {
+          this.listOfData = data.list;
+          this.listLength = data.totalNum;
+        }
+      });
   }
 }
-