上班状态

src/app/share/allocation-worker/allocation-worker.component.html

@@ -36,7 +36,7 @@
               <td nzAlign="center">{{ data.name }}</td>
               <td nzAlign="center" *ngIf="workerDispatchUserList === 'dynamic'">{{ data.groupDTO?.groupName }}</td>
               <td nzAlign="center" *ngIf="workerDispatchUserList === 'dynamic'">{{ data.totalCount }}</td>
-              <td nzAlign="center" *ngIf="workerDispatchUserList === 'dynamic'" [ngClass]="{red: !data.freetime, green: data.freetime}">{{ data.freetime || '忙碌中' }}</td>
+              <td nzAlign="center" *ngIf="workerDispatchUserList === 'dynamic'" [ngClass]="{red: data.workStateRemark ? true : !data.freetime, green: !data.workStateRemark && data.freetime}">{{ data.workStateRemark ? '示忙-' + data.workStateRemark : (data.freetime || '忙碌中') }}</td>
             </tr>
           </tbody>
         </nz-table>

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

@@ -1660,14 +1660,14 @@
                           <td>{{ item.surgeryName }}</td>
                           <td>{{ item.state?.name }}</td>
                           <td>
-                            <!-- 手术状态是【手术安排】，并且【是否开启手术即将开始通知】开启 -->
-                            <button class="mr8" (click)="surgeryBegin($event, item)" *ngIf="item.state && item.state.value == 3 && surgeryConfigs.surgeryBegin == 1">即将开始</button>
+                            <!-- 手术状态是【手术安排】和【接患者中】，并且【是否开启手术即将开始通知】开启 -->
+                            <button class="mr8 mb8" (click)="surgeryBegin($event, item)" *ngIf="item.state && (item.state.value == 3 || item.state.value == 7) && surgeryConfigs.surgeryBegin == 1">即将开始</button>
                             <!-- 【是否开启手术即将开始通知】开启 -->
-                            <button class="mr8" (click)="pickUpPatient($event, item)" *ngIf="item.state && item.state.value == 3">一键接患者</button>
+                            <button class="mr8 mb8" (click)="pickUpPatient($event, item)" *ngIf="item.state && item.state.value == 3">一键接患者</button>
                             <!-- 手术状态是【手术中】，并且【是否开通送回病房】开启 -->
-                            <button class="mr8" (click)="sendWard($event, item)" *ngIf="item.patientDTO && surgeryConfigs && surgeryConfigs.remandClinical == 1 && item.state && item.state.value == 8">送回病房</button>
+                            <button class="mr8 mb8" (click)="sendWard($event, item)" *ngIf="item.patientDTO && surgeryConfigs && surgeryConfigs.remandClinical == 1 && item.state && item.state.value == 8">送回病房</button>
                             <!-- 手术状态是【手术中】，并且【是否开通送回苏醒室】开启 -->
-                            <button class="mr8" (click)="sendAwakeningRoom($event, item)" *ngIf="item.patientDTO && surgeryConfigs && surgeryConfigs.remandRecovery == 1 && item.state && item.state.value == 8">送回苏醒间</button>
+                            <button class="mr8 mb8" (click)="sendAwakeningRoom($event, item)" *ngIf="item.patientDTO && surgeryConfigs && surgeryConfigs.remandRecovery == 1 && item.state && item.state.value == 8">送回苏醒间</button>
                           </td>
                         </tr>
                       </tbody>

src/app/views/work-assignment/work-assignment.component.ts

@@ -252,7 +252,7 @@ export class WorkAssignmentComponent implements OnInit {
     }
     // 示忙原因
     this.busyList.forEach(v => {
-      if(v.busyContent.trim()){
+      if(v.busyContent && v.busyContent.trim()){
         data.workScheme['busyContent' + v.id] = v.busyContent.trim();
         data.workScheme['busyMinute' + v.id] = v.busyMinute;
       }