服务台患者陪检和转运工单添加患者和住院号

src/app/views/fuwutai/fuwutai.component.html

@@ -209,28 +209,15 @@
                       (ngModelChange)="batchDispatchSelect($event, data.id)"
                     ></label
                   ></span>
-                  <span
-                    class="left gongdan_name"
-                    nz-tooltip
-                    [nzTooltipTitle]="
-                      data.taskType.taskName + (data.goodsRemark?'-'+data.goodsRemark:'')+'(' + data.gdcode + ')'
-                    "
-                    >{{
-                      data.isHalfInspect === 1
-                        ? "半程陪检"
-                        : data.taskType.taskName
-                    }}<ng-container *ngIf="data.goodsRemark">-{{data.goodsRemark}}</ng-container>({{ data.gdcode }})</span
-                  >
-                  <span
-                    nz-tooltip
-                    [nzTooltipTitle]="data.worker ? data.worker.phone : ''"
-                    >{{ data.worker ? data.worker.name : "" }}</span
-                  >
-                  <span class="right">
-                    <span [ngClass]="{ colorRed: data.timeOut == true }">{{
-                      data.gdState.name
-                    }}</span>
+                  <span class="left gongdan_name" nz-tooltip [nzTooltipTitle]="data.taskType.taskName + (data.goodsRemark?'-'+data.goodsRemark:'')+'(' + data.gdcode + ')'">
+                    {{ data.isHalfInspect === 1 ? "半程陪检" : data.taskType.taskName }}<ng-container *ngIf="data.goodsRemark">-{{data.goodsRemark}}</ng-container>({{ data.gdcode }})
                   </span>
+                  <div class="right_all">
+                    <span nz-tooltip [nzTooltipTitle]="data.worker ? data.worker.phone : ''" class="right_all_name">{{ data.worker ? data.worker.name : "" }}</span>
+                    <span class="right">
+                      <span [ngClass]="{ colorRed: data.timeOut == true }">{{ data.gdState.name }}</span>
+                    </span>
+                  </div>
                 </div>
                 <!-- 地点 -->
                 <div
@@ -330,6 +317,7 @@
                         nzTooltipTitle="三级护理"
                       ></i>
                     </ng-container>
+                    <span nz-tooltip nzTooltipTitle="患者姓名（住院号）" *ngIf="data.taskType.associationType.value == 'patientTransport' || data.taskType.associationType.value == 'inspect'">{{ data.patient.patientName }}<span *ngIf="data.patient.residenceNo">（{{ data.patient.residenceNo }}）</span></span>
                     <!-- <span>总时长{{formatTime(data.expectTimeNum/1000)}}</span> -->
                   </span>
                   <span
@@ -395,6 +383,7 @@
                         nzTooltipTitle="三级护理"
                       ></i>
                     </ng-container>
+                    <span nz-tooltip nzTooltipTitle="患者姓名（住院号）" *ngIf="data.taskType.associationType.value == 'patientTransport' || data.taskType.associationType.value == 'inspect'">{{ data.patient.patientName }}<span *ngIf="data.patient.residenceNo">（{{ data.patient.residenceNo }}）</span></span>
                     <!-- <span>已超时{{formatTime(data.timeOutLength/1000)}}</span> -->
                   </span>
                   <span
@@ -628,28 +617,15 @@
                       (ngModelChange)="batchWithdrawalSelect($event, data.id)"
                     ></label
                   ></span>
-                  <span
-                    class="left gongdan_name"
-                    nz-tooltip
-                    [nzTooltipTitle]="
-                      data.taskType.taskName + (data.goodsRemark?'-'+data.goodsRemark:'')+'(' + data.gdcode + ')'
-                    "
-                    >{{
-                      data.isHalfInspect === 1
-                        ? "半程陪检"
-                        : data.taskType.taskName
-                    }}<ng-container *ngIf="data.goodsRemark">-{{data.goodsRemark}}</ng-container>({{ data.gdcode }})</span
-                  >
-                  <span
-                    nz-tooltip
-                    [nzTooltipTitle]="data.worker ? data.worker.phone : ''"
-                    >{{ data.worker ? data.worker.name : "" }}</span
-                  >
-                  <span class="right">
-                    <span [ngClass]="{ colorRed: data.timeOut == true }">{{
-                      data.gdState.name
-                    }}</span>
+                  <span class="left gongdan_name" nz-tooltip [nzTooltipTitle]="data.taskType.taskName + (data.goodsRemark?'-'+data.goodsRemark:'')+'(' + data.gdcode + ')'">
+                    {{ data.isHalfInspect === 1 ? "半程陪检" : data.taskType.taskName }}<ng-container *ngIf="data.goodsRemark">-{{data.goodsRemark}}</ng-container>({{ data.gdcode }})
                   </span>
+                  <div class="right_all">
+                    <span nz-tooltip [nzTooltipTitle]="data.worker ? data.worker.phone : ''" class="right_all_name">{{ data.worker ? data.worker.name : "" }}</span>
+                    <span class="right">
+                      <span [ngClass]="{ colorRed: data.timeOut == true }">{{ data.gdState.name }}</span>
+                    </span>
+                  </div>
                 </div>
                 <!-- 地点 -->
                 <div
@@ -758,6 +734,7 @@
                         nzTooltipTitle="三级护理"
                       ></i>
                     </ng-container>
+                    <span nz-tooltip nzTooltipTitle="患者姓名（住院号）" *ngIf="data.taskType.associationType.value == 'patientTransport' || data.taskType.associationType.value == 'inspect'">{{ data.patient.patientName }}<span *ngIf="data.patient.residenceNo">（{{ data.patient.residenceNo }}）</span></span>
                     <!-- <span>总时长{{formatTime(data.expectTimeNum/1000)}}</span> -->
                   </span>
                   <span
@@ -823,6 +800,7 @@
                         nzTooltipTitle="三级护理"
                       ></i>
                     </ng-container>
+                    <span nz-tooltip nzTooltipTitle="患者姓名（住院号）" *ngIf="data.taskType.associationType.value == 'patientTransport' || data.taskType.associationType.value == 'inspect'">{{ data.patient.patientName }}<span *ngIf="data.patient.residenceNo">（{{ data.patient.residenceNo }}）</span></span>
                     <!-- <span>已超时{{formatTime(data.timeOutLength/1000)}}</span> -->
                   </span>
                   <span
@@ -1033,28 +1011,15 @@
               >
                 <!-- 工单 -->
                 <div class="gongdan">
-                  <span
-                    class="left gongdan_name"
-                    nz-tooltip
-                    [nzTooltipTitle]="
-                      data.taskType.taskName + (data.goodsRemark?'-'+data.goodsRemark:'')+'(' + data.gdcode + ')'
-                    "
-                    >{{
-                      data.isHalfInspect === 1
-                        ? "半程陪检"
-                        : data.taskType.taskName
-                    }}<ng-container *ngIf="data.goodsRemark">-{{data.goodsRemark}}</ng-container>({{ data.gdcode }})</span
-                  >
-                  <span
-                    nz-tooltip
-                    [nzTooltipTitle]="data.worker ? data.worker.phone : ''"
-                    >{{ data.worker ? data.worker.name : "" }}</span
-                  >
-                  <span class="right">
-                    <span [ngClass]="{ colorRed: data.timeOut == true }">{{
-                      data.gdState.name
-                    }}</span>
+                  <span class="left gongdan_name" nz-tooltip [nzTooltipTitle]="data.taskType.taskName + (data.goodsRemark?'-'+data.goodsRemark:'')+'(' + data.gdcode + ')'">
+                    {{ data.isHalfInspect === 1 ? "半程陪检" : data.taskType.taskName }}<ng-container *ngIf="data.goodsRemark">-{{data.goodsRemark}}</ng-container>({{ data.gdcode }})
                   </span>
+                  <div class="right_all">
+                    <span nz-tooltip [nzTooltipTitle]="data.worker ? data.worker.phone : ''" class="right_all_name">{{ data.worker ? data.worker.name : "" }}</span>
+                    <span class="right">
+                      <span [ngClass]="{ colorRed: data.timeOut == true }">{{ data.gdState.name }}</span>
+                    </span>
+                  </div>
                 </div>
                 <!-- 地点 -->
                 <div class="didian">
@@ -1150,6 +1115,7 @@
                         nzTooltipTitle="三级护理"
                       ></i>
                     </ng-container>
+                    <span nz-tooltip nzTooltipTitle="患者姓名（住院号）" *ngIf="data.taskType.associationType.value == 'patientTransport' || data.taskType.associationType.value == 'inspect'">{{ data.patient.patientName }}<span *ngIf="data.patient.residenceNo">（{{ data.patient.residenceNo }}）</span></span>
                     <!-- <span>总时长{{formatTime(data.expectTimeNum/1000)}}</span> -->
                   </span>
                   <span
@@ -1215,6 +1181,7 @@
                         nzTooltipTitle="三级护理"
                       ></i>
                     </ng-container>
+                    <span nz-tooltip nzTooltipTitle="患者姓名（住院号）" *ngIf="data.taskType.associationType.value == 'patientTransport' || data.taskType.associationType.value == 'inspect'">{{ data.patient.patientName }}<span *ngIf="data.patient.residenceNo">（{{ data.patient.residenceNo }}）</span></span>
                     <!-- <span>已超时{{formatTime(data.timeOutLength/1000)}}</span> -->
                   </span>
                   <span
@@ -2770,6 +2737,7 @@
                             nzTooltipTitle="三级护理"
                           ></i>
                         </ng-container>
+                        <span nz-tooltip nzTooltipTitle="患者姓名（住院号）" *ngIf="data.taskType.associationType.value == 'patientTransport' || data.taskType.associationType.value == 'inspect'">{{ data.patient.patientName }}<span *ngIf="data.patient.residenceNo">（{{ data.patient.residenceNo }}）</span></span>
                         <!-- <span>总时长{{formatTime(data.expectTimeNum/1000)}}</span> -->
                       </span>
                       <span
@@ -2837,6 +2805,7 @@
                             nzTooltipTitle="三级护理"
                           ></i>
                         </ng-container>
+                        <span nz-tooltip nzTooltipTitle="患者姓名（住院号）" *ngIf="data.taskType.associationType.value == 'patientTransport' || data.taskType.associationType.value == 'inspect'">{{ data.patient.patientName }}<span *ngIf="data.patient.residenceNo">（{{ data.patient.residenceNo }}）</span></span>
                         <!-- <span>已超时{{formatTime(data.timeOutLength/1000)}}</span> -->
                       </span>
                       <span

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

@@ -15,6 +15,13 @@
   width: 100%;
   position: relative;
   background: #f9fafb;
+  .right_all{
+    display: flex;
+    justify-content: flex-end;
+    .right_all_name{
+      margin-right: 42px;
+    }
+  }
   #top{
     display: flex;
     flex-direction: column;

src/app/views/hushijiandan/hushijiandan.component.html

@@ -1388,7 +1388,7 @@
                           <td>{{ data.patientName || "-" }}</td>
                           <td>{{ data.bedNum || "-" }}</td>
                           <td>{{ data.arriveTime || "-" }}</td>
-                          <td>{{ data.worker || "-" }}</td>
+                          <td>{{ data.receiverName || "-" }}</td>
                           <td>
                             {{
                               data.checkDept

src/main.ts

@@ -8,7 +8,7 @@ if (environment.production) {
   enableProdMode();
   if (window) {
     window.console.log = function () { };
-    console.info('v2.4.19');
+    console.info('v2.4.20');
   }
 }
 platformBrowserDynamic().bootstrapModule(AppModule)