Browse Source

检查信息界面修改

seimin 3 years ago
parent
commit
79bf355f8c

+ 2 - 0
src/app/views/hushijiandan/hushijiandan.component.ts

@@ -143,6 +143,7 @@ export class HushijiandanComponent implements OnInit {
143
     this.getWebsocket();
143
     this.getWebsocket();
144
     this.listDeptOrderRecord();
144
     this.listDeptOrderRecord();
145
     this.logTime = this.logTimeConst;
145
     this.logTime = this.logTimeConst;
146
+    clearInterval(this.logTimer);
146
     this.logTimer = setInterval(() => {
147
     this.logTimer = setInterval(() => {
147
       this.logTime--;
148
       this.logTime--;
148
       if (this.logTime === 0) {
149
       if (this.logTime === 0) {
@@ -156,6 +157,7 @@ export class HushijiandanComponent implements OnInit {
156
     clearInterval(this.moveId);
157
     clearInterval(this.moveId);
157
     clearInterval(this.moveId1);
158
     clearInterval(this.moveId1);
158
     clearInterval(this.msgTimerId);
159
     clearInterval(this.msgTimerId);
160
+    clearInterval(this.logTimer);
159
     this.webs.closeWs();
161
     this.webs.closeWs();
160
   }
162
   }
161
   loginUser: any = localStorage.getItem("user")
163
   loginUser: any = localStorage.getItem("user")

+ 7 - 9
src/app/views/inspect-search/inspect-search.component.html

@@ -7,8 +7,8 @@
7
           <input nz-input class="formItem" placeholder="请输入患者姓名" [(ngModel)]="searchCriteria.patientName" />
7
           <input nz-input class="formItem" placeholder="请输入患者姓名" [(ngModel)]="searchCriteria.patientName" />
8
         </div>
8
         </div>
9
         <div class="list-template__searchItem">
9
         <div class="list-template__searchItem">
10
-          <span class="label">检查号:</span>
11
-          <input nz-input class="formItem" placeholder="请输入检查床号" [(ngModel)]="searchCriteria.bedNum" />
10
+          <span class="label">检查号:</span>
11
+          <input nz-input class="formItem" placeholder="请输入检查单号" [(ngModel)]="searchCriteria.inspectCode" />
12
         </div>
12
         </div>
13
         <div class="list-template__searchItem">
13
         <div class="list-template__searchItem">
14
           <span class="label">支助人员:</span>
14
           <span class="label">支助人员:</span>
@@ -37,14 +37,13 @@
37
             <th nzWidth="6%">序号</th>
37
             <th nzWidth="6%">序号</th>
38
             <th nzWidth="10%">患者姓名</th>
38
             <th nzWidth="10%">患者姓名</th>
39
             <th nzWidth="10%">患者编码</th>
39
             <th nzWidth="10%">患者编码</th>
40
-            <th nzWidth="7%">检查床号</th>
41
-            <th nzWidth="7%">患者床号</th>
40
+            <th nzWidth="10%">检查单号</th>
41
+            <th nzWidth="10%">患者床号</th>
42
             <th nzWidth="10%">检查项目</th>
42
             <th nzWidth="10%">检查项目</th>
43
-            <th nzWidth="15%">预约时间</th>
44
-            <th nzWidth="15%">到达时间</th>
43
+            <th nzWidth="12%">预约时间</th>
44
+            <th nzWidth="12%">到达时间</th>
45
             <th nzWidth="10%">检查状态</th>
45
             <th nzWidth="10%">检查状态</th>
46
             <th nzWidth="10%">支助人员</th>
46
             <th nzWidth="10%">支助人员</th>
47
-            <!-- <th nzWidth="9%">操作</th> -->
48
           </tr>
47
           </tr>
49
         </thead>
48
         </thead>
50
         <tbody>
49
         <tbody>
@@ -52,14 +51,13 @@
52
             <td>{{i+1}}</td>
51
             <td>{{i+1}}</td>
53
             <td>{{ data.patientName||'-' }}</td>
52
             <td>{{ data.patientName||'-' }}</td>
54
             <td>{{ data.patientCode||'-' }}</td>
53
             <td>{{ data.patientCode||'-' }}</td>
55
-            <td>{{ data.bedNum||'-' }}</td>
54
+            <td>{{ data.inspectCode||'-' }}</td>
56
             <td>{{ data.patientBedNum||'-' }}</td>
55
             <td>{{ data.patientBedNum||'-' }}</td>
57
             <td>{{data.inspectName||'-'}}</td>
56
             <td>{{data.inspectName||'-'}}</td>
58
             <td>{{ data.yyTime||'-' }}</td>
57
             <td>{{ data.yyTime||'-' }}</td>
59
             <td>{{data.arriveTime||'-'}}</td>
58
             <td>{{data.arriveTime||'-'}}</td>
60
             <td>{{ data.inspectState?data.inspectState.name:''}}</td>
59
             <td>{{ data.inspectState?data.inspectState.name:''}}</td>
61
             <td>{{ data.workerName||'-' }}</td>
60
             <td>{{ data.workerName||'-' }}</td>
62
-            <!-- <td><button (click)="viewSpecimenHistory(data)">查看</button></td> -->
63
           </tr>
61
           </tr>
64
         </tbody>
62
         </tbody>
65
       </nz-table>
63
       </nz-table>

+ 3 - 3
src/app/views/inspect-search/inspect-search.component.ts

@@ -15,7 +15,7 @@ export class InspectSearchComponent implements OnInit {
15
   searchCriteria = {
15
   searchCriteria = {
16
     //搜索条件
16
     //搜索条件
17
     patientName: "",
17
     patientName: "",
18
-    bedNum: "",
18
+    inspectCode: "",
19
     hospital: null,
19
     hospital: null,
20
     workerId: null,
20
     workerId: null,
21
   };
21
   };
@@ -37,7 +37,7 @@ export class InspectSearchComponent implements OnInit {
37
     this.searchCriteria = {
37
     this.searchCriteria = {
38
       //搜索条件
38
       //搜索条件
39
       patientName: "",
39
       patientName: "",
40
-      bedNum: "",
40
+      inspectCode: "",
41
       hospital: this.allHospital[0] ? this.allHospital[0]["id"] + "" : null,
41
       hospital: this.allHospital[0] ? this.allHospital[0]["id"] + "" : null,
42
       workerId: null,
42
       workerId: null,
43
     };
43
     };
@@ -111,7 +111,7 @@ export class InspectSearchComponent implements OnInit {
111
       sum: this.pageSize,
111
       sum: this.pageSize,
112
       hosId: this.searchCriteria.hospital,
112
       hosId: this.searchCriteria.hospital,
113
       patientName: this.searchCriteria.patientName,
113
       patientName: this.searchCriteria.patientName,
114
-      bedNum: this.searchCriteria.bedNum,
114
+      inspectCode: this.searchCriteria.inspectCode,
115
       workerId: this.searchCriteria.workerId,
115
       workerId: this.searchCriteria.workerId,
116
     };
116
     };
117
     this.loading1 = true;
117
     this.loading1 = true;