工单详情修改

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

@@ -1,106 +1,121 @@
 <!-- 药品/静配 -->
 <div class="detail" *ngIf="!maskFlag">
   <div class="title">工单信息<i class="icon_transport transport-guanbi" (click)="close()"></i></div>
-  <div class="content">
-    <div class="top">
-      <div class="num">
-        <span class="left">单号：{{orderInfo.gdcode}}</span>
-        <span class="right">{{orderInfo.gdState?orderInfo.gdState.name:''}}</span>
-      </div>
-      <div class="info" nz-row>
-        <div nz-col nzSpan="8">工单日期：{{orderInfo.startTime}}</div>
-        <div nz-col nzSpan="8">总耗时：{{orderInfo.showTimeNum}}</div>
-        <div nz-col nzSpan="8">申请类型：{{orderInfo.taskType?orderInfo.taskType.taskName:''}}<ng-container *ngIf="orderInfo.goodsRemark">-{{orderInfo.goodsRemark}}</ng-container></div>
-        <div nz-col nzSpan="8">
-          申请科室：{{orderInfo.createDeptDTO?(!showCoop&&deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'-'}}
-        </div>
-        <div nz-col nzSpan="8">
-          目标科室：{{(orderInfo.endDepts&&orderInfo.endDepts[0])?(!showCoop&&deptDisplay==2?orderInfo.endDepts[0].deptalias:orderInfo.endDepts[0].dept):''}}
+  <overlay-scrollbars #osComponentRef1 style="height: 90%; flex: 1">
+    <div class="content">
+      <div class="top" *ngIf="amplificationShow">
+        <div class="num">
+          <span class="left">单号：{{orderInfo.gdcode}}</span>
+          <span class="right">{{orderInfo.gdState?orderInfo.gdState.name:''}}</span>
         </div>
-        <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息：{{orderInfo.worker.name}}</div>
-        <div nz-col nzSpan="8" *ngIf="orderInfo.drugs">药包编码：{{orderInfo.drugs.packid}}</div>
-        <div nz-col nzSpan="8" *ngIf="orderInfo.staticDistri">药包编码：{{orderInfo.staticDistri.packid}}</div>
-        <div nz-col nzSpan="24" *ngIf="orderInfo.specialCloseReason">
-          特殊情况关闭原因：{{orderInfo.specialCloseReason}}
+        <div class="info" nz-row>
+          <div nz-col nzSpan="8">工单日期：{{orderInfo.startTime}}</div>
+          <div nz-col nzSpan="8">总耗时：{{orderInfo.showTimeNum}}</div>
+          <div nz-col nzSpan="8">申请类型：{{orderInfo.taskType?orderInfo.taskType.taskName:''}}<ng-container *ngIf="orderInfo.goodsRemark">-{{orderInfo.goodsRemark}}</ng-container></div>
+          <div nz-col nzSpan="8">
+            申请科室：{{orderInfo.createDeptDTO?(!showCoop&&deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'-'}}
+          </div>
+          <div nz-col nzSpan="8">
+            目标科室：{{(orderInfo.endDepts&&orderInfo.endDepts[0])?(!showCoop&&deptDisplay==2?orderInfo.endDepts[0].deptalias:orderInfo.endDepts[0].dept):''}}
+          </div>
+          <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息：{{orderInfo.worker.name}}</div>
+          <div nz-col nzSpan="8" *ngIf="orderInfo.drugs">药包编码：{{orderInfo.drugs.packid}}</div>
+          <div nz-col nzSpan="8" *ngIf="orderInfo.staticDistri">药包编码：{{orderInfo.staticDistri.packid}}</div>
+          <div nz-col nzSpan="24" *ngIf="orderInfo.specialCloseReason">
+            特殊情况关闭原因：{{orderInfo.specialCloseReason}}
+          </div>
         </div>
       </div>
-    </div>
-    <div class="center">
-      <div class="box">
-        <div class="steps" *ngFor="let step of logList">
-          <div class="step">
-            <div class="info">
-              <i
-                [ngClass]="{'icon_transport':true, 'transport-icon_liucheng':true,'green':(step.record&&step.record[0]&&step.record[0].operationTime)}"></i>
-              <p>{{step.operationName}}</p>
-              <p>{{step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
-              <p *ngIf="step.record&&step.record.length&&step.record[0].dept"><span
-                  *ngFor="let dept of step.record">{{!showCoop&&deptDisplay==2?dept.deptalias:dept.dept}},</span></p>
-              <p *ngIf="step.record&&step.record.length">{{filterTime(step.record)?'耗时'+filterTime(step.record):''}}</p>
+      <div class="center" *ngIf="amplificationShow">
+        <div class="box">
+          <div class="steps" *ngFor="let step of logList">
+            <div class="step">
+              <div class="info">
+                <i
+                  [ngClass]="{'icon_transport':true, 'transport-icon_liucheng':true,'green':(step.record&&step.record[0]&&step.record[0].operationTime)}"></i>
+                <p>{{step.operationName}}</p>
+                <p>{{step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
+                <p *ngIf="step.record&&step.record.length&&step.record[0].dept"><span
+                    *ngFor="let dept of step.record">{{!showCoop&&deptDisplay==2?dept.deptalias:dept.dept}},</span></p>
+                <p *ngIf="step.record&&step.record.length">{{filterTime(step.record)?'耗时'+filterTime(step.record):''}}</p>
+              </div>
+              <div class="line"></div>
             </div>
-            <div class="line"></div>
           </div>
         </div>
       </div>
-    </div>
-    <div class="bottom">
-
-      <div class="urgent" *ngIf="orderInfo.urgentDetails&&showCoop">
-        加急原因：{{orderInfo.urgentDetails.urgentReason}}
-        <button *ngIf="orderInfo.urgentDetails.checkStatus.id==329" nz-button nzType="primary"
-          [nzLoading]="urgentLoading" nzGhost (click)="urgent()">确认加急</button>
-      </div>
-      <div class="table">
-        <nz-table *ngIf="orderInfo.staticDistri" class="detailDrugTable"
-          [nzData]="orderInfo.staticDistri.jpdetailsFormat" nzSize="small" [nzScroll]="{ y: '110px' }"
-          [nzShowPagination]="null">
-          <thead>
-            <tr class="thead">
-              <th nzWidth="100px">患者信息</th>
-              <th nzWidth="200px">药品</th>
-              <th nzWidth="50px">数量</th>
-              <th nzWidth="100px">患者信息</th>
-              <th nzWidth="200px">药品</th>
-              <th nzWidth="50px">数量</th>
-            </tr>
-          </thead>
-          <tbody *ngIf="orderInfo.staticDistri">
-            <tr *ngFor="let data of orderInfo.staticDistri.jpdetailsFormat">
-              <td>{{data[0].bedNum}}床：{{data[0].patientInfo}}</td>
-              <td>{{data[0].jpInfo}}</td>
-              <td>{{data[0].jpNum}}</td>
-              <td>{{data[1]?data[1].bedNum+"床："+data[1].patientInfo:''}}</td>
-              <td>{{data[1]?data[1].jpInfo:''}}</td>
-              <td>{{data[1]?data[1].jpNum:''}}</td>
-            </tr>
-          </tbody>
-        </nz-table>
-        <nz-table *ngIf="orderInfo.drugs" class="detailDrugTable" [nzData]="orderInfo.drugs.drugsFormat" nzSize="small"
-          [nzScroll]="{ y: '110px' }" [nzShowPagination]="null">
-          <thead>
-            <tr class="thead">
-              <th nzWidth="100px">患者信息</th>
-              <th nzWidth="200px">药品</th>
-              <th nzWidth="50px">数量</th>
-              <th nzWidth="100px">患者信息</th>
-              <th nzWidth="200px">药品</th>
-              <th nzWidth="50px">数量</th>
-            </tr>
-          </thead>
-          <tbody *ngIf="orderInfo.drugs">
-            <tr *ngFor="let data of orderInfo.drugs.drugsFormat">
-              <td>{{data[0].bedNum}}床：{{data[0].patientInfo}}</td>
-              <td>{{data[0].drugsInfo}}</td>
-              <td>{{data[0].drugsNum}}</td>
-              <td>{{data[1]?data[1].bedNum+"床："+data[1].patientInfo:''}}</td>
-              <td>{{data[1]?data[1].drugsInfo:''}}</td>
-              <td>{{data[1]?data[1].drugsNum:''}}</td>
-            </tr>
-          </tbody>
-        </nz-table>
+      <div class="bottom">
+        <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 class="table">
+          <nz-table *ngIf="orderInfo.staticDistri" class="detailDrugTable"
+            [nzData]="orderInfo.staticDistri.jpdetailsFormat" nzSize="small" [nzScroll]="{ y: '110px' }"
+            [nzShowPagination]="null">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="100px">患者信息</th>
+                <th nzWidth="200px">药品</th>
+                <th nzWidth="50px">数量</th>
+                <th nzWidth="100px">患者信息</th>
+                <th nzWidth="200px">药品</th>
+                <th nzWidth="50px">数量</th>
+              </tr>
+            </thead>
+            <tbody *ngIf="orderInfo.staticDistri">
+              <tr *ngFor="let data of orderInfo.staticDistri.jpdetailsFormat">
+                <td>{{data[0].bedNum}}床：{{data[0].patientInfo}}</td>
+                <td>{{data[0].jpInfo}}</td>
+                <td>{{data[0].jpNum}}</td>
+                <td>{{data[1]?data[1].bedNum+"床："+data[1].patientInfo:''}}</td>
+                <td>{{data[1]?data[1].jpInfo:''}}</td>
+                <td>{{data[1]?data[1].jpNum:''}}</td>
+              </tr>
+            </tbody>
+          </nz-table>
+          <nz-table *ngIf="orderInfo.drugs" class="detailDrugTable" [nzData]="orderInfo.drugs.drugsFormat" nzSize="small"
+            [nzScroll]="{ y: '110px' }" [nzShowPagination]="null">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="100px">患者信息</th>
+                <th nzWidth="200px">药品</th>
+                <th nzWidth="50px">数量</th>
+                <th nzWidth="100px">患者信息</th>
+                <th nzWidth="200px">药品</th>
+                <th nzWidth="50px">数量</th>
+              </tr>
+            </thead>
+            <tbody *ngIf="orderInfo.drugs">
+              <tr *ngFor="let data of orderInfo.drugs.drugsFormat">
+                <td>{{data[0].bedNum}}床：{{data[0].patientInfo}}</td>
+                <td>{{data[0].drugsInfo}}</td>
+                <td>{{data[0].drugsNum}}</td>
+                <td>{{data[1]?data[1].bedNum+"床："+data[1].patientInfo:''}}</td>
+                <td>{{data[1]?data[1].drugsInfo:''}}</td>
+                <td>{{data[1]?data[1].drugsNum:''}}</td>
+              </tr>
+            </tbody>
+          </nz-table>
+        </div>
       </div>
     </div>
-  </div>
+  </overlay-scrollbars>
   <div class="btns display_flex justify-content_flex-center">
     <!-- <button *ngIf="showCoop&&orderInfo.gdState.id==69" nz-button nzType="primary" (click)='allotWorker()'>派单</button>
     <button *ngIf="showCoop&&(orderInfo.gdState.id==70||orderInfo.gdState.id==71)" nz-button nzType="primary" nzGhost

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

@@ -15,6 +15,7 @@
 
 .detail {
   width: 1000px;
+  height: calc(100vh - 100px);
   min-height: 580px;
   border-radius: 5px;
   background: #fff;
@@ -130,6 +131,9 @@
       background: #f9fafb;
 
       .urgent {
+        display: flex;
+        justify-content: space-between;
+        margin-bottom: 8px;
         input {
           width: 600px;
         }
@@ -169,6 +173,7 @@
 
             td {
               border: none;
+              position: relative;
             }
           }
 

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

@@ -1,9 +1,10 @@
-import { Component, OnInit } from "@angular/core";
+import { Component, OnInit, ViewChild } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 import { MainService } from "../../services/main.service";
 import { forkJoin } from "rxjs";
 import { NzMessageService } from "ng-zorro-antd";
 import { ToolService } from "src/app/services/tool.service";
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
 
 @Component({
   selector: "app-detail-drug",
@@ -11,6 +12,11 @@ import { ToolService } from "src/app/services/tool.service";
   styleUrls: ["./detail-drug.component.less"],
 })
 export class DetailDrugComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
   constructor(
     private message: NzMessageService,
     private route: ActivatedRoute,
@@ -33,6 +39,7 @@ export class DetailDrugComponent implements OnInit {
   btnLoading: boolean = false; //确认按钮loading状态
   maskFlag: any = false;
   deptDisplay; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
+  amplificationShow = true;
   ngOnInit() {
     this.tool.getDeptDisplay().subscribe((result) => {
       if (result.status == 200) {
@@ -58,6 +65,11 @@ export class DetailDrugComponent implements OnInit {
     });
   }
 
+  // 放大
+  amplification(){
+    this.amplificationShow = !this.amplificationShow;
+  }
+
   // 获取工单详情
   getDetail() {
     return this.mainService.getFetchData("api", "workOrder", this.id);

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

@@ -1,54 +1,70 @@
 <!-- 患者转运/其他 -->
 <div class="detail" *ngIf="!maskFlag">
   <div class="title">工单信息<i class="icon_transport transport-guanbi" (click)="close()"></i></div>
-  <div class="content">
-    <div class="top">
-      <div class="num">
-        <span class="left">单号：{{orderInfo.gdcode}}</span>
-        <span class="right">{{orderInfo.gdState.name}}</span>
-      </div>
-      <div class="info" nz-row>
-        <div nz-col nzSpan="8">工单日期：{{orderInfo.startTime}}</div>
-        <div nz-col nzSpan="8">总耗时：{{orderInfo.showTimeNum}}</div>
-        <div nz-col nzSpan="8">申请类型：{{orderInfo.taskType.taskName}}<ng-container *ngIf="orderInfo.goodsRemark">-{{orderInfo.goodsRemark}}</ng-container></div>
-        <div nz-col nzSpan="8">
-          申请科室：{{orderInfo.createDeptDTO?(!showCoop&&deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'-'}}
-        </div>
-        <div nz-col nzSpan="8">目标科室：{{endDepts}}</div>
-        <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息：{{orderInfo.worker.name}}</div>
-        <div nz-col nzSpan="24" *ngIf="orderInfo.workOrderRemark">备注信息：{{orderInfo.workOrderRemark}}
+  <overlay-scrollbars #osComponentRef1 style="height: 90%; flex: 1">
+    <div class="content">
+      <div class="top" *ngIf="amplificationShow">
+        <div class="num">
+          <span class="left">单号：{{orderInfo.gdcode}}</span>
+          <span class="right">{{orderInfo.gdState.name}}</span>
         </div>
-        <div nz-col nzSpan="24" *ngIf="orderInfo.specialCloseReason">特殊情况关闭原因：{{orderInfo.specialCloseReason}}
+        <div class="info" nz-row>
+          <div nz-col nzSpan="8">工单日期：{{orderInfo.startTime}}</div>
+          <div nz-col nzSpan="8">总耗时：{{orderInfo.showTimeNum}}</div>
+          <div nz-col nzSpan="8">申请类型：{{orderInfo.taskType.taskName}}<ng-container *ngIf="orderInfo.goodsRemark">-{{orderInfo.goodsRemark}}</ng-container></div>
+          <div nz-col nzSpan="8">
+            申请科室：{{orderInfo.createDeptDTO?(!showCoop&&deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'-'}}
+          </div>
+          <div nz-col nzSpan="8">目标科室：{{endDepts}}</div>
+          <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息：{{orderInfo.worker.name}}</div>
+          <div nz-col nzSpan="24" *ngIf="orderInfo.workOrderRemark">备注信息：{{orderInfo.workOrderRemark}}
+          </div>
+          <div nz-col nzSpan="24" *ngIf="orderInfo.specialCloseReason">特殊情况关闭原因：{{orderInfo.specialCloseReason}}
+          </div>
         </div>
       </div>
-    </div>
-    <div class="center">
-      <div class="box">
-        <div class="steps" *ngFor="let step of logList;let i = index;">
-          <div class="step">
-            <div class="info">
-              <i
-                [ngClass]="{'icon_transport':true, 'transport-icon_liucheng':true,'green':(step.record&&step.record[0]&&step.record[0].operationTime)}"></i>
-              <p>{{step.operationName}}</p>
-              <p>{{step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
-              <p *ngIf="step.record[0]&&step.record[0].dept">
-                <span *ngFor="let dept of step.record">{{!showCoop&&deptDisplay==2?dept.deptalias:dept.dept}},</span>
-              </p>
-              <p *ngIf="i!=0&&step.record&&step.record.length">耗时{{filterTime(step.record)}}</p>
+      <div class="center" *ngIf="amplificationShow">
+        <div class="box">
+          <div class="steps" *ngFor="let step of logList;let i = index;">
+            <div class="step">
+              <div class="info">
+                <i
+                  [ngClass]="{'icon_transport':true, 'transport-icon_liucheng':true,'green':(step.record&&step.record[0]&&step.record[0].operationTime)}"></i>
+                <p>{{step.operationName}}</p>
+                <p>{{step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
+                <p *ngIf="step.record[0]&&step.record[0].dept">
+                  <span *ngFor="let dept of step.record">{{!showCoop&&deptDisplay==2?dept.deptalias:dept.dept}},</span>
+                </p>
+                <p *ngIf="i!=0&&step.record&&step.record.length">耗时{{filterTime(step.record)}}</p>
+              </div>
+              <div class="line"></div>
             </div>
-            <div class="line"></div>
           </div>
         </div>
       </div>
-    </div>
-    <div class="bottom" *ngIf="orderInfo.urgentDetails&&showCoop">
-      <div class="urgent">
-        加急原因：{{orderInfo.urgentDetails.urgentReason}}
-        <button *ngIf="orderInfo.urgentDetails.checkStatus.id==329" nz-button nzType="primary"
-          [nzLoading]="urgentLoading" nzGhost (click)="urgent()">确认加急</button>
+      <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>
-  </div>
+  </overlay-scrollbars>
   <div class="btns display_flex justify-content_flex-center">
     <!-- <button *ngIf="showCoop&&orderInfo.gdState.id==69" nz-button nzType="primary" [nzLoading]="isOkLoading"
       (click)='allotWorker()'>派单</button>

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

@@ -15,6 +15,7 @@
 
 .detail {
   width: 1000px;
+  height: calc(100vh - 100px);
   min-height: 530px;
   border-radius: 5px;
   background: #fff;
@@ -130,6 +131,9 @@
       background: #f9fafb;
 
       .urgent {
+        display: flex;
+        justify-content: space-between;
+        margin-bottom: 8px;
         input {
           width: 600px;
         }
@@ -167,6 +171,7 @@
 
             td {
               border: none;
+              position: relative;
             }
           }
 

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

@@ -1,9 +1,10 @@
-import { Component, OnInit } from "@angular/core";
+import { Component, OnInit, ViewChild } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 import { MainService } from "../../services/main.service";
 import { forkJoin } from "rxjs";
 import { NzMessageService } from "ng-zorro-antd";
 import { ToolService } from "src/app/services/tool.service";
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
 
 @Component({
   selector: "app-detail-others",
@@ -11,6 +12,11 @@ import { ToolService } from "src/app/services/tool.service";
   styleUrls: ["./detail-others.component.less"],
 })
 export class DetailOthersComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
   constructor(
     private message: NzMessageService,
     private route: ActivatedRoute,
@@ -34,6 +40,7 @@ export class DetailOthersComponent implements OnInit {
   btnLoading: boolean = false; //确认按钮loading状态
   maskFlag: any = false;
   deptDisplay; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
+  amplificationShow = true;
 
   ngOnInit() {
     this.tool.getDeptDisplay().subscribe((result) => {
@@ -65,6 +72,11 @@ export class DetailOthersComponent implements OnInit {
     });
   }
 
+  // 放大
+  amplification(){
+    this.amplificationShow = !this.amplificationShow;
+  }
+
   // 获取工单详情
   getDetail() {
     return this.mainService.getFetchData("api", "workOrder", this.id);

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

@@ -1,9 +1,9 @@
 <!-- 患者陪检/患者转运 -->
 <div class="detail" *ngIf="!maskFlag">
   <div class="title">工单信息<i class="icon_transport transport-guanbi" (click)="close()"></i></div>
-  <overlay-scrollbars #osComponentRef1 style="height: 462px;">
+  <overlay-scrollbars #osComponentRef1 style="height: 90%; flex: 1">
     <div class="content">
-      <div class="top">
+      <div class="top" *ngIf="amplificationShow">
         <div class="num">
           <span class="left">单号：{{orderInfo.gdcode}}</span>
           <span class="right">{{orderInfo.gdState.name}}</span>
@@ -32,7 +32,7 @@
           </div>
         </div>
       </div>
-      <div class="center">
+      <div class="center" *ngIf="amplificationShow">
         <div class="box display_flex justify-content_flex-center">
           <div class="steps" *ngFor="let step of logList;let i = index;">
             <div class="step">
@@ -52,10 +52,24 @@
         </div>
       </div>
       <div class="bottom">
-        <div class="urgent" *ngIf="orderInfo.urgentDetails&&showCoop">
-          加急原因：{{orderInfo.urgentDetails.urgentReason}}
-          <button *ngIf="orderInfo.urgentDetails.checkStatus.id==329" nz-button nzType="primary"
-            [nzLoading]="urgentLoading" nzGhost (click)="urgent()">确认加急</button>
+        <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 class="info">
           <div nz-row class="top">

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

@@ -14,7 +14,8 @@
 
 .detail {
   width: 1000px;
-  max-height: 580px;
+  height: calc(100vh - 100px);
+  min-height: 580px;
   border-radius: 5px;
   background: #fff;
   color: #333;
@@ -129,6 +130,9 @@
       background: #f9fafb;
 
       .urgent {
+        display: flex;
+        justify-content: space-between;
+        margin-bottom: 8px;
         input {
           width: 600px;
         }

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

@@ -39,6 +39,7 @@ export class DetailPatientsComponent implements OnInit {
   btnLoading: boolean = false; //确认按钮loading状态
   maskFlag: any = false;
   deptDisplay; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
+  amplificationShow = true;
   ngOnInit() {
     this.tool.getDeptDisplay().subscribe((result) => {
       if (result.status == 200) {
@@ -88,6 +89,10 @@ export class DetailPatientsComponent implements OnInit {
       }
     });
   }
+  // 放大
+  amplification(){
+    this.amplificationShow = !this.amplificationShow;
+  }
   // 获取工单详情
   middleDept = []; //中间科室数组
   getDetail() {

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

@@ -1,96 +1,117 @@
 <!-- 标本 -->
 <div class="detail" *ngIf="!maskFlag">
   <div class="title">工单信息<i class="icon_transport transport-guanbi" (click)="close()"></i></div>
-  <div class="content">
-    <div class="top">
-      <div class="num">
-        <span class="left">单号：{{orderInfo.gdcode}}</span>
-        <span class="right">{{orderInfo.gdState.name}}</span>
-      </div>
-      <div class="info" nz-row>
-        <div nz-col nzSpan="8">工单日期：{{orderInfo.startTime}}</div>
-        <div nz-col nzSpan="8">总耗时：{{orderInfo.showTimeNum}}</div>
-        <div nz-col nzSpan="8">申请类型：{{orderInfo.taskType.taskName}}<ng-container *ngIf="orderInfo.goodsRemark">-{{orderInfo.goodsRemark}}</ng-container></div>
-        <div nz-col nzSpan="8">预计接收：{{orderInfo.expectReceiveNum?orderInfo.expectReceiveNum:''}}</div>
-
-        <div nz-col nzSpan="8">
-          申请科室：{{orderInfo.createDeptDTO?(!showCoop&&deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'-'}}
-        </div>
-        <div nz-col nzSpan="8">目标科室：{{endDepts}}</div>
-        <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息：{{orderInfo.worker.name}}</div>
-        <div nz-col nzSpan="8">实际接收：{{orderInfo.actualReceiveNum?orderInfo.actualReceiveNum:''}}</div>
-        <div nz-col nzSpan="24" *ngIf="orderInfo.workOrderRemark">备注信息：{{orderInfo.workOrderRemark}}
+  <overlay-scrollbars #osComponentRef1 style="height: 90%; flex: 1">
+    <div class="content">
+      <div class="top" *ngIf="amplificationShow">
+        <div class="num">
+          <span class="left">单号：{{orderInfo.gdcode}}</span>
+          <span class="right">{{orderInfo.gdState.name}}</span>
         </div>
-        <div nz-col nzSpan="24" *ngIf="orderInfo.specialCloseReason">
-          特殊情况关闭原因：{{orderInfo.specialCloseReason}}
+        <div class="info" nz-row>
+          <div nz-col nzSpan="8">工单日期：{{orderInfo.startTime}}</div>
+          <div nz-col nzSpan="8">总耗时：{{orderInfo.showTimeNum}}</div>
+          <div nz-col nzSpan="8">申请类型：{{orderInfo.taskType.taskName}}<ng-container *ngIf="orderInfo.goodsRemark">-{{orderInfo.goodsRemark}}</ng-container></div>
+          <div nz-col nzSpan="8">预计接收：{{orderInfo.expectReceiveNum?orderInfo.expectReceiveNum:''}}</div>
+
+          <div nz-col nzSpan="8">
+            申请科室：{{orderInfo.createDeptDTO?(!showCoop&&deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'-'}}
+          </div>
+          <div nz-col nzSpan="8">目标科室：{{endDepts}}</div>
+          <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息：{{orderInfo.worker.name}}</div>
+          <div nz-col nzSpan="8">实际接收：{{orderInfo.actualReceiveNum?orderInfo.actualReceiveNum:''}}</div>
+          <div nz-col nzSpan="24" *ngIf="orderInfo.workOrderRemark">备注信息：{{orderInfo.workOrderRemark}}
+          </div>
+          <div nz-col nzSpan="24" *ngIf="orderInfo.specialCloseReason">
+            特殊情况关闭原因：{{orderInfo.specialCloseReason}}
+          </div>
         </div>
       </div>
-    </div>
-    <div class="center">
-      <div class="box display_flex justify-content_flex-center">
-        <div class="steps" *ngFor="let step of logList;let i=index;">
-          <div class="step">
-            <div class="info">
-              <i
-                [ngClass]="{'icon_transport':true, 'transport-icon_liucheng':true,'green':(step.record&&step.record[0]&&step.record[0].operationTime)}"></i>
-              <p>{{step.operationName}}</p>
-              <p>{{step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
-              <p *ngIf="step.record[0]&&step.record[0].dept">
-                <span *ngFor="let dept of step.record">{{!showCoop&&deptDisplay==2?dept.deptalias:dept.dept}},</span>
-              </p>
-              <p *ngIf="i!=0&&step.record&&step.record.length">耗时{{filterTime(step.record)}}</p>
+      <div class="center" *ngIf="amplificationShow">
+        <div class="box display_flex justify-content_flex-center">
+          <div class="steps" *ngFor="let step of logList;let i=index;">
+            <div class="step">
+              <div class="info">
+                <i
+                  [ngClass]="{'icon_transport':true, 'transport-icon_liucheng':true,'green':(step.record&&step.record[0]&&step.record[0].operationTime)}"></i>
+                <p>{{step.operationName}}</p>
+                <p>{{step.record.length>=1?(step.record[0].operationTime|date:'MM-dd HH:mm'):''}}</p>
+                <p *ngIf="step.record[0]&&step.record[0].dept">
+                  <span *ngFor="let dept of step.record">{{!showCoop&&deptDisplay==2?dept.deptalias:dept.dept}},</span>
+                </p>
+                <p *ngIf="i!=0&&step.record&&step.record.length">耗时{{filterTime(step.record)}}</p>
+              </div>
+              <div class="line"></div>
             </div>
-            <div class="line"></div>
           </div>
         </div>
       </div>
-    </div>
-    <div class="bottom">
-      <div class="urgent" *ngIf="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>
-      </div>
-      <div class="table">
-        <nz-table class="detailSampleTable" [nzData]="orderInfo.specimenSet" nzSize="small" [nzScroll]="{ y: '105px' }"
-          [nzShowPagination]="null">
-          <thead>
-            <tr class="thead">
-              <th nzWidth="50px">序号</th>
-              <th nzWidth="95px">检验项目</th>
-              <th nzWidth="95px">标本类型</th>
-              <th nzWidth="110px">标本编码</th>
-              <th nzWidth="88px">患者姓名</th>
-              <th nzWidth="88px">住院号</th>
-              <th nzWidth="50px">床号</th>
-              <th nzWidth="88px">目标科室</th>
-              <!-- <th nzWidth="75px">是否接收</th> -->
-              <!-- <th nzWidth="75px">是否送达</th> -->
-              <th nzWidth="123px">接收扫描时间</th>
-              <!-- <th nzWidth="123px">送达扫描时间</th> -->
-            </tr>
-          </thead>
-          <tbody *ngIf="orderInfo.specimenSet">
-            <tr *ngFor="let data of orderInfo.specimenSet;let i =index;">
-              <td>{{i+1}}</td>
-              <td>{{data.specimenDesc}}</td>
-              <td>{{data.stype?data.stype.name:''}}</td>
-              <td>{{data.scode}}</td>
-              <td>{{data.patientName}}</td>
-              <td>{{data.residenceNo}}</td>
-              <td>{{data.bedNum}}</td>
-              <td>{{!showCoop&&deptDisplay==2?data.checkDept.deptalias:data.checkDept.dept}}</td>
-              <!-- <td>{{data.received?"是":"否"}}</td> -->
-              <!-- <td>{{data.arrived?"是":"否"}}</td> -->
-              <td>{{data.arriveTime|date:'MM-dd HH:mm'}}<img *ngIf="data.urgent == 1||true"
-                src="../../assets/images/icon_ji.png" alt="" class="ji"></td>
-              <!-- <td style="position: relative;">{{data.sendTime?data.sendTime:'-'}}</td> -->
-            </tr>
-          </tbody>
-        </nz-table>
+      <div class="bottom">
+        <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 class="table">
+          <nz-table class="detailSampleTable" [nzData]="orderInfo.specimenSet" nzSize="small" [nzShowPagination]="null">
+            <thead>
+              <tr class="thead">
+                <th nzWidth="4%">序号</th>
+                <th nzWidth="8%">申请科室</th>
+                <th nzWidth="7%">患者姓名</th>
+                <th nzWidth="5%">标本编码</th>
+                <th nzWidth="8%">检验项目</th>
+                <th nzWidth="8%">标本类型</th>
+                <th nzWidth="5%">状态</th>
+                <th nzWidth="8%">收取时间</th>
+                <th nzWidth="8%">收取人</th>
+                <th nzWidth="8%">中转时间</th>
+                <th nzWidth="8%">送达时间</th>
+                <th nzWidth="8%">送达人</th>
+                <th nzWidth="8%">终点科室</th>
+              </tr>
+            </thead>
+            <tbody *ngIf="orderInfo.specimenSet">
+              <tr *ngFor="let data of orderInfo.specimenSet;let i =index;">
+                <td>{{ i + 1 }}</td>
+                <td>{{ data.sickRoom ? data.sickRoom.dept : "-" }}</td>
+                <td>{{ data.patientName}}<span *ngIf="data.bedNum">({{data.bedNum}})</span><br>{{data.residenceNo}}</td>
+                <td>{{ data.scode || "-" }}</td>
+                <td>{{ data.specimenDesc || "-" }}</td>
+                <td>{{ data.stype ? data.stype.name : "-" }}</td>
+                <td>{{ data.speState ? data.speState.name : "-" }}</td>
+                <td>{{ data.arriveTime || "-" }}</td>
+                <td>{{ data.receiverName || "-" }}</td>
+                <td>{{ data.transTime || '-' }}</td>
+                <td>{{ data.sendTime || '-' }}</td>
+                <td>{{ data.delivererName || "-" }}</td>
+                <td>
+                  {{ data.checkDept ? (!showCoop&&deptDisplay==2?data.checkDept.deptalias:data.checkDept.dept) : "-" }}
+                  <img *ngIf="data.urgent == 1||true"
+                  src="../../assets/images/icon_ji.png" alt="" class="ji"></td>
+                <!-- <td style="position: relative;">{{data.sendTime?data.sendTime:'-'}}</td> -->
+              </tr>
+            </tbody>
+          </nz-table>
+        </div>
       </div>
     </div>
-  </div>
+  </overlay-scrollbars>
   <div class="btns display_flex justify-content_flex-center align-items_center">
     <!-- <button *ngIf="showCoop&&orderInfo.gdState.value==2" nz-button nzType="primary" (click)='allotWorker()'>派单</button>
     <button *ngIf="showCoop&&(orderInfo.gdState.value==3||orderInfo.gdState.value==4)" nz-button nzType="primary" nzGhost

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

@@ -13,7 +13,8 @@
 }
 
 .detail {
-  width: 1000px;
+  width: 1200px;
+  height: calc(100vh - 100px);
   min-height: 580px;
   border-radius: 5px;
   background: #fff;
@@ -43,7 +44,7 @@
   }
 
   .content {
-    width: 960px;
+    width: 1160px;
     // height: 474px;
     border: 1px solid #e5e9ed;
     border-radius: 5px;
@@ -129,6 +130,9 @@
       background: #f9fafb;
 
       .urgent {
+        display: flex;
+        justify-content: space-between;
+        margin-bottom: 8px;
         input {
           width: 600px;
         }
@@ -161,6 +165,7 @@
 
             td {
               border: none;
+              position: relative;
             }
           }
 

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

@@ -1,9 +1,10 @@
-import { Component, OnInit } from "@angular/core";
+import { Component, OnInit, ViewChild } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 import { MainService } from "../../services/main.service";
 import { forkJoin } from "rxjs";
 import { NzMessageService } from "ng-zorro-antd";
 import { ToolService } from "src/app/services/tool.service";
+import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
 
 @Component({
   selector: "app-detail-sample",
@@ -11,6 +12,11 @@ import { ToolService } from "src/app/services/tool.service";
   styleUrls: ["./detail-sample.component.less"],
 })
 export class DetailSampleComponent implements OnInit {
+  @ViewChild("osComponentRef1", {
+    read: OverlayScrollbarsComponent,
+    static: false,
+  })
+  osComponentRef1: OverlayScrollbarsComponent;
   constructor(
     private message: NzMessageService,
     private route: ActivatedRoute,
@@ -34,6 +40,7 @@ export class DetailSampleComponent implements OnInit {
   btnLoading: boolean = false; //确认按钮loading状态
   maskFlag: any = false;
   deptDisplay; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
+  amplificationShow = true;
   ngOnInit() {
     this.tool.getDeptDisplay().subscribe((result) => {
       if (result.status == 200) {
@@ -64,6 +71,11 @@ export class DetailSampleComponent implements OnInit {
     });
   }
 
+  // 放大
+  amplification(){
+    this.amplificationShow = !this.amplificationShow;
+  }
+
   // 获取工单详情
   getDetail() {
     return this.mainService.getFetchData("api", "workOrder", this.id);

src/app/share/history-prompt-modal/history-prompt-modal.component.html

@@ -7,9 +7,11 @@
         <thead>
           <tr class="thead">
             <th nzWidth="10%">序号</th>
-            <th nzWidth="30%">动作</th>
-            <th nzWidth="30%">时间</th>
-            <th nzWidth="30%">操作人</th>
+            <th nzWidth="18%">动作</th>
+            <th nzWidth="18%">时间</th>
+            <th nzWidth="18%">退回原因</th>
+            <th nzWidth="18%">备注</th>
+            <th nzWidth="18%">操作人</th>
           </tr>
         </thead>
         <tbody>
@@ -17,6 +19,8 @@
             <td>{{i+1}}</td>
             <td>{{ data.operationType?data.operationType.name:'-' }}</td>
             <td>{{ data.creatTime||'-' }}</td>
+            <td>{{ data.reasonForReturn||'-' }}</td>
+            <td>{{ data.remarks||'-' }}</td>
             <td>{{ data.operationUserName||'-' }}</td>
           </tr>
         </tbody>

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

@@ -14,8 +14,11 @@
 }
 
 .detail {
-  width: 1000px;
-  max-height: 580px;
+  display: flex;
+  flex-direction: column;
+  width: 1200px;
+  height: calc(100vh - 100px);
+  min-height: 580px;
   border-radius: 5px;
   background: #fff;
   color: #333;
@@ -44,10 +47,13 @@
   }
 
   & > .box {
-    width: 960px;
+    width: 1160px;
     border: 1px solid #e5e9ed;
     border-radius: 5px;
+    flex: 1;
     overflow: hidden;
+    display: flex;
+    flex-direction: column;
 
     .tab {
       width: 100%;
@@ -73,7 +79,8 @@
     .content {
       width: 100%;
       min-height: 453px;
-      max-height: 500px;
+      display: flex;
+      flex-direction: column;
 
       &.orders {
         background: #f9fafb;
@@ -163,9 +170,16 @@
       }
 
       & > .bottom {
+        flex: 1;
         padding: 25px 32px;
         background: #f9fafb;
 
+        .amplification {
+          display: flex;
+          justify-content: flex-end;
+          margin-bottom: 8px;
+        }
+
         .urgent {
           input {
             width: 600px;
@@ -202,7 +216,8 @@
             .thead {
               background-image: repeating-linear-gradient(
                 to right,
-                @bg-start, @bg-end 50%
+                @bg-start,
+                @bg-end 50%
               ) !important;
             }
           }
@@ -215,6 +230,7 @@
 
               td {
                 border: none;
+                position: relative;
               }
             }
 

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

@@ -78,6 +78,7 @@ export class OrderDetailComponent implements OnInit {
   urgentLoading: boolean = false; //确认加急按钮loading状态
   recLoading: boolean = false; //撤回并删除按钮loading状态
   btnLoading: boolean = false; //确认按钮loading状态
+  amplificationShow = true;
 
   ngOnInit() {
     this.tabType = this.route.snapshot.params.type || 1;
@@ -86,6 +87,11 @@ export class OrderDetailComponent implements OnInit {
   }
   ngOnDestroy() {}
 
+  // 放大
+  amplification(){
+    this.amplificationShow = !this.amplificationShow;
+  }
+
   // 获取工单详情
   middleDept = []; //中间科室数组
   getInfo() {

src/app/views/fuwutai/fuwutai.component.less

@@ -12,11 +12,14 @@
 }
 
 .fuwutai {
-  display: flex;
-  flex-direction: column;
   width: 100%;
   position: relative;
   background: #f9fafb;
+  #top{
+    display: flex;
+    flex-direction: column;
+    height: 180px;
+  }
   .transport-1_round_solid,
   .transport-2_round_solid,
   .transport-3_round_solid {
@@ -49,6 +52,7 @@
   .tabBox {
     overflow: hidden;
     display: flex;
+    height: 40px;
 
     .tab {
       // float: left;
@@ -129,6 +133,7 @@
   /* 支助人员信息内容 */
   .message_cot {
     width: 100%;
+    height: 140px;
     position: relative;
     display: inline-block;
     border-right: 1px solid rgb(225, 229, 232);

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

@@ -86,6 +86,9 @@
         </button>
       </div>
     </div>
+    <div class="list-template__checkBoxes">
+      <nz-checkbox-group [(ngModel)]="checkOptionsOne" (ngModelChange)="log(checkOptionsOne)"></nz-checkbox-group>
+    </div>
     <div class="list-template__bottom">
       <nz-table
         class="list-template__nzTable"
@@ -97,35 +100,37 @@
       >
         <thead>
           <tr class="thead">
-            <th nzWidth="5%">序号</th>
+            <th nzWidth="4%">序号</th>
+            <th nzWidth="8%">申请科室</th>
+            <th nzWidth="7%">患者姓名</th>
+            <th nzWidth="5%">标本编码</th>
             <th nzWidth="8%">检验项目</th>
             <th nzWidth="8%">标本类型</th>
-            <th nzWidth="6%">状态</th>
-            <th nzWidth="10%">标本编码</th>
-            <th nzWidth="8%">患者姓名</th>
-            <th nzWidth="8%">床号</th>
-            <th nzWidth="8%">收取扫描时间</th>
+            <th nzWidth="5%">状态</th>
+            <th nzWidth="8%">收取时间</th>
             <th nzWidth="8%">收取人</th>
-            <th nzWidth="8%">申请科室</th>
-            <th nzWidth="8%">送达目标科室</th>
-            <th nzWidth="8%">送达到达时间</th>
+            <th nzWidth="8%">中转时间</th>
+            <th nzWidth="8%">送达时间</th>
+            <th nzWidth="8%">送达人</th>
+            <th nzWidth="8%">终点科室</th>
             <th nzWidth="7%"></th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData; let i = index">
             <td>{{ i + 1 }}</td>
+            <td>{{ data.sickRoom ? data.sickRoom.dept : "-" }}</td>
+            <td>{{ data.patientName}}<span *ngIf="data.bedNum">({{data.bedNum}})</span><br>{{data.residenceNo}}</td>
+            <td>{{ data.scode || "-" }}</td>
             <td>{{ data.specimenDesc || "-" }}</td>
             <td>{{ data.stype ? data.stype.name : "-" }}</td>
             <td>{{ data.speState ? data.speState.name : "-" }}</td>
-            <td>{{ data.scode || "-" }}</td>
-            <td>{{ data.patientName || "-" }}</td>
-            <td>{{ data.bedNum || "-" }}</td>
             <td>{{ data.arriveTime || "-" }}</td>
-            <td>{{ data.worker || "-" }}</td>
-            <td>{{ data.sickRoom ? data.sickRoom.dept : "-" }}</td>
+            <td>{{ data.receiverName || "-" }}</td>
+            <td>{{ data.transTime || '-' }}</td>
+            <td>{{ data.sendTime || '-' }}</td>
+            <td>{{ data.delivererName || "-" }}</td>
             <td>{{ data.checkDept ? data.checkDept.dept : "-" }}</td>
-            <td>{{ data.sendTime || "-" }}</td>
             <td><button (click)="viewSpecimenHistory(data)">查看</button></td>
           </tr>
         </tbody>

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

@@ -26,6 +26,9 @@ export class SpecimenSearchComponent implements OnInit {
   pageIndex: number = 1; //表格当前页码
   pageSize: number = 10; //表格每页展示条数
   listLength: number = 10; //表格总数据量
+  checkOptionsOne: Array<any> = [
+    { label: "服务中心收取", value: "0", checked: false },
+  ];
   changeInpSubject = new Subject();
   ngOnInit() {
     this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
@@ -33,6 +36,11 @@ export class SpecimenSearchComponent implements OnInit {
     });
     this.getAllHospital();
   }
+  // 表格筛选
+  log(value: object[]): void {
+    console.log(value);
+    this.getList(0);
+  }
   // 搜索类型
   isLoading1 = false;
   searchTypes() {
@@ -189,6 +197,7 @@ export class SpecimenSearchComponent implements OnInit {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
       specimen: {
+        receivedMark: this.checkOptionsOne[0].checked ? 1 : undefined,
         hosId: this.searchCriteria.hospital,
         sickRoom: this.searchCriteria.department
           ? {