护士端患者列表暂未开通增加患者其他服务台的条件

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

@@ -23,6 +23,7 @@
           <div nz-col nzSpan="8">陪同情况：{{orderInfo.isAccompany==1?'需要医护陪同':'无需医护陪同'}}</div>
           <div nz-col nzSpan="8">预约时间：{{orderInfo.yyjdTime|date:'MM-dd HH:mm'}}</div>
           <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息：{{orderInfo.worker.name}}</div>
+          <div nz-col nzSpan="8">是否半程陪检：{{orderInfo.isHalfInspect===1?'是':'否'}}</div>
           <div nz-col nzSpan="24" *ngIf="orderInfo.specialCloseReason">
             特殊情况关闭原因：{{orderInfo.specialCloseReason}}
           </div>

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

@@ -392,8 +392,8 @@
               陪同情况：{{orderInfo.isAccompany==1?'需要医护陪同':'无需医护陪同'}}</div>
             <div nz-col nzSpan="6" *ngIf="orderInfo.yyjdTime">
               预约时间：{{orderInfo.yyjdTime|date:'MM-dd HH:mm'}}</div>
-            <div nz-col nzSpan="6" *ngIf="orderInfo.taskType">
-              是否半程陪检：{{orderInfo.taskType.isHalfInspect===1?'是':'否'}}</div>
+            <div nz-col nzSpan="6">
+              是否半程陪检：{{orderInfo.isHalfInspect===1?'是':'否'}}</div>
           </div>
           <div class="info" nz-row *ngIf="orderInfo.urgentDetails">
             <div nz-col nzSpan="24" class="jiaji">加急原因：{{orderInfo.urgentDetails.urgentReason}}</div>

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

@@ -108,7 +108,7 @@
                   <span class="left mr8"><label nz-checkbox [ngModel]="data.checked"
                       (ngModelChange)="batchDispatchSelect($event,data.id)"></label></span>
                   <span class="left gongdan_name" nz-tooltip
-                    [nzTooltipTitle]="data.taskType.taskName+'('+data.gdcode+')'">{{data.taskType.isHalfInspect ===
+                    [nzTooltipTitle]="data.taskType.taskName+'('+data.gdcode+')'">{{data.isHalfInspect ===
                     1?'半程陪检':data.taskType.taskName}}({{data.gdcode}})</span>
                   <span>{{data.worker?data.worker.name:''}}</span>
                   <span class="right">
@@ -274,7 +274,7 @@
                   <span class="left mr8"><label nz-checkbox [ngModel]="data.checked"
                       (ngModelChange)="batchWithdrawalSelect($event,data.id)"></label></span>
                   <span class="left gongdan_name" nz-tooltip
-                    [nzTooltipTitle]="data.taskType.taskName+'('+data.gdcode+')'">{{data.taskType.isHalfInspect ===
+                    [nzTooltipTitle]="data.taskType.taskName+'('+data.gdcode+')'">{{data.isHalfInspect ===
                     1?'半程陪检':data.taskType.taskName}}({{data.gdcode}})</span>
                   <span>{{data.worker?data.worker.name:''}}</span>
                   <span class="right">
@@ -438,7 +438,7 @@
                 <!-- 工单 -->
                 <div class="gongdan">
                   <span class="left gongdan_name" nz-tooltip
-                    [nzTooltipTitle]="data.taskType.taskName+'('+data.gdcode+')'">{{data.taskType.isHalfInspect ===
+                    [nzTooltipTitle]="data.taskType.taskName+'('+data.gdcode+')'">{{data.isHalfInspect ===
                     1?'半程陪检':data.taskType.taskName}}({{data.gdcode}})</span>
                   <span>{{data.worker?data.worker.name:''}}</span>
                   <span class="right">

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

@@ -8,7 +8,7 @@
         </div>
       </div>
       <div class="notAvailable display_flex align-items_center justify-content_flex-center"
-        *ngIf="!deptTaskTypeRules.openInspection">
+        *ngIf="!deptTaskTypeRules.openInspection&&!deptTaskTypeRules.openPatientTransport">
         <div>
           <img src="../../assets/images/icon_jianchakong.png" alt="">
           <div>暂未开通</div>
@@ -25,7 +25,7 @@
         <div class="checkedInfo patient" style="padding-bottom:0;">
           <overlay-scrollbars #osComponentRef4 class="box">
             <div class="loading display_flex align-items_center justify-content_flex-center"
-              *ngIf="pLoading&&deptTaskTypeRules.openInspection">
+              *ngIf="pLoading&&(deptTaskTypeRules.openInspection||deptTaskTypeRules.openPatientTransport)">
               <div>
                 <img src="../../assets/images/loading.gif" alt="">
                 <div>加载中...</div>
@@ -649,7 +649,7 @@
                         <div class="info">
                           <div class="row" nz-row>
                             <div nz-col nzSpan="12" class="col txtL">
-                              {{item.taskType.isHalfInspect ===
+                              {{item.isHalfInspect ===
                               1?'半程陪检':item.taskType.taskName}}
                               <span
                                 *ngIf="item.patient&&(item.taskType.associationType.value=='patientTransport'||item.taskType.associationType.value=='inspect')">

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -630,8 +630,11 @@ export class HushijiandanComponent implements OnInit {
         if (search === undefined) {
           that.deptTaskTypeRules = data.data;
           that.getOrderList();
-          if (that.deptTaskTypeRules.openInspection) {
-            // 陪检权限
+          if (
+            that.deptTaskTypeRules.openInspection ||
+            that.deptTaskTypeRules.openPatientTransport
+          ) {
+            // 陪检权限或转科权限
             if (this.tabFlag) {
               this.tabFlag = false;
               this.getTaskTypeByInspection().subscribe((result) => {
@@ -992,13 +995,24 @@ export class HushijiandanComponent implements OnInit {
       .postCustom("configuration", "deptTSPTaskType", {})
       .subscribe((data) => {
         that.checkTypeLis = data.data;
-        // 默认选中患者陪检
-        that.checkTypeLis.forEach((e) => {
-          if (e.associationType.value == "inspect") {
-            that.patientForm.controls.checkedType.setValue(e.id);
-            that.patientForm.value.checkedType = e.id;
+        // 默认选中患者陪检,没有患者陪检，则选择第一个患者其他服务的任务类型
+        for (let i = 0; i < that.checkTypeLis.length; i++) {
+          if (that.checkTypeLis[i].associationType.value == "inspect") {
+            that.patientForm.controls.checkedType.setValue(
+              that.checkTypeLis[i].id
+            );
+            that.patientForm.value.checkedType = that.checkTypeLis[i].id;
+            break;
+          } else if (
+            that.checkTypeLis[i].associationType.value == "patientTransport"
+          ) {
+            that.patientForm.controls.checkedType.setValue(
+              that.checkTypeLis[i].id
+            );
+            that.patientForm.value.checkedType = that.checkTypeLis[i].id;
+            break;
           }
-        });
+        }
         this.changeCheckedType();
       });
   }