修改bug

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.3.108",
+    "target": "http://192.168.4.223",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/services/main.service.ts

@@ -740,4 +740,11 @@ export class MainService {
       headers: this.headers,
     });
   }
+
+  // 获取检验项目列表
+  specimenCount(data): any {
+    return this.http.post(host.host + "/api/specimenDesc/specimenCount", data, {
+      headers: this.headers,
+    });
+  }
 }

src/app/share/businessData-detail-modal/businessData-detail-modal.component.html

@@ -39,11 +39,18 @@
             <div nz-col nzXl='24' class="list-template__searchBox">
               <div class="list-template__searchItem">
                 <span class="label">标本类型</span>：
-                <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear
+                <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch
                   nzPlaceHolder="请选择标本类型" [(ngModel)]="searchCriteria.stype" (ngModelChange)="selectStype($event)">
                   <nz-option *ngFor="let option of specimentTypeList" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
                 </nz-select>
               </div>
+              <div class="list-template__searchItem">
+                <span class="label">检验项目</span>：
+                <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch
+                  nzPlaceHolder="请选择检验项目" [(ngModel)]="searchCriteria.specimenDesc" (ngModelChange)="selectStype($event)">
+                  <nz-option *ngFor="let option of specimenDescList" [nzLabel]="option.nameNum" [nzValue]="option.id"></nz-option>
+                </nz-select>
+              </div>
             </div>
           </div>
         </div>

src/app/share/businessData-detail-modal/businessData-detail-modal.component.less

@@ -12,6 +12,7 @@
     td {
       text-align: center !important;
       position: relative;
+      word-break: break-all;
     }
     .thead {
       background-image: linear-gradient(to right, @bg-start, @bg-end);

src/app/share/businessData-detail-modal/businessData-detail-modal.component.ts

@@ -19,6 +19,7 @@ export class BusinessDataDetailModalComponent implements OnInit {
   total: number = 0;//表格总数据量
   searchCriteria:any = {
     stype: 0,
+    specimenDesc: 0,
   }
   @Input() show: Boolean;
   @Input() orderId: String;
@@ -39,6 +40,7 @@ export class BusinessDataDetailModalComponent implements OnInit {
       case 'specimen':
           this.getSpecimen(1);
           this.getSpecimenType();
+          this.getSpecimenDesc();
           break;
       case 'deptInspectionRateStatistics':
           this.getDeptInspectionRateStatistics(1);
@@ -103,6 +105,21 @@ export class BusinessDataDetailModalComponent implements OnInit {
     })
   }
 
+  // 获取检验项目
+  specimenDescList: any[] = [{ id: 0, name: '', nameNum: '全部' }];
+  id:number = 0;
+  getSpecimenDesc() {
+    let postData = {
+      "hosId": this.hosId,
+      "gdId": this.orderId,
+    };
+    this.mainService.specimenCount(postData).subscribe((data:any) => {
+      data.data = data.data || [];
+      let specimenDescList = [{ id: 0, name: '全部', nameNum: '全部' }];
+      this.specimenDescList = specimenDescList.concat( data.data.map(v => ({id: --this.id, name: v[0] || '', nameNum: (v[0] || '') + `(${v[1]})`})));
+    })
+  }
+
   // 获取标本列表
   getSpecimen(idx?) {
     if (idx) {
@@ -116,6 +133,7 @@ export class BusinessDataDetailModalComponent implements OnInit {
         hosId: this.hosId,
         gdid: this.orderId,
         stype: this.searchCriteria.stype ? { id: this.searchCriteria.stype } : undefined,
+        specimenDesc: this.searchCriteria.specimenDesc ? this.specimenDescList.find(v => v.id == this.searchCriteria.specimenDesc).name: undefined,
       }
     }
     this.hsLoading = true;

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

@@ -197,8 +197,8 @@
           [(nzPageIndex)]="pageIndex"
           [(nzTotal)]="listLength"
           [(nzPageSize)]="pageSize"
-          (nzPageIndexChange)="getList(0)"
-          (nzPageSizeChange)="getList(0)"
+          (nzPageIndexChange)="getList(0, sortCurrentKey, sortCurrentValue)"
+          (nzPageSizeChange)="getList(0, sortCurrentKey, sortCurrentValue)"
         >
         </nz-pagination>
       </div>

src/app/views/worker-statistics-detail/worker-statistics-detail.component.ts

@@ -73,8 +73,6 @@ export class WorkerStatisticsDetailComponent implements OnInit {
       postData.worker = currentPersonId;
     }else if(this.type === 'deptInspectionRateStatistics'){
       postData.deptId = this.deptId === 'null' ? undefined : this.deptId;
-      postData.key = "association_types";
-      postData.value = "inspect";
     }
     this.mainService.postCustom("report", "userDetails", postData).subscribe(
       (result) => {