Browse Source

标本详情添加起点科室

seimin 2 years ago
parent
commit
af90cb8b64

+ 3 - 0
src/app/share/detail-drug/detail-drug.component.html

@@ -16,6 +16,9 @@
16
             申请科室:{{orderInfo.createDeptDTO?(!showCoop&&deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'-'}}
16
             申请科室:{{orderInfo.createDeptDTO?(!showCoop&&deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'-'}}
17
           </div>
17
           </div>
18
           <div nz-col nzSpan="8">
18
           <div nz-col nzSpan="8">
19
+            起点科室:{{orderInfo.startDept?(!showCoop&&deptDisplay==2?orderInfo.startDept.deptalias:orderInfo.startDept.dept):'-'}}
20
+          </div>
21
+          <div nz-col nzSpan="8">
19
             目标科室:{{(orderInfo.endDepts&&orderInfo.endDepts[0])?(!showCoop&&deptDisplay==2?orderInfo.endDepts[0].deptalias:orderInfo.endDepts[0].dept):''}}
22
             目标科室:{{(orderInfo.endDepts&&orderInfo.endDepts[0])?(!showCoop&&deptDisplay==2?orderInfo.endDepts[0].deptalias:orderInfo.endDepts[0].dept):''}}
20
           </div>
23
           </div>
21
           <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息:{{orderInfo.worker.name}}</div>
24
           <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息:{{orderInfo.worker.name}}</div>

+ 3 - 0
src/app/share/detail-others/detail-others.component.html

@@ -15,6 +15,9 @@
15
           <div nz-col nzSpan="8">
15
           <div nz-col nzSpan="8">
16
             申请科室:{{orderInfo.createDeptDTO?(!showCoop&&deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'-'}}
16
             申请科室:{{orderInfo.createDeptDTO?(!showCoop&&deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'-'}}
17
           </div>
17
           </div>
18
+          <div nz-col nzSpan="8">
19
+            起点科室:{{orderInfo.startDept?(!showCoop&&deptDisplay==2?orderInfo.startDept.deptalias:orderInfo.startDept.dept):'-'}}
20
+          </div>
18
           <div nz-col nzSpan="8">目标科室:{{endDepts}}</div>
21
           <div nz-col nzSpan="8">目标科室:{{endDepts}}</div>
19
           <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息:{{orderInfo.worker.name}}</div>
22
           <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息:{{orderInfo.worker.name}}</div>
20
           <div nz-col nzSpan="24" *ngIf="orderInfo.workOrderRemark">备注信息:{{orderInfo.workOrderRemark}}
23
           <div nz-col nzSpan="24" *ngIf="orderInfo.workOrderRemark">备注信息:{{orderInfo.workOrderRemark}}

+ 3 - 0
src/app/share/detail-patients/detail-patients.component.html

@@ -15,6 +15,9 @@
15
           <div nz-col nzSpan="8">
15
           <div nz-col nzSpan="8">
16
             申请科室:{{orderInfo.createDeptDTO?(!showCoop&&deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'-'}}
16
             申请科室:{{orderInfo.createDeptDTO?(!showCoop&&deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'-'}}
17
           </div>
17
           </div>
18
+          <div nz-col nzSpan="8">
19
+            起点科室:{{orderInfo.startDept?(!showCoop&&deptDisplay==2?orderInfo.startDept.deptalias:orderInfo.startDept.dept):'-'}}
20
+          </div>
18
           <div nz-col nzSpan="8" *ngIf="middleDept.length>0">中间科室:{{middleDept.join(',')}}</div>
21
           <div nz-col nzSpan="8" *ngIf="middleDept.length>0">中间科室:{{middleDept.join(',')}}</div>
19
           <div nz-col nzSpan="8">目标科室:
22
           <div nz-col nzSpan="8">目标科室:
20
             <span *ngFor="let dep of orderInfo.endDepts;let i=index;">
23
             <span *ngFor="let dep of orderInfo.endDepts;let i=index;">

+ 3 - 3
src/app/share/detail-sample/detail-sample.component.html

@@ -12,13 +12,13 @@
12
           <div nz-col nzSpan="8">工单日期:{{orderInfo.startTime}}</div>
12
           <div nz-col nzSpan="8">工单日期:{{orderInfo.startTime}}</div>
13
           <div nz-col nzSpan="8">总耗时:{{orderInfo.showTimeNum}}</div>
13
           <div nz-col nzSpan="8">总耗时:{{orderInfo.showTimeNum}}</div>
14
           <div nz-col nzSpan="8">申请类型:{{orderInfo.taskType.taskName}}<ng-container *ngIf="orderInfo.goodsRemark">-{{orderInfo.goodsRemark}}</ng-container></div>
14
           <div nz-col nzSpan="8">申请类型:{{orderInfo.taskType.taskName}}<ng-container *ngIf="orderInfo.goodsRemark">-{{orderInfo.goodsRemark}}</ng-container></div>
15
-          <div nz-col nzSpan="8">预计接收:{{orderInfo.expectReceiveNum?orderInfo.expectReceiveNum:''}}</div>
16
-
17
           <div nz-col nzSpan="8">
15
           <div nz-col nzSpan="8">
18
             申请科室:{{orderInfo.createDeptDTO?(!showCoop&&deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'-'}}
16
             申请科室:{{orderInfo.createDeptDTO?(!showCoop&&deptDisplay==2?orderInfo.createDeptDTO.deptalias:orderInfo.createDeptDTO.dept):'-'}}
19
           </div>
17
           </div>
18
+          <div nz-col nzSpan="8">起点科室:{{orderInfo.startDept?(!showCoop&&deptDisplay==2?orderInfo.startDept.deptalias:orderInfo.startDept.dept):''}}</div>
20
           <div nz-col nzSpan="8">目标科室:{{endDepts}}</div>
19
           <div nz-col nzSpan="8">目标科室:{{endDepts}}</div>
21
           <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息:{{orderInfo.worker.name}}</div>
20
           <div nz-col nzSpan="8" *ngIf="orderInfo.worker">支助人员信息:{{orderInfo.worker.name}}</div>
21
+          <div nz-col nzSpan="8">预计接收:{{orderInfo.expectReceiveNum?orderInfo.expectReceiveNum:''}}</div>
22
           <div nz-col nzSpan="8">实际接收:{{orderInfo.actualReceiveNum?orderInfo.actualReceiveNum:''}}</div>
22
           <div nz-col nzSpan="8">实际接收:{{orderInfo.actualReceiveNum?orderInfo.actualReceiveNum:''}}</div>
23
           <div nz-col nzSpan="24" *ngIf="orderInfo.workOrderRemark">备注信息:{{orderInfo.workOrderRemark}}
23
           <div nz-col nzSpan="24" *ngIf="orderInfo.workOrderRemark">备注信息:{{orderInfo.workOrderRemark}}
24
           </div>
24
           </div>
@@ -66,7 +66,7 @@
66
             </button>
66
             </button>
67
           </div>
67
           </div>
68
         </div>
68
         </div>
69
-        
69
+
70
         <div class="table">
70
         <div class="table">
71
           <nz-table class="detailSampleTable" [nzData]="orderInfo.specimenSet" nzSize="small" [nzShowPagination]="null">
71
           <nz-table class="detailSampleTable" [nzData]="orderInfo.specimenSet" nzSize="small" [nzShowPagination]="null">
72
             <thead>
72
             <thead>

+ 7 - 4
src/app/share/order-detail/order-detail.component.html

@@ -183,14 +183,17 @@
183
             </div>
183
             </div>
184
           </div>
184
           </div>
185
           <div class="info" nz-row>
185
           <div class="info" nz-row>
186
-            <div nz-col nzSpan="24">
186
+            <div nz-col nzSpan="6">
187
               申请科室:{{
187
               申请科室:{{
188
                 orderInfo.createDeptDTO ? orderInfo.createDeptDTO.dept : ""
188
                 orderInfo.createDeptDTO ? orderInfo.createDeptDTO.dept : ""
189
               }}
189
               }}
190
             </div>
190
             </div>
191
-          </div>
191
+            <div nz-col nzSpan="6">
192
-          <div class="info" nz-row>
192
+              起点科室:{{
193
-            <div nz-col nzSpan="24">目标科室:{{ endDepts }}</div>
193
+                orderInfo.startDept ? orderInfo.startDept.dept : ""
194
+              }}
195
+            </div>
196
+            <div nz-col nzSpan="12">目标科室:{{ endDepts }}</div>
194
           </div>
197
           </div>
195
           <div class="info" nz-row *ngIf="orderInfo.urgentDetails">
198
           <div class="info" nz-row *ngIf="orderInfo.urgentDetails">
196
             <div nz-col nzSpan="8">
199
             <div nz-col nzSpan="8">