Procházet zdrojové kódy

陪检人员和陪检人数显示

seimin před 2 roky
rodič
revize
4d14c8e8fb

+ 6 - 2
src/app/share/detail-patients/detail-patients.component.html

@@ -30,8 +30,12 @@
30 30
           <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息:{{orderInfo.worker.name}}</div>
31 31
           <div nz-col nzSpan="8" *ngIf="orderInfo.taskType.associationType.value==='inspect'">
32 32
             是否半程陪检:{{orderInfo.isHalfInspect===1?'是':'否'}}</div>
33
-          <div nz-col nzSpan="8" *ngIf="orderInfo.taskType.associationType.value==='inspect' || orderInfo.taskType.associationType.value==='patientTransport'">
34
-            陪检方式:{{orderInfo.inspectScore ? orderInfo.inspectScore.inspectMode : ""}}</div>
33
+          <div nz-col nzSpan="8" *ngIf="(orderInfo.taskType.associationType.value==='inspect' || orderInfo.taskType.associationType.value==='patientTransport') && orderInfo.inspectScore">
34
+            陪检方式:{{orderInfo.inspectScore.inspectMode}}</div>
35
+          <div nz-col nzSpan="8" *ngIf="(orderInfo.taskType.associationType.value==='inspect' || orderInfo.taskType.associationType.value==='patientTransport') && orderInfo.inspectUsers">
36
+            陪检人员:{{orderInfo.inspectUsers}}</div>
37
+          <div nz-col nzSpan="8" *ngIf="(orderInfo.taskType.associationType.value==='inspect' || orderInfo.taskType.associationType.value==='patientTransport') && orderInfo.inspectUsersNum">
38
+            陪检人数:{{orderInfo.inspectUsersNum}}</div>
35 39
           <div nz-col nzSpan="24" *ngIf="orderInfo.specialCloseReason">
36 40
             特殊情况关闭原因:{{orderInfo.specialCloseReason}}
37 41
           </div>

+ 16 - 2
src/app/share/order-detail/order-detail.component.html

@@ -770,9 +770,23 @@
770 770
             <div
771 771
               nz-col
772 772
               nzSpan="6"
773
-              *ngIf="orderInfo.taskType.associationType.value == 'inspect' || orderInfo.taskType.associationType.value == 'patientTransport'"
773
+              *ngIf="(orderInfo.taskType.associationType.value == 'inspect' || orderInfo.taskType.associationType.value == 'patientTransport') && orderInfo.inspectScore"
774 774
             >
775
-              陪检方式:{{ orderInfo.inspectScore ? orderInfo.inspectScore.inspectMode : "" }}
775
+              陪检方式:{{ orderInfo.inspectScore.inspectMode }}
776
+            </div>
777
+            <div
778
+              nz-col
779
+              nzSpan="6"
780
+              *ngIf="(orderInfo.taskType.associationType.value == 'inspect' || orderInfo.taskType.associationType.value == 'patientTransport') && orderInfo.inspectUsers"
781
+            >
782
+              陪检人员:{{ orderInfo.inspectUsers }}
783
+            </div>
784
+            <div
785
+              nz-col
786
+              nzSpan="6"
787
+              *ngIf="(orderInfo.taskType.associationType.value == 'inspect' || orderInfo.taskType.associationType.value == 'patientTransport') && orderInfo.inspectUsersNum"
788
+            >
789
+              陪检人数:{{ orderInfo.inspectUsersNum }}
776 790
             </div>
777 791
           </div>
778 792
           <div class="info" nz-row *ngIf="orderInfo.urgentDetails">