修改

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

@@ -317,7 +317,6 @@
                       class="ji"
                     />
                   </td>
-                  <!-- <td style="position: relative;">{{data.sendTime|date:'yyyy-MM-dd HH:mm'}}</td> -->
                 </tr>
               </tbody>
             </nz-table>
@@ -433,6 +432,16 @@
           </div>
         </div>
         <div class="bottom">
+          <div class="amplification">
+            <button
+              nz-button
+              nzType="primary"
+              class="btn default"
+              (click)="amplification()"
+            >
+              {{ amplificationShow ? "放大" : "还原" }}
+            </button>
+          </div>
           <div class="table">
             <nz-table
               [nzData]="orderInfo.specimenSet"
@@ -441,42 +450,44 @@
             >
               <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> -->
+                  <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.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>{{ data.checkDept.dept }}</td>
-                  <!-- <td>{{data.received?"是":"否"}}</td> -->
-                  <!-- <td>{{data.arrived?"是":"否"}}</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.arriveTime | date: "MM-dd HH:mm"
-                    }}<img
+                    {{ data.checkDept ? data.checkDept.dept : "-" }}
+                    <img
                       *ngIf="data.urgent == 1"
                       src="../../assets/images/icon_ji.png"
                       alt=""
                       class="ji"
                     />
                   </td>
-                  <!-- <td style="position: relative;">{{data.sendTime|date:'yyyy-MM-dd HH:mm'}}</td> -->
                 </tr>
               </tbody>
             </nz-table>
@@ -592,6 +603,16 @@
           </div>
         </div>
         <div class="bottom">
+          <div class="amplification">
+            <button
+              nz-button
+              nzType="primary"
+              class="btn default"
+              (click)="amplification()"
+            >
+              {{ amplificationShow ? "放大" : "还原" }}
+            </button>
+          </div>
           <div class="table">
             <!-- 静配 -->
             <nz-table
@@ -795,6 +816,16 @@
           </div>
         </div>
         <div class="bottom">
+          <div class="amplification">
+            <button
+              nz-button
+              nzType="primary"
+              class="btn default"
+              (click)="amplification()"
+            >
+              {{ amplificationShow ? "放大" : "还原" }}
+            </button>
+          </div>
           <div class="info">
             <div nz-row class="top">
               <div class="left" nz-col nzSpan="12">