瀏覽代碼

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

seimin 3 年之前
父節點
當前提交
3f74792aac

+ 7 - 5
src/app/share/appraise-detail/appraise-detail.component.html

@@ -112,13 +112,14 @@
112 112
             <thead>
113 113
               <tr class="thead">
114 114
                 <th nzWidth="50px">序号</th>
115
+                <th nzWidth="95px">检验项目</th>
115 116
                 <th nzWidth="95px">标本类型</th>
116 117
                 <th nzWidth="110px">标本编码</th>
117 118
                 <th nzWidth="88px">患者姓名</th>
118 119
                 <th nzWidth="50px">床号</th>
119 120
                 <th nzWidth="88px">目标科室</th>
120
-                <th nzWidth="75px">是否接收</th>
121
-                <th nzWidth="75px">是否送达</th>
121
+                <!-- <th nzWidth="75px">是否接收</th> -->
122
+                <!-- <th nzWidth="75px">是否送达</th> -->
122 123
                 <th nzWidth="123px">接收扫描时间</th>
123 124
                 <th nzWidth="123px">送达扫描时间</th>
124 125
               </tr>
@@ -126,13 +127,14 @@
126 127
             <tbody *ngIf="orderInfo.workOrderObj.specimenSet">
127 128
               <tr *ngFor="let data of orderInfo.workOrderObj.specimenSet;let i =index;">
128 129
                 <td>{{i+1}}</td>
129
-                <td>{{data.stype.name}}</td>
130
+                <td>{{data.specimenDesc}}</td>
131
+                <td>{{data.stype?data.stype.name:''}}</td>
130 132
                 <td>{{data.scode}}</td>
131 133
                 <td>{{data.patientName}}</td>
132 134
                 <td>{{data.bedNum}}</td>
133 135
                 <td>{{data.checkDept.dept}}</td>
134
-                <td>{{data.received?"是":"否"}}</td>
135
-                <td>{{data.arrived?"是":"否"}}</td>
136
+                <!-- <td>{{data.received?"是":"否"}}</td> -->
137
+                <!-- <td>{{data.arrived?"是":"否"}}</td> -->
136 138
                 <td>{{data.arriveTime|date:'yyyy-MM-dd HH:mm'}}</td>
137 139
                 <td>{{data.sendTime|date:'yyyy-MM-dd HH:mm'}}</td>
138 140
               </tr>

+ 14 - 10
src/app/share/order-detail/order-detail.component.html

@@ -129,13 +129,14 @@
129 129
               <thead>
130 130
                 <tr class="thead">
131 131
                   <th nzWidth="50px">序号</th>
132
+                  <th nzWidth="95px">检验项目</th>
132 133
                   <th nzWidth="95px">标本类型</th>
133 134
                   <th nzWidth="110px">标本编码</th>
134 135
                   <th nzWidth="88px">患者姓名</th>
135 136
                   <th nzWidth="50px">床号</th>
136 137
                   <th nzWidth="88px">目标科室</th>
137
-                  <th nzWidth="75px">是否接收</th>
138
-                  <th nzWidth="75px">是否送达</th>
138
+                  <!-- <th nzWidth="75px">是否接收</th> -->
139
+                  <!-- <th nzWidth="75px">是否送达</th> -->
139 140
                   <th nzWidth="123px">接收扫描时间</th>
140 141
                   <th nzWidth="123px">送达扫描时间</th>
141 142
                 </tr>
@@ -143,13 +144,14 @@
143 144
               <tbody *ngIf="orderInfo.specimenSet">
144 145
                 <tr *ngFor="let data of orderInfo.specimenSet;let i =index;">
145 146
                   <td>{{i+1}}</td>
146
-                  <td>{{data.stype.name}}</td>
147
+                  <td>{{data.specimenDesc}}</td>
148
+                  <td>{{data.stype?data.stype.name:''}}</td>
147 149
                   <td>{{data.scode}}</td>
148 150
                   <td>{{data.patientName}}</td>
149 151
                   <td>{{data.bedNum}}</td>
150 152
                   <td>{{data.checkDept.dept}}</td>
151
-                  <td>{{data.received?"是":"否"}}</td>
152
-                  <td>{{data.arrived?"是":"否"}}</td>
153
+                  <!-- <td>{{data.received?"是":"否"}}</td> -->
154
+                  <!-- <td>{{data.arrived?"是":"否"}}</td> -->
153 155
                   <td>{{data.arriveTime|date:'yyyy-MM-dd HH:mm'}}</td>
154 156
                   <td style="position: relative;">{{data.sendTime|date:'yyyy-MM-dd HH:mm'}}<img *ngIf="data.urgent == 1"
155 157
                       src="../../assets/images/icon_ji.png" alt="" class="ji"></td>
@@ -219,13 +221,14 @@
219 221
               <thead>
220 222
                 <tr class="thead">
221 223
                   <th nzWidth="50px">序号</th>
224
+                  <th nzWidth="95px">检验项目</th>
222 225
                   <th nzWidth="95px">标本类型</th>
223 226
                   <th nzWidth="110px">标本编码</th>
224 227
                   <th nzWidth="88px">患者姓名</th>
225 228
                   <th nzWidth="50px">床号</th>
226 229
                   <th nzWidth="88px">目标科室</th>
227
-                  <th nzWidth="75px">是否接收</th>
228
-                  <th nzWidth="75px">是否送达</th>
230
+                  <!-- <th nzWidth="75px">是否接收</th> -->
231
+                  <!-- <th nzWidth="75px">是否送达</th> -->
229 232
                   <th nzWidth="123px">接收扫描时间</th>
230 233
                   <th nzWidth="123px">送达扫描时间</th>
231 234
                 </tr>
@@ -233,13 +236,14 @@
233 236
               <tbody *ngIf="orderInfo.specimenSet">
234 237
                 <tr *ngFor="let data of orderInfo.specimenSet;let i =index;">
235 238
                   <td>{{i+1}}</td>
236
-                  <td>{{data.stype.name}}</td>
239
+                  <td>{{data.specimenDesc}}</td>
240
+                  <td>{{data.stype?data.stype.name:''}}</td>
237 241
                   <td>{{data.scode}}</td>
238 242
                   <td>{{data.patientName}}</td>
239 243
                   <td>{{data.bedNum}}</td>
240 244
                   <td>{{data.checkDept.dept}}</td>
241
-                  <td>{{data.received?"是":"否"}}</td>
242
-                  <td>{{data.arrived?"是":"否"}}</td>
245
+                  <!-- <td>{{data.received?"是":"否"}}</td> -->
246
+                  <!-- <td>{{data.arrived?"是":"否"}}</td> -->
243 247
                   <td>{{data.arriveTime|date:'yyyy-MM-dd HH:mm'}}</td>
244 248
                   <td style="position: relative;">{{data.sendTime|date:'yyyy-MM-dd HH:mm'}}<img *ngIf="data.urgent == 1"
245 249
                       src="../../assets/images/icon_ji.png" alt="" class="ji"></td>