标本信息增加检验项目字段展示

proxy.conf.json

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

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

@@ -1,14 +1,26 @@
 <div class="list-template">
   <div class="list-template__content">
     <div class="list-template__top" nz-row>
-      <div nz-col nzXl='16' class="list-template__searchBox">
+      <div nz-col nzXl="16" class="list-template__searchBox">
         <div class="list-template__searchItem">
           <span class="label">收取科室：</span>
-          <nz-select [nzDropdownMatchSelectWidth]="false" class="formItem" nzServerSearch nzShowSearch nzAllowClear
-            nzPlaceHolder="请选择收取科室" [(ngModel)]="searchCriteria.department" (nzOnSearch)="changeInp($event,'search')"
-            (nzOpenChange)="changeSearch($event)">
+          <nz-select
+            [nzDropdownMatchSelectWidth]="false"
+            class="formItem"
+            nzServerSearch
+            nzShowSearch
+            nzAllowClear
+            nzPlaceHolder="请选择收取科室"
+            [(ngModel)]="searchCriteria.department"
+            (nzOnSearch)="changeInp($event, 'search')"
+            (nzOpenChange)="changeSearch($event)"
+          >
             <ng-container *ngFor="let data of departmentSearch">
-              <nz-option *ngIf="!isLoading" nzLabel="{{data.dept}}" nzValue="{{data.id}}"></nz-option>
+              <nz-option
+                *ngIf="!isLoading"
+                nzLabel="{{ data.dept }}"
+                nzValue="{{ data.id }}"
+              ></nz-option>
             </ng-container>
             <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
               <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
@@ -17,70 +29,117 @@
         </div>
         <div class="list-template__searchItem">
           <span class="label">标本编码：</span>
-          <input nz-input class="formItem" placeholder="请输入标本编码" [(ngModel)]="searchCriteria.scode" />
+          <input
+            nz-input
+            class="formItem"
+            placeholder="请输入标本编码"
+            [(ngModel)]="searchCriteria.scode"
+          />
         </div>
         <div class="list-template__searchItem">
           <span class="label">患者信息：</span>
-          <input nz-input class="formItem" placeholder="请输入患者信息" [(ngModel)]="searchCriteria.parent" />
+          <input
+            nz-input
+            class="formItem"
+            placeholder="请输入患者信息"
+            [(ngModel)]="searchCriteria.parent"
+          />
         </div>
       </div>
       <div nz-col nzXl="8" class="list-template__btns">
-        <button nz-button class="btn default" (click)="showDelModal('您确认要清空标本吗？')">清空标本</button>
-        <button nz-button class="btn default ml8" (click)='reset()'>重置</button>
-        <button nz-button class="btn default ml8" (click)='getList(1)'>搜索</button>
+        <button
+          nz-button
+          class="btn default"
+          (click)="showDelModal('您确认要清空标本吗？')"
+        >
+          清空标本
+        </button>
+        <button nz-button class="btn default ml8" (click)="reset()">
+          重置
+        </button>
+        <button nz-button class="btn default ml8" (click)="getList(1)">
+          搜索
+        </button>
       </div>
     </div>
     <div class="list-template__bottom">
-      <nz-table class="list-template__nzTable" #headerTable [nzData]="listOfData" nzSize="middle" [nzShowPagination]="false"
-        [nzLoading]="loading1">
+      <nz-table
+        class="list-template__nzTable"
+        #headerTable
+        [nzData]="listOfData"
+        nzSize="middle"
+        [nzShowPagination]="false"
+        [nzLoading]="loading1"
+      >
         <thead>
           <tr class="thead">
             <th nzWidth="5%">序号</th>
+            <th nzWidth="8%">检验项目</th>
             <th nzWidth="8%">标本类型</th>
             <th nzWidth="6%">状态</th>
             <th nzWidth="10%">标本编码</th>
             <th nzWidth="8%">患者姓名</th>
             <th nzWidth="8%">床号</th>
-            <th nzWidth="10%">收取扫描时间</th>
+            <th nzWidth="8%">收取扫描时间</th>
             <th nzWidth="8%">收取人</th>
-            <th nzWidth="10%">申请科室</th>
-            <th nzWidth="10%">送达目标科室</th>
-            <th nzWidth="10%">送达到达时间</th>
+            <th nzWidth="8%">申请科室</th>
+            <th nzWidth="8%">送达目标科室</th>
+            <th nzWidth="8%">送达到达时间</th>
             <th nzWidth="7%"></th>
           </tr>
         </thead>
         <tbody>
-          <tr *ngFor="let data of listOfData;let i = index">
-            <td>{{i+1}}</td>
-            <td>{{ data.stype?data.stype.name:'-' }}</td>
-            <td>{{ data.speState?data.speState.name:'-' }}</td>
-            <td>{{ data.scode||'-' }}</td>
-            <td>{{ data.patientName||'-' }}</td>
-            <td>{{ data.bedNum||'-' }}</td>
-            <td>{{data.arriveTime||'-'}}</td>
-            <td>{{ data.worker||'-' }}</td>
-            <td>{{data.sickRoom?data.sickRoom.dept:'-'}}</td>
-            <td>{{data.checkDept?data.checkDept.dept:'-'}}</td>
-            <td>{{data.sendTime||'-'}}</td>
+          <tr *ngFor="let data of listOfData; let i = index">
+            <td>{{ i + 1 }}</td>
+            <td>{{ data.specimenDesc || "-" }}</td>
+            <td>{{ data.stype ? data.stype.name : "-" }}</td>
+            <td>{{ data.speState ? data.speState.name : "-" }}</td>
+            <td>{{ data.scode || "-" }}</td>
+            <td>{{ data.patientName || "-" }}</td>
+            <td>{{ data.bedNum || "-" }}</td>
+            <td>{{ data.arriveTime || "-" }}</td>
+            <td>{{ data.worker || "-" }}</td>
+            <td>{{ data.sickRoom ? data.sickRoom.dept : "-" }}</td>
+            <td>{{ data.checkDept ? data.checkDept.dept : "-" }}</td>
+            <td>{{ data.sendTime || "-" }}</td>
             <td><button (click)="viewSpecimenHistory(data)">查看</button></td>
           </tr>
         </tbody>
       </nz-table>
       <div class="list-template__pagination">
-        <nz-pagination [(nzPageIndex)]="pageIndex" [(nzTotal)]="listLength" [(nzPageSize)]="pageSize"
-          (nzPageIndexChange)="getList(0)" (nzPageSizeChange)="getList(0)">
+        <nz-pagination
+          [(nzPageIndex)]="pageIndex"
+          [(nzTotal)]="listLength"
+          [(nzPageSize)]="pageSize"
+          (nzPageIndexChange)="getList(0)"
+          (nzPageSizeChange)="getList(0)"
+        >
         </nz-pagination>
       </div>
     </div>
   </div>
 </div>
 <!-- 清空标本模态框 -->
-<app-dialog-delete [delModal]="delModal" (hideDelModalEvent)="hideDelModal()" [btnLoading]="btnLoading"
-(confirmDelEvent)="confirmDel()" [content]="tipsMsg1"></app-dialog-delete>
+<app-dialog-delete
+  [delModal]="delModal"
+  (hideDelModalEvent)="hideDelModal()"
+  [btnLoading]="btnLoading"
+  (confirmDelEvent)="confirmDel()"
+  [content]="tipsMsg1"
+></app-dialog-delete>
 <!-- 标本历史记录查看 -->
-<app-history-prompt-modal *ngIf="historyPromptModalShow" [show]="historyPromptModalShow" [scode]="scode"
-  (closeModelHs)="closeModelHistory($event)"></app-history-prompt-modal>
+<app-history-prompt-modal
+  *ngIf="historyPromptModalShow"
+  [show]="historyPromptModalShow"
+  [scode]="scode"
+  (closeModelHs)="closeModelHistory($event)"
+></app-history-prompt-modal>
 <!-- 操作成功/失败提示框 -->
-<app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
-  [info]="promptInfo">
+<app-prompt-modal
+  *ngIf="promptModalShow"
+  [content]="promptContent"
+  [success]="ifSuccess"
+  [show]="promptModalShow"
+  [info]="promptInfo"
+>
 </app-prompt-modal>