拉取代码

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

@@ -127,6 +127,10 @@
                   <nz-option *ngFor="let option of specimenDescList" [nzLabel]="option.nameNum" [nzValue]="option.id"></nz-option>
                 </nz-select>
               </div>
+							<div class="list-template__searchItem">
+							  <span class="label">实际收取</span>：
+								<label nz-checkbox [(ngModel)]="searchCriteria.practical" (ngModelChange)="practicalChange($event)"></label>
+							</div>
             </div>
           </div>
         </div>
@@ -155,9 +159,9 @@
             <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 class="underline" (click)="viewSpecimenHistory(data)">{{ data.scode || "-" }}</td>
             <td>{{ data.specimenDesc || "-" }}</td>
-            <td>{{ data.stype ? data.stype.name : "-" }}</td>
+            <td>{{ data.stype ? data.stype.name : "-" }}<span *ngIf="data.tubeType">,</span>{{data.tubeType && data.tubeType.name}}</td>
             <td>{{ data.speState ? data.speState.name : "-" }}</td>
             <td>{{ data.arriveTime || "-" }}</td>
             <td>{{ data.receiverName || "-" }}</td>
@@ -253,3 +257,11 @@
   [infoId]="infoId"
   (closeModelHs)="closeModelBlood($event)"
 ></app-businessData-detail-info-modal>
+
+<!-- 标本历史记录查看 -->
+<app-history-prompt-modal
+  *ngIf="historyPromptModalShow"
+  [show]="historyPromptModalShow"
+  [scode]="scode"
+  (closeModelHs)="closeModelHistory($event)"
+></app-history-prompt-modal>

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

@@ -7,6 +7,10 @@
   height: 100%;
   background: rgba(0, 0, 0, 0.4);
   z-index: 999;
+	.underline{
+		text-decoration: underline;
+		cursor: pointer;
+	}
   .drugsBag{
     display: flex;
     align-items: center;

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

@@ -22,6 +22,7 @@ export class BusinessDataDetailModalComponent implements OnInit {
   searchCriteria:any = {
     stype: 0,
     specimenDesc: 0,
+		practical: false
   }
   @Input() show: Boolean;
   @Input() orderId: String;
@@ -75,6 +76,20 @@ export class BusinessDataDetailModalComponent implements OnInit {
 
     }
   }
+	
+	// 查看标本历史记录
+	historyPromptModalShow = false; //标本历史记录弹窗开关
+	scode = ""; //查看历史记录携带
+	viewSpecimenHistory(data) {
+	  this.scode = data.scode;
+	  this.historyPromptModalShow = true;
+	}
+	
+	// 关闭标本历史记录弹窗
+	closeModelHistory(e) {
+	  this.historyPromptModalShow = JSON.parse(e).show;
+	}
+	
   // 关闭弹窗
   hideModal() {
     this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
@@ -99,7 +114,12 @@ export class BusinessDataDetailModalComponent implements OnInit {
     console.log(e);
     this.getSpecimen(1);
   }
-
+	
+	// 选择实际收取
+	practicalChange(e){
+		this.getSpecimen(1);
+	}
+	
   // 分页获取数据
   getList(){
     switch(this.type){
@@ -193,7 +213,8 @@ export class BusinessDataDetailModalComponent implements OnInit {
         gdid: this.orderId,
         stype: this.searchCriteria.stype ? { id: this.searchCriteria.stype } : undefined,
         specimenDesc: this.searchCriteria.specimenDesc ? this.specimenDescList.find(v => v.id == this.searchCriteria.specimenDesc).name: undefined,
-      }
+				practical: this.searchCriteria.practical ? 1 : undefined
+			}
     }
     this.hsLoading = true;
     this.mainService.getFetchDataList('simple/data','specimen',postData).subscribe(data => {

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

@@ -158,36 +158,45 @@
         <thead (nzSortChange)="sort($event)" nzSingleSort>
           <tr class="thead">
             <th nzWidth="4%">序号</th>
-            <th nzWidth="8%">申请科室</th>
+            <th>科室信息</th>
             <th nzWidth="7%">患者姓名</th>
-            <th nzWidth="5%">标本编码</th>
-            <th nzWidth="8%">检验项目</th>
+            <th>标本信息</th>
+            <th>采集信息</th>
             <th nzWidth="8%">标本类型</th>
-            <th nzWidth="5%">状态</th>
-            <th nzWidth="8%" nzShowSort nzSortKey="arrive_time" [(nzSort)]="sortCurrent.arrive_time">收取时间</th>
-            <th nzWidth="8%">收取人</th>
+            <th nzWidth="7%">状态</th>
+            <th nzShowSort nzSortKey="arrive_time" [(nzSort)]="sortCurrent.arrive_time">收取信息</th>
             <th nzWidth="8%">中转时间</th>
-            <th nzWidth="8%">送达时间</th>
-            <th nzWidth="8%">送达人</th>
-            <th nzWidth="8%">终点科室</th>
+            <th>送达信息</th>
             <th nzWidth="7%"></th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData; let i = index">
             <td>{{i+(pageIndex-1) * pageSize + 1}}</td>
-            <td>{{ data.sickRoom ? data.sickRoom.dept : "-" }}</td>
+            <td>
+							<div>{{ data.sickRoom ? data.sickRoom.dept : "-" }}</div>
+							<div>{{ data.checkDept ? data.checkDept.dept : "-" }}</div>
+						</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>
+							<div>{{ data.scode || "-" }}</div>
+							<div>{{ data.specimenDesc || "-" }}</div>
+						</td>
+						<td>
+							<div>{{ data.collectNurseName || "-" }}</div>
+							<div>{{ data.printDate || "-" }}</div>
+						</td>
+            <td>{{ data.stype ? data.stype.name : "-" }}<span *ngIf="data.tubeType">,</span>{{data.tubeType && data.tubeType.name}}</td>
             <td>{{ data.speState ? data.speState.name : "-" }}</td>
-            <td>{{ data.arriveTime || "-" }}</td>
-            <td>{{ data.receiverName || "-" }}</td>
+            <td>
+							<div>{{ data.receiverName || "-" }}</div>
+							<div>{{ data.arriveTime || "-" }}</div>
+						</td>
             <td>{{ data.transTime || '-' }}</td>
-            <td>{{ data.sendTime || '-' }}</td>
-            <td>{{ data.delivererName || "-" }}</td>
-            <td>{{ data.checkDept ? data.checkDept.dept : "-" }}</td>
+            <td>
+							<div>{{ data.delivererName || "-" }}</div>
+							<div>{{ data.sendTime || '-' }}</div>
+						</td>
             <td><button (click)="viewSpecimenHistory(data)">查看</button></td>
           </tr>
         </tbody>