5本工单的详情页，增加“业务数据”按钮

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.3.108",
+    "target": "http://192.168.4.223",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/share/blood-detail-modal/blood-detail-modal.component.html

@@ -1,45 +0,0 @@
-<div class="modal display_flex justify-content_flex-center align-items_center" *ngIf="show">
-  <div class="modalBody" style="width: 1200px;">
-    <div class="title">业务数据查看<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
-    <div class="content">
-      <nz-table class="hospitalTable" [nzData]="historySpecimenList" nzSize="middle" [nzShowPagination]="false"
-        [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">
-        <thead>
-          <tr class="thead">
-            <th nzWidth="5%">序号</th>
-            <th nzWidth="13%">患者姓名</th>
-            <th nzWidth="11%">患者ID</th>
-            <th nzWidth="11%">血液类型</th>
-            <th nzWidth="14%">血袋号</th>
-            <th nzWidth="11%">取血人</th>
-            <th nzWidth="12%">取血时间</th>
-            <th nzWidth="11%">接收人</th>
-            <th nzWidth="12%">接收时间</th>
-          </tr>
-        </thead>
-        <tbody>
-          <tr *ngFor="let bloodDTO of historySpecimenList;let i = index;">
-            <td>{{i+1}}</td>
-            <td><span>{{ bloodDTO.patientName }}<span *ngIf="bloodDTO.bedNum">({{ bloodDTO.bedNum }})</span></span></td>
-            <td>{{ bloodDTO.patientNo||'' }}</td>
-            <td>{{ bloodDTO.type ? bloodDTO.type.name : "" }}</td>
-            <td>{{ bloodDTO.bloodCode||'' }}</td>
-            <td>{{ bloodDTO.arriverDTO?bloodDTO.arriverDTO.name:'' }}</td>
-            <td>{{ bloodDTO.arriveTime | date:"yyyy-MM-dd HH:mm:ss" }}</td>
-            <td></td>
-            <td>{{ bloodDTO.receiveTime | date:"yyyy-MM-dd HH:mm:ss" }}</td>
-          </tr>
-        </tbody>
-      </nz-table>
-      <!-- <div class="pagination">
-        <nz-pagination [(nzPageIndex)]="historySpecimenPageIndex" [(nzTotal)]="historySpecimenListLength"
-          [(nzPageSize)]="historySpecimenPageSize" (nzPageIndexChange)="getHistorySpecimen()"
-          (nzPageSizeChange)="getHistorySpecimen()">
-        </nz-pagination>
-      </div> -->
-    </div>
-    <div class="display_flex justify-content_flex-center">
-      <button class="btn know" nz-button nzType="primary" (click)="hideModal()">知道了</button>
-    </div>
-  </div>
-</div>

src/app/share/blood-detail-modal/blood-detail-modal.component.ts

@@ -1,49 +0,0 @@
-import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
-import { MainService } from '../../services/main.service';
-
-@Component({
-  selector: 'app-blood-detail-modal',
-  templateUrl: './blood-detail-modal.component.html',
-  styleUrls: ['./blood-detail-modal.component.less']
-})
-export class BloodDetailModalComponent implements OnInit {
-  // 切换科室，切换弹窗
-  hsLoading = false;
-  historySpecimenList: any = [];
-  historySpecimenPageIndex: number = 1;//表格当前页码
-  historySpecimenPageSize: number = 5;//表格每页展示条数
-  historySpecimenListLength: number = 10;//表格总数据量
-  @Input() show: Boolean;
-  @Input() orderId: String;
-
-  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
-
-  constructor(private mainService: MainService) { }
-
-  ngOnInit() {
-    this.getHistorySpecimen();
-  }
-  // 关闭弹窗
-  hideModal() {
-    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
-  }
-  // 获取列表数据
-  getHistorySpecimen(idx?) {
-    if (idx) {
-      this.historySpecimenPageIndex = 1;
-    }
-    let postData = {
-      "type": "blood",
-      "orderId": this.orderId
-    }
-    this.hsLoading = true;
-    this.mainService.checkData(postData).subscribe((data:any) => {
-      this.hsLoading = false;
-      this.historySpecimenList = data.data ? data.data.all : [];
-      this.historySpecimenListLength = data.data ? data.data.all.length : 0;
-    })
-  }
-}
-
-
-

src/app/share/businessData-detail-modal/businessData-detail-modal.component.html

@@ -0,0 +1,106 @@
+<div class="modal display_flex justify-content_flex-center align-items_center" *ngIf="show">
+  <div class="modalBody" style="width: 1200px;">
+    <div class="title">业务数据查看<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="content">
+      <nz-table *ngIf="type === 'blood'" class="hospitalTable" [nzData]="bloodList" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">
+        <thead>
+          <tr class="thead">
+            <th nzWidth="5%">序号</th>
+            <th nzWidth="13%">患者姓名</th>
+            <th nzWidth="11%">患者ID</th>
+            <th nzWidth="11%">血液类型</th>
+            <th nzWidth="14%">血袋号</th>
+            <th nzWidth="11%">取血人</th>
+            <th nzWidth="12%">取血时间</th>
+            <th nzWidth="11%">接收人</th>
+            <th nzWidth="12%">接收时间</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of bloodList;let i = index;">
+            <td>{{i+1}}</td>
+            <td><span>{{ data.patientName }}<span *ngIf="data.bedNum">({{ data.bedNum }})</span></span></td>
+            <td>{{ data.patientNo||'' }}</td>
+            <td>{{ data.type ? data.type.name : "" }}</td>
+            <td>{{ data.bloodCode||'' }}</td>
+            <td>{{ data.arriverDTO?data.arriverDTO.name:'' }}</td>
+            <td>{{ data.arriveTime | date:"yyyy-MM-dd HH:mm:ss" }}</td>
+            <td></td>
+            <td>{{ data.receiveTime | date:"yyyy-MM-dd HH:mm:ss" }}</td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <!-- <div class="tab display_flex" *ngIf="type === 'specimen'">
+        <div class="item flex_1" [ngClass]="{ checked: tabType == item.id }" *ngFor="let item of specimentTypeList" (click)="checkTab(item.id)">
+          {{ item.name }}
+        </div>
+      </div> -->
+      <div class="list-template w100">
+        <div class="list-template__content">
+          <div class="list-template__top" nz-row *ngIf="type === 'specimen'">
+            <div nz-col nzXl='24' class="list-template__searchBox">
+              <div class="list-template__searchItem">
+                <span class="label">标本类型</span>：
+                <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear
+                  nzPlaceHolder="请选择标本类型" [(ngModel)]="searchCriteria.stype" (ngModelChange)="selectStype($event)">
+                  <nz-option *ngFor="let option of specimentTypeList" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+                </nz-select>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <nz-table *ngIf="type === 'specimen'" class="hospitalTable" [nzData]="specimenList" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="hsLoading" [nzScroll]="{ y: '500px' }">
+        <thead>
+          <tr class="thead">
+            <th nzWidth="4%">序号</th>
+            <th nzWidth="8%">申请科室</th>
+            <th nzWidth="8%">患者姓名</th>
+            <th nzWidth="8%">标本编码</th>
+            <th nzWidth="8%">检验项目</th>
+            <th nzWidth="8%">标本类型</th>
+            <th nzWidth="8%">状态</th>
+            <th nzWidth="8%">收取时间</th>
+            <th nzWidth="8%">收取人</th>
+            <th nzWidth="8%">中转时间</th>
+            <th nzWidth="8%">送达时间</th>
+            <th nzWidth="8%">送达人</th>
+            <th nzWidth="8%">终点科室</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of specimenList;let i = index;">
+            <td>{{ (pageIndex - 1) * pageSize + i + 1 }}</td>
+            <td>{{ data.sickRoom ? data.sickRoom.dept : "-" }}</td>
+            <td>{{ data.patientName}}<span *ngIf="data.bedNum">({{data.bedNum}})</span><br>{{data.residenceNo}}</td>
+            <td>{{ data.scode || "-" }}</td>
+            <td>{{ data.specimenDesc || "-" }}</td>
+            <td>{{ data.stype ? data.stype.name : "-" }}</td>
+            <td>{{ data.speState ? data.speState.name : "-" }}</td>
+            <td>{{ data.arriveTime || "-" }}</td>
+            <td>{{ data.receiverName || "-" }}</td>
+            <td>{{ data.transTime || '-' }}</td>
+            <td>{{ data.sendTime || '-' }}</td>
+            <td>{{ data.delivererName || "-" }}</td>
+            <td>
+              {{ data.checkDept ? data.checkDept.dept : "-" }}
+              <img *ngIf="data.urgent == 1" src="../../assets/images/icon_ji.png" alt="" class="ji" />
+            </td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="pagination" *ngIf="type !== 'blood'">
+        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="total"
+          [(nzPageSize)]="pageSize" (nzPageIndexChange)="getList()"
+          (nzPageSizeChange)="getList()">
+        </nz-pagination>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button class="btn know" nz-button nzType="primary" (click)="hideModal()">知道了</button>
+    </div>
+  </div>
+</div>

src/app/share/blood-detail-modal/blood-detail-modal.component.less

@@ -11,6 +11,7 @@
     width: 100%;
     td {
       text-align: center !important;
+      position: relative;
     }
     .thead {
       background-image: linear-gradient(to right, @bg-start, @bg-end);
@@ -22,6 +23,41 @@
     }
   }
 
+  .ji {
+    position: absolute;
+    right: 0px;
+    top: -3px;
+    width: 30px;
+  }
+
+  .list-template__top{
+    div{
+      text-align: left!important;
+    }
+  }
+
+  .tab {
+    width: 100%;
+    height: 60px;
+    border-bottom: 1px solid #e5e9ed;
+    background-color: #fff;
+
+    .item {
+      text-align: center;
+      line-height: 60px;
+      height: 100%;
+      border-right: 1px solid #e5e9ed;
+
+      &:nth-last-child(1) {
+        border: none;
+      }
+
+      &.checked {
+        background: #f0f6ed;
+      }
+    }
+  }
+
   .modalBody {
     width: 700px;
     min-height: 220px;
@@ -107,7 +143,8 @@
         &:nth-child(3) {
           font-size: 14px;
           color: #666;
-          padding-bottom: 10px;
+          padding-top: 16px;
+          padding-bottom: 16px;
         }
       }
     }

src/app/share/businessData-detail-modal/businessData-detail-modal.component.ts

@@ -0,0 +1,122 @@
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+import { MainService } from '../../services/main.service';
+import { ToolService } from 'src/app/services/tool.service';
+
+@Component({
+  selector: 'app-businessData-detail-modal',
+  templateUrl: './businessData-detail-modal.component.html',
+  styleUrls: ['./businessData-detail-modal.component.less']
+})
+export class BusinessDataDetailModalComponent implements OnInit {
+  // 切换科室，切换弹窗
+  hosId;
+  hsLoading = false;
+  bloodList: any = [];// 血制品列表
+  specimenList: any = [];// 标本列表
+  pageIndex: number = 1;//表格当前页码
+  pageSize: number = 5;//表格每页展示条数
+  total: number = 0;//表格总数据量
+  searchCriteria:any = {
+    stype: null,
+  }
+  @Input() show: Boolean;
+  @Input() orderId: String;
+  @Input() type: String = '';
+
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  constructor(private mainService: MainService, private tool: ToolService) { }
+
+  ngOnInit() {
+    this.hosId = this.tool.getCurrentHospital().id;
+    this.tabType = 1;
+    switch(this.type){
+      case 'blood':
+        this.getBlood(1);
+        break;
+      case 'specimen':
+          this.getSpecimen(1);
+          this.getSpecimenType();
+          break;
+    }
+  }
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+
+  // 切换tab栏
+  tabType: number = 1; //tab栏
+  checkTab(type) {
+    this.tabType = type;
+  }
+
+  // 切换标本类型下拉框
+  selectStype(e){
+    console.log(e);
+    this.getSpecimen(1)
+  }
+
+  // 分页获取数据
+  getList(){
+    switch(this.type){
+      case 'blood':
+        this.getBlood();
+        break;
+      case 'specimen':
+          this.getSpecimen();
+          break;
+    }
+  }
+
+  // 获取列表数据
+  getBlood(idx?) {
+    if (idx) {
+      this.pageIndex = 1;
+    }
+    let postData = {
+      "type": "blood",
+      "orderId": this.orderId
+    }
+    this.hsLoading = true;
+    this.mainService.checkData(postData).subscribe((data:any) => {
+      this.hsLoading = false;
+      this.bloodList = data.data ? data.data.all : [];
+      this.pageSize = this.total = data.data ? data.data.all.length : 0;
+    })
+  }
+
+  // 获取标本类型
+  specimentTypeList: any[] = [];
+  getSpecimenType() {
+    this.mainService.getDictionary("list", "specimen_type").subscribe((data:any) => {
+      this.specimentTypeList = data || [];
+    })
+  }
+
+  // 获取标本列表
+  getSpecimen(idx?) {
+    if (idx) {
+      this.pageIndex = 1;
+    }
+    let postData = {
+      idx: this.pageIndex - 1,
+      sum: this.pageSize,
+      specimen: {
+        orderBy: 'arrive_time desc',
+        hosId: this.hosId,
+        gdid: this.orderId,
+        stype: this.searchCriteria.stype ? { id: this.searchCriteria.stype } : undefined,
+      }
+    }
+    this.hsLoading = true;
+    this.mainService.getFetchDataList('simple/data','specimen',postData).subscribe(data => {
+      this.hsLoading = false;
+      this.specimenList = data.list || [];
+      this.total = data.totalNum || 0;
+    })
+  }
+}
+
+
+

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

@@ -157,12 +157,12 @@
 </div>
 
 <!-- 业务数据查看 -->
-<app-blood-detail-modal
+<app-businessData-detail-modal
   *ngIf="bloodModalShow"
   [show]="bloodModalShow"
   [orderId]="orderId"
   (closeModelHs)="closeModelBlood($event)"
-></app-blood-detail-modal>
+></app-businessData-detail-modal>
 
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"

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

@@ -55,59 +55,6 @@
                 [nzLoading]="urgentLoading" nzGhost (click)="urgent()">确认加急</button>
             </ng-container>
           </div>
-          <div class="amplification">
-            <button
-              nz-button
-              nzType="primary"
-              class="btn default"
-              (click)="amplification()"
-            >
-              {{ amplificationShow ? "放大" : "还原" }}
-            </button>
-          </div>
-        </div>
-
-        <div class="table">
-          <nz-table class="detailSampleTable" [nzData]="orderInfo.specimenSet" nzSize="small" [nzShowPagination]="null">
-            <thead>
-              <tr class="thead">
-                <th nzWidth="4%">序号</th>
-                <th nzWidth="8%">申请科室</th>
-                <th nzWidth="7%">患者姓名</th>
-                <th nzWidth="5%">标本编码</th>
-                <th nzWidth="8%">检验项目</th>
-                <th nzWidth="8%">标本类型</th>
-                <th nzWidth="5%">状态</th>
-                <th nzWidth="8%">收取时间</th>
-                <th nzWidth="8%">收取人</th>
-                <th nzWidth="8%">中转时间</th>
-                <th nzWidth="8%">送达时间</th>
-                <th nzWidth="8%">送达人</th>
-                <th nzWidth="8%">终点科室</th>
-              </tr>
-            </thead>
-            <tbody *ngIf="orderInfo.specimenSet">
-              <tr *ngFor="let data of orderInfo.specimenSet;let i =index;">
-                <td>{{ i + 1 }}</td>
-                <td>{{ data.sickRoom ? data.sickRoom.dept : "-" }}</td>
-                <td>{{ data.patientName}}<span *ngIf="data.bedNum">({{data.bedNum}})</span><br>{{data.residenceNo}}</td>
-                <td>{{ data.scode || "-" }}</td>
-                <td>{{ data.specimenDesc || "-" }}</td>
-                <td>{{ data.stype ? data.stype.name : "-" }}</td>
-                <td>{{ data.speState ? data.speState.name : "-" }}</td>
-                <td>{{ data.arriveTime || "-" }}</td>
-                <td>{{ data.receiverName || "-" }}</td>
-                <td>{{ data.transTime || '-' }}</td>
-                <td>{{ data.sendTime || '-' }}</td>
-                <td>{{ data.delivererName || "-" }}</td>
-                <td>
-                  {{ data.checkDept ? (!showCoop&&deptDisplay==2?data.checkDept.deptalias:data.checkDept.dept) : "-" }}
-                  <img *ngIf="data.urgent == 1"
-                  src="../../assets/images/icon_ji.png" alt="" class="ji"></td>
-                <!-- <td style="position: relative;">{{data.sendTime?data.sendTime:'-'}}</td> -->
-              </tr>
-            </tbody>
-          </nz-table>
         </div>
       </div>
     </div>
@@ -118,6 +65,9 @@
       (click)="openRecallModal()">撤回</button>
     <button *ngIf="showCoop&&(orderInfo.gdState.value==2||orderInfo.gdState.value==3||orderInfo.gdState.value==4)" nz-button
       nzType="danger" (click)="openDelModal()">删除</button> -->
+    <button class="btn default" nz-button nzType="default" (click)="viewDetail(orderInfo, 'specimen')">
+      业务数据
+    </button>
     <button class=" btn cancel" nz-button nzType="default" (click)="close()">取消</button>
   </div>
 </div>
@@ -158,5 +108,16 @@
   [info]="promptInfo" (closeModel)="close()">
   <!-- 2.父组件调用子组件时绑定到这个事件属性，并在事件发生时作出回应。(closeModel)="close()" -->
 </app-prompt-modal>
+
+<!-- 业务数据查看 -->
+<app-businessData-detail-modal
+  *ngIf="businessDataModalShow"
+  [show]="businessDataModalShow"
+  [type]="businessDataModalType"
+  [orderId]="orderId"
+  (closeModelHs)="closeModelBlood($event)"
+></app-businessData-detail-modal>
+
+
 <!-- 遮罩 -->
 <app-mask *ngIf="maskFlag"></app-mask>

src/app/share/detail-sample/detail-sample.component.ts

@@ -239,4 +239,18 @@ export class DetailSampleComponent implements OnInit {
     });
     return this.formatTime(num / 1000);
   }
+
+  // 查看业务数据
+  businessDataModalShow = false; //业务数据弹窗开关
+  businessDataModalType = ''; //业务数据类型
+  orderId = ""; //查看业务数据携带
+  viewDetail(data, type) {
+    this.orderId = data.id;
+    this.businessDataModalType = type;
+    this.businessDataModalShow = true;
+  }
+  // 关闭业务数据弹窗
+  closeModelBlood(e) {
+    this.businessDataModalShow = JSON.parse(e).show;
+  }
 }

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

@@ -277,68 +277,6 @@
             </div>
           </div>
         </div>
-        <div class="bottom">
-          <div class="amplification">
-            <button
-              nz-button
-              nzType="primary"
-              class="btn default"
-              (click)="amplification()"
-            >
-              {{ amplificationShow ? "放大" : "还原" }}
-            </button>
-          </div>
-          <div class="table">
-            <nz-table
-              [nzData]="orderInfo.specimenSet"
-              nzSize="small"
-              [nzShowPagination]="null"
-            >
-              <thead>
-                <tr class="thead">
-                  <th nzWidth="4%">序号</th>
-                  <th nzWidth="8%">申请科室</th>
-                  <th nzWidth="7%">患者姓名</th>
-                  <th nzWidth="5%">标本编码</th>
-                  <th nzWidth="8%">检验项目</th>
-                  <th nzWidth="8%">标本类型</th>
-                  <th nzWidth="5%">状态</th>
-                  <th nzWidth="8%">收取时间</th>
-                  <th nzWidth="8%">收取人</th>
-                  <th nzWidth="8%">中转时间</th>
-                  <th nzWidth="8%">送达时间</th>
-                  <th nzWidth="8%">送达人</th>
-                  <th nzWidth="8%">终点科室</th>
-                </tr>
-              </thead>
-              <tbody *ngIf="orderInfo.specimenSet">
-                <tr *ngFor="let data of orderInfo.specimenSet; let i = index">
-                  <td>{{ i + 1 }}</td>
-                  <td>{{ data.sickRoom ? data.sickRoom.dept : "-" }}</td>
-                  <td>{{ data.patientName}}<span *ngIf="data.bedNum">({{data.bedNum}})</span><br>{{data.residenceNo}}</td>
-                  <td>{{ data.scode || "-" }}</td>
-                  <td>{{ data.specimenDesc || "-" }}</td>
-                  <td>{{ data.stype ? data.stype.name : "-" }}</td>
-                  <td>{{ data.speState ? data.speState.name : "-" }}</td>
-                  <td>{{ data.arriveTime || "-" }}</td>
-                  <td>{{ data.receiverName || "-" }}</td>
-                  <td>{{ data.transTime || '-' }}</td>
-                  <td>{{ data.sendTime || '-' }}</td>
-                  <td>{{ data.delivererName || "-" }}</td>
-                  <td>
-                    {{ data.checkDept ? data.checkDept.dept : "-" }}
-                    <img
-                      *ngIf="data.urgent == 1"
-                      src="../../assets/images/icon_ji.png"
-                      alt=""
-                      class="ji"
-                    />
-                  </td>
-                </tr>
-              </tbody>
-            </nz-table>
-          </div>
-        </div>
       </div>
     </overlay-scrollbars>
     <!-- 标本轮巡工单信息 -->
@@ -448,68 +386,6 @@
             </div>
           </div>
         </div>
-        <div class="bottom">
-          <div class="amplification">
-            <button
-              nz-button
-              nzType="primary"
-              class="btn default"
-              (click)="amplification()"
-            >
-              {{ amplificationShow ? "放大" : "还原" }}
-            </button>
-          </div>
-          <div class="table">
-            <nz-table
-              [nzData]="orderInfo.specimenSet"
-              nzSize="small"
-              [nzShowPagination]="null"
-            >
-              <thead>
-                <tr class="thead">
-                  <th nzWidth="4%">序号</th>
-                  <th nzWidth="8%">申请科室</th>
-                  <th nzWidth="7%">患者姓名</th>
-                  <th nzWidth="5%">标本编码</th>
-                  <th nzWidth="8%">检验项目</th>
-                  <th nzWidth="8%">标本类型</th>
-                  <th nzWidth="5%">状态</th>
-                  <th nzWidth="8%">收取时间</th>
-                  <th nzWidth="8%">收取人</th>
-                  <th nzWidth="8%">中转时间</th>
-                  <th nzWidth="8%">送达时间</th>
-                  <th nzWidth="8%">送达人</th>
-                  <th nzWidth="8%">终点科室</th>
-                </tr>
-              </thead>
-              <tbody *ngIf="orderInfo.specimenSet">
-                <tr *ngFor="let data of orderInfo.specimenSet; let i = index">
-                  <td>{{ i + 1 }}</td>
-                  <td>{{ data.sickRoom ? data.sickRoom.dept : "-" }}</td>
-                  <td>{{ data.patientName}}<span *ngIf="data.bedNum">({{data.bedNum}})</span><br>{{data.residenceNo}}</td>
-                  <td>{{ data.scode || "-" }}</td>
-                  <td>{{ data.specimenDesc || "-" }}</td>
-                  <td>{{ data.stype ? data.stype.name : "-" }}</td>
-                  <td>{{ data.speState ? data.speState.name : "-" }}</td>
-                  <td>{{ data.arriveTime || "-" }}</td>
-                  <td>{{ data.receiverName || "-" }}</td>
-                  <td>{{ data.transTime || '-' }}</td>
-                  <td>{{ data.sendTime || '-' }}</td>
-                  <td>{{ data.delivererName || "-" }}</td>
-                  <td>
-                    {{ data.checkDept ? data.checkDept.dept : "-" }}
-                    <img
-                      *ngIf="data.urgent == 1"
-                      src="../../assets/images/icon_ji.png"
-                      alt=""
-                      class="ji"
-                    />
-                  </td>
-                </tr>
-              </tbody>
-            </nz-table>
-          </div>
-        </div>
       </div>
     </overlay-scrollbars>
     <!-- 药品/静配配送类型工单信息 -->
@@ -1333,7 +1209,10 @@
     </overlay-scrollbars>
   </div>
   <div class="btns">
-    <button *ngIf="orderInfo.taskType.associationType.value == 'ordinary' && orderInfo.taskType.ordinaryField.value == 'blood'" class="btn default" nz-button nzType="default" (click)="viewDetail(orderInfo)">
+    <button *ngIf="orderInfo.taskType.associationType.value == 'ordinary' && orderInfo.taskType.ordinaryField.value == 'blood'" class="btn default" nz-button nzType="default" (click)="viewDetail(orderInfo, 'blood')">
+      业务数据
+    </button>
+    <button *ngIf="orderInfo.taskType.associationType.value == 'specimen' || orderInfo.taskType.associationType.value == 'specimenPlan'" class="btn default" nz-button nzType="default" (click)="viewDetail(orderInfo, 'specimen')">
       业务数据
     </button>
     <button class="btn cancel" nz-button nzType="default" (click)="close()">
@@ -1354,12 +1233,13 @@
 </app-prompt-modal>
 
 <!-- 业务数据查看 -->
-<app-blood-detail-modal
-  *ngIf="bloodModalShow"
-  [show]="bloodModalShow"
+<app-businessData-detail-modal
+  *ngIf="businessDataModalShow"
+  [show]="businessDataModalShow"
+  [type]="businessDataModalType"
   [orderId]="orderId"
   (closeModelHs)="closeModelBlood($event)"
-></app-blood-detail-modal>
+></app-businessData-detail-modal>
 
 <!-- 遮罩 -->
 <app-mask *ngIf="maskFlag"></app-mask>

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

@@ -157,15 +157,17 @@ export class OrderDetailComponent implements OnInit {
   }
 
   // 查看业务数据
-  bloodModalShow = false; //业务数据弹窗开关
+  businessDataModalShow = false; //业务数据弹窗开关
+  businessDataModalType = ''; //业务数据类型
   orderId = ""; //查看业务数据携带
-  viewDetail(data) {
+  viewDetail(data, type) {
     this.orderId = data.id;
-    this.bloodModalShow = true;
+    this.businessDataModalType = type;
+    this.businessDataModalShow = true;
   }
   // 关闭业务数据弹窗
   closeModelBlood(e) {
-    this.bloodModalShow = JSON.parse(e).show;
+    this.businessDataModalShow = JSON.parse(e).show;
   }
 
   // 获取工单历史记录

src/app/share/share.module.ts

@@ -36,7 +36,7 @@ import { DetailBxComponent } from './detail-bx/detail-bx.component';
 import { ImageViewerComponent } from './image-viewer/image-viewer.component';
 import { SpePromptModalComponent } from './spe-prompt-modal/spe-prompt-modal.component';
 import { OrderPromptModalComponent } from './order-prompt-modal/order-prompt-modal.component';
-import { BloodDetailModalComponent } from './blood-detail-modal/blood-detail-modal.component';
+import { BusinessDataDetailModalComponent } from './businessData-detail-modal/businessData-detail-modal.component';
 import { DetailBloodComponent } from './detail-blood/detail-blood.component';
 import { BloodHistoryPromptModalComponent } from './blood-history-prompt-modal/blood-history-prompt-modal.component';
 
@@ -54,7 +54,7 @@ import { BloodHistoryPromptModalComponent } from './blood-history-prompt-modal/b
     ReplicationSchemeComponent,
     HsPromptModalComponent,
     HistoryPromptModalComponent,
-    BloodDetailModalComponent,
+    BusinessDataDetailModalComponent,
     BxPromptModalComponent,
     AppraiseDetailComponent,
     OrderDetailComponent,
@@ -74,7 +74,7 @@ import { BloodHistoryPromptModalComponent } from './blood-history-prompt-modal/b
     ImageViewerComponent,
     SpePromptModalComponent,
     OrderPromptModalComponent,
-    BloodDetailModalComponent,
+    BusinessDataDetailModalComponent,
     DetailBloodComponent,
     BloodHistoryPromptModalComponent,
   ],
@@ -101,7 +101,7 @@ import { BloodHistoryPromptModalComponent } from './blood-history-prompt-modal/b
     ReplicationSchemeComponent,
     HsPromptModalComponent,
     HistoryPromptModalComponent,
-    BloodDetailModalComponent,
+    BusinessDataDetailModalComponent,
     BxPromptModalComponent,
     AppraiseDetailComponent,
     OrderDetailComponent,

src/app/views/specimen-search/specimen-search.component.html

@@ -164,7 +164,7 @@
             <th nzWidth="8%">检验项目</th>
             <th nzWidth="8%">标本类型</th>
             <th nzWidth="5%">状态</th>
-            <th nzWidth="8%" nzShowSort nzSortKey="arriveTime" [(nzSort)]="sortCurrent.arriveTime">收取时间</th>
+            <th nzWidth="8%" nzShowSort nzSortKey="arrive_time" [(nzSort)]="sortCurrent.arrive_time">收取时间</th>
             <th nzWidth="8%">收取人</th>
             <th nzWidth="8%">中转时间</th>
             <th nzWidth="8%">送达时间</th>

src/app/views/specimen-search/specimen-search.component.ts

@@ -154,7 +154,7 @@ export class SpecimenSearchComponent implements OnInit {
     this.sortCurrentKey = "";
     this.sortCurrentValue = "";
     this.sortCurrent = {
-      arriveTime: null,
+      arrive_time: null,
     };
     this.getList(1, this.sortCurrentKey, this.sortCurrentValue);
   }
@@ -334,7 +334,7 @@ export class SpecimenSearchComponent implements OnInit {
 
   // 列表排序
   sortCurrent = {
-    arriveTime: null,
+    arrive_time: null,
   };
   sortCurrentKey: string = "";
   sortCurrentValue: string | null = "";

src/common.less

@@ -214,7 +214,7 @@
 
 // list模板样式 start
 .list-template {
-  padding: 0 16px 16px;
+  padding: 8px;
   .list-template__content {
     .list-template__top {
       display: flex;