工单详情标本字段展示修改

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

@@ -112,13 +112,14 @@
             <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="50px">床号</th>
                 <th nzWidth="88px">目标科室</th>
-                <th nzWidth="75px">是否接收</th>
-                <th nzWidth="75px">是否送达</th>
+                <!-- <th nzWidth="75px">是否接收</th> -->
+                <!-- <th nzWidth="75px">是否送达</th> -->
                 <th nzWidth="123px">接收扫描时间</th>
                 <th nzWidth="123px">送达扫描时间</th>
               </tr>
@@ -126,13 +127,14 @@
             <tbody *ngIf="orderInfo.workOrderObj.specimenSet">
               <tr *ngFor="let data of orderInfo.workOrderObj.specimenSet;let i =index;">
                 <td>{{i+1}}</td>
-                <td>{{data.stype.name}}</td>
+                <td>{{data.specimenDesc}}</td>
+                <td>{{data.stype?data.stype.name:''}}</td>
                 <td>{{data.scode}}</td>
                 <td>{{data.patientName}}</td>
                 <td>{{data.bedNum}}</td>
                 <td>{{data.checkDept.dept}}</td>
-                <td>{{data.received?"是":"否"}}</td>
-                <td>{{data.arrived?"是":"否"}}</td>
+                <!-- <td>{{data.received?"是":"否"}}</td> -->
+                <!-- <td>{{data.arrived?"是":"否"}}</td> -->
                 <td>{{data.arriveTime|date:'yyyy-MM-dd HH:mm'}}</td>
                 <td>{{data.sendTime|date:'yyyy-MM-dd HH:mm'}}</td>
               </tr>

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

@@ -129,13 +129,14 @@
               <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="50px">床号</th>
                   <th nzWidth="88px">目标科室</th>
-                  <th nzWidth="75px">是否接收</th>
-                  <th nzWidth="75px">是否送达</th>
+                  <!-- <th nzWidth="75px">是否接收</th> -->
+                  <!-- <th nzWidth="75px">是否送达</th> -->
                   <th nzWidth="123px">接收扫描时间</th>
                   <th nzWidth="123px">送达扫描时间</th>
                 </tr>
@@ -143,13 +144,14 @@
               <tbody *ngIf="orderInfo.specimenSet">
                 <tr *ngFor="let data of orderInfo.specimenSet;let i =index;">
                   <td>{{i+1}}</td>
-                  <td>{{data.stype.name}}</td>
+                  <td>{{data.specimenDesc}}</td>
+                  <td>{{data.stype?data.stype.name:''}}</td>
                   <td>{{data.scode}}</td>
                   <td>{{data.patientName}}</td>
                   <td>{{data.bedNum}}</td>
                   <td>{{data.checkDept.dept}}</td>
-                  <td>{{data.received?"是":"否"}}</td>
-                  <td>{{data.arrived?"是":"否"}}</td>
+                  <!-- <td>{{data.received?"是":"否"}}</td> -->
+                  <!-- <td>{{data.arrived?"是":"否"}}</td> -->
                   <td>{{data.arriveTime|date:'yyyy-MM-dd HH:mm'}}</td>
                   <td style="position: relative;">{{data.sendTime|date:'yyyy-MM-dd HH:mm'}}<img *ngIf="data.urgent == 1"
                       src="../../assets/images/icon_ji.png" alt="" class="ji"></td>
@@ -219,13 +221,14 @@
               <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="50px">床号</th>
                   <th nzWidth="88px">目标科室</th>
-                  <th nzWidth="75px">是否接收</th>
-                  <th nzWidth="75px">是否送达</th>
+                  <!-- <th nzWidth="75px">是否接收</th> -->
+                  <!-- <th nzWidth="75px">是否送达</th> -->
                   <th nzWidth="123px">接收扫描时间</th>
                   <th nzWidth="123px">送达扫描时间</th>
                 </tr>
@@ -233,13 +236,14 @@
               <tbody *ngIf="orderInfo.specimenSet">
                 <tr *ngFor="let data of orderInfo.specimenSet;let i =index;">
                   <td>{{i+1}}</td>
-                  <td>{{data.stype.name}}</td>
+                  <td>{{data.specimenDesc}}</td>
+                  <td>{{data.stype?data.stype.name:''}}</td>
                   <td>{{data.scode}}</td>
                   <td>{{data.patientName}}</td>
                   <td>{{data.bedNum}}</td>
                   <td>{{data.checkDept.dept}}</td>
-                  <td>{{data.received?"是":"否"}}</td>
-                  <td>{{data.arrived?"是":"否"}}</td>
+                  <!-- <td>{{data.received?"是":"否"}}</td> -->
+                  <!-- <td>{{data.arrived?"是":"否"}}</td> -->
                   <td>{{data.arriveTime|date:'yyyy-MM-dd HH:mm'}}</td>
                   <td style="position: relative;">{{data.sendTime|date:'yyyy-MM-dd HH:mm'}}<img *ngIf="data.urgent == 1"
                       src="../../assets/images/icon_ji.png" alt="" class="ji"></td>