Przeglądaj źródła

综合日志功能开发

seimin 3 lat temu
rodzic
commit
3cb0cde6fc

+ 4 - 0
src/app/services/main.service.ts

@@ -313,4 +313,8 @@ export class MainService {
313 313
   changeHospitalSysConfig(data) {
314 314
     return this.http.post(host.host + '/simple/data/addListData/hospitalConfig', data, { headers: this.headers });
315 315
   }
316
+  //护士端获取综合日志
317
+  listDeptOrderRecord(data) {
318
+    return this.http.post(host.host + '/nurse/listDeptOrderRecord', data, { headers: this.headers });
319
+  }
316 320
 }

+ 170 - 141
src/app/views/hushijiandan/hushijiandan.component.html

@@ -263,7 +263,7 @@
263 263
                 <div class="tab borderB" nz-row>
264 264
                   <div nz-col nzSpan="6"
265 265
                     [ngClass]="{'txtC':true,'cur':true, 'borderR':true,'checked':checkedTableType=='other'}"
266
-                    (click)="checkTable('other')">其他建单</div>
266
+                    (click)="checkTable('other')">综合日志</div>
267 267
                   <div nz-col nzSpan="6"
268 268
                     [ngClass]="{'txtC':true,'cur':true, 'borderR':true,'checked':checkedTableType=='advice'}"
269 269
                     (click)="checkTable('advice')">意见箱</div>
@@ -276,7 +276,7 @@
276 276
                   </div>
277 277
                 </div>
278 278
               </div>
279
-              <!-- 其他建单 -->
279
+              <!-- 综合日志 -->
280 280
               <div *ngIf="checkedTableType=='other'" style="flex: 1;height: 100%;position: relative;">
281 281
                 <div class="otherBox">
282 282
                   <div class="otherBoxInner">
@@ -287,9 +287,10 @@
287 287
                       </div>
288 288
                       <overlay-scrollbars #osComponentRef2 class="otherBox-nav__main" [ngStyle]="{height:'100%'}">
289 289
                         <div class="otherBox-nav__mainInner" *ngIf="!oLoading&&othersList.length>0">
290
-                          <div [sortablejs]="othersList" [sortablejsOptions]="othersListOptions">
290
+                          <div [sortablejs]="othersList" [sortablejsOptions]="othersListOptions" class="w100">
291 291
                             <div class="otherBox-nav__mainItem" *ngFor="let item of othersList"
292
-                              (click)="otherClick(item)" [ngClass]="{active:selectOtherId == item.id}">{{item.taskName}}
292
+                              (click)="otherClick(item)" [ngClass]="{active:selectOtherId == item.id}"
293
+                              [title]="item.taskName">{{item.taskName}}
293 294
                             </div>
294 295
                           </div>
295 296
                         </div>
@@ -303,151 +304,179 @@
303 304
                       </overlay-scrollbars>
304 305
                     </div>
305 306
                     <div class="otherBox-main">
306
-                      <div class="otherBox-main__head"
307
-                        *ngIf='buildMsg.status==100013||buildMsg.status==100014||buildMsg.status==100015'
308
-                        [innerHTML]="buildMsg.msg"></div>
309 307
                       <div class="otherBox-main__main">
310 308
                         <!-- -----------------start------------------ -->
311
-                        <overlay-scrollbars #osComponentRef3 class="modalBody" *ngIf="!nLoading&&selectOtherId">
312
-                          <div class="modalBody" style="min-height: calc(100vh - 321px);height:auto;">
313
-                            <div
314
-                              style="flex:1;display: flex;flex-direction: column;justify-content: center;align-items: center;">
315
-                              <!-- 200 该任务类型运送过程暂未配置 -->
316
-                              <div class="content txtC" *ngIf="buildMsg.status==200&&buildType=='bb'">
317
-                                <div class="defeat" [innerHTML]="buildMsg.msg"></div>
318
-                              </div>
319
-                              <!-- 100009 该任务类型运送过程暂未配置 -->
320
-                              <div class="content txtC" *ngIf="buildMsg.status==100009">
321
-                                <div class="defeat" [innerHTML]="buildMsg.msg"></div>
322
-                              </div>
323
-                              <!-- 100010 系统未查询到该任务类型关联信息 -->
324
-                              <div class="content txtC" *ngIf="buildMsg.status==100010">
325
-                                <div class="defeat" [innerHTML]="buildMsg.msg"></div>
326
-                              </div>
327
-                              <!-- 100012 (护士端一键建单展示策略)直接取msg -->
328
-                              <div class="content txtC" *ngIf="buildMsg.status==100012">
329
-                                <div class="defeat" [innerHTML]="buildMsg.msg"></div>
330
-                              </div>
331
-                              <!-- 100013 (护士端一键建单展示策略)取起点科室,和mgs值展示 -->
332
-                              <div class="content" *ngIf='buildMsg.status==100013'>
333
-                                <div>
334
-                                  <form nz-form [formGroup]="shortcutForm" class="shortcutForm">
335
-                                    <nz-form-item>
336
-                                      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="originOffice">起点科室
337
-                                      </nz-form-label>
338
-                                      <nz-form-control nzErrorTip="请选择起点科室!">
339
-                                        <nz-select class="w100" formControlName="originOffice"
340
-                                          [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
341
-                                          (nzOnSearch)="searchDept('start',buildMsg,$event)" nzPlaceHolder="请选择起点科室">
342
-                                          <ng-container *ngFor="let option of buildMsg.start.start.list">
343
-                                            <nz-option *ngIf="true" [nzLabel]="option.dept" [nzValue]="option.id">
344
-                                            </nz-option>
345
-                                          </ng-container>
346
-                                          <nz-option *ngIf="false" nzDisabled nzCustomContent>
347
-                                            <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
348
-                                          </nz-option>
349
-                                        </nz-select>
350
-                                      </nz-form-control>
351
-                                    </nz-form-item>
352
-                                  </form>
309
+                        <div class="modalBody_box">
310
+                          <div class="modalBody">
311
+                            <div class="modalBody_left" *ngIf="!nLoading&&selectOtherId">
312
+                              <overlay-scrollbars class="modalBody_left_box" #osComponentRef3
313
+                                style="height: calc(100vh - 263px);">
314
+                                <div class="modalBody_left_box">
315
+                                  <div
316
+                                    style="flex:1;display: flex;flex-direction: column;justify-content: center;align-items: center;">
317
+                                    <div class="content txtC"
318
+                                      *ngIf='buildMsg.status==100013||buildMsg.status==100014||buildMsg.status==100015'>
319
+                                      <div class="defeat" [innerHTML]="buildMsg.msg"></div>
320
+                                    </div>
321
+                                    <!-- 200 该任务类型运送过程暂未配置 -->
322
+                                    <div class="content txtC" *ngIf="buildMsg.status==200&&buildType=='bb'">
323
+                                      <div class="defeat" [innerHTML]="buildMsg.msg"></div>
324
+                                    </div>
325
+                                    <!-- 100009 该任务类型运送过程暂未配置 -->
326
+                                    <div class="content txtC" *ngIf="buildMsg.status==100009">
327
+                                      <div class="defeat" [innerHTML]="buildMsg.msg"></div>
328
+                                    </div>
329
+                                    <!-- 100010 系统未查询到该任务类型关联信息 -->
330
+                                    <div class="content txtC" *ngIf="buildMsg.status==100010">
331
+                                      <div class="defeat" [innerHTML]="buildMsg.msg"></div>
332
+                                    </div>
333
+                                    <!-- 100012 (护士端一键建单展示策略)直接取msg -->
334
+                                    <div class="content txtC" *ngIf="buildMsg.status==100012">
335
+                                      <div class="defeat" [innerHTML]="buildMsg.msg"></div>
336
+                                    </div>
337
+                                    <!-- 100013 (护士端一键建单展示策略)取起点科室,和mgs值展示 -->
338
+                                    <div class="content" *ngIf='buildMsg.status==100013'>
339
+                                      <div>
340
+                                        <form nz-form [formGroup]="shortcutForm" class="shortcutForm">
341
+                                          <nz-form-item>
342
+                                            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="originOffice">起点科室
343
+                                            </nz-form-label>
344
+                                            <nz-form-control nzErrorTip="请选择起点科室!">
345
+                                              <nz-select class="w100" formControlName="originOffice"
346
+                                                [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
347
+                                                (nzOnSearch)="searchDept('start',buildMsg,$event)"
348
+                                                nzPlaceHolder="请选择起点科室">
349
+                                                <ng-container *ngFor="let option of buildMsg.start.start.list">
350
+                                                  <nz-option *ngIf="true" [nzLabel]="option.dept" [nzValue]="option.id">
351
+                                                  </nz-option>
352
+                                                </ng-container>
353
+                                                <nz-option *ngIf="false" nzDisabled nzCustomContent>
354
+                                                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
355
+                                                </nz-option>
356
+                                              </nz-select>
357
+                                            </nz-form-control>
358
+                                          </nz-form-item>
359
+                                        </form>
360
+                                      </div>
361
+                                    </div>
362
+                                    <!-- 100014 (护士端一键建单展示策略)取终点科室和msg 值展示 -->
363
+                                    <div class="content" *ngIf='buildMsg.status==100014'>
364
+                                      <div>
365
+                                        <form nz-form [formGroup]="shortcutForm" class="shortcutForm">
366
+                                          <nz-form-item>
367
+                                            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="targetOffice">目标科室
368
+                                            </nz-form-label>
369
+                                            <nz-form-control nzErrorTip="请选择目标科室!">
370
+                                              <nz-select class="w100" formControlName="targetOffice"
371
+                                                [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
372
+                                                (nzOnSearch)="searchDept('target',buildMsg,$event)" nzAllowClear
373
+                                                nzPlaceHolder="请选择目标科室">
374
+                                                <ng-container *ngFor="let option of buildMsg.end.end.list">
375
+                                                  <nz-option *ngIf="true" [nzLabel]="option.dept" [nzValue]="option.id">
376
+                                                  </nz-option>
377
+                                                </ng-container>
378
+                                                <nz-option *ngIf="false" nzDisabled nzCustomContent>
379
+                                                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
380
+                                                </nz-option>
381
+                                              </nz-select>
382
+                                            </nz-form-control>
383
+                                          </nz-form-item>
384
+                                        </form>
385
+                                      </div>
386
+                                    </div>
387
+                                    <!-- 100015 (护士端一键建单展策略)起点科室和终点科室下拉展示 -->
388
+                                    <div class="content" *ngIf='buildMsg.status==100015'>
389
+                                      <div>
390
+                                        <form nz-form [formGroup]="shortcutForm" class="shortcutForm">
391
+                                          <nz-form-item>
392
+                                            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="originOffice">起点科室
393
+                                            </nz-form-label>
394
+                                            <nz-form-control nzErrorTip="请选择起点科室!">
395
+                                              <nz-select class="w100" formControlName="originOffice"
396
+                                                [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
397
+                                                (nzOnSearch)="searchDept('start',buildMsg,$event)"
398
+                                                nzPlaceHolder="请选择起点科室">
399
+                                                <ng-container *ngFor="let option of buildMsg.start.start.list">
400
+                                                  <nz-option *ngIf="true" [nzLabel]="option.dept" [nzValue]="option.id">
401
+                                                  </nz-option>
402
+                                                </ng-container>
403
+                                                <nz-option *ngIf="false" nzDisabled nzCustomContent>
404
+                                                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
405
+                                                </nz-option>
406
+                                              </nz-select>
407
+                                            </nz-form-control>
408
+                                          </nz-form-item>
409
+                                          <nz-form-item>
410
+                                            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="targetOffice">目标科室
411
+                                            </nz-form-label>
412
+                                            <nz-form-control nzErrorTip="请选择目标科室!">
413
+                                              <nz-select class="w100" formControlName="targetOffice"
414
+                                                [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
415
+                                                (nzOnSearch)="searchDept('target',buildMsg,$event)"
416
+                                                nzPlaceHolder="请选择目标科室">
417
+                                                <ng-container *ngFor="let option of buildMsg.end.end.list">
418
+                                                  <nz-option *ngIf="true" [nzLabel]="option.dept" [nzValue]="option.id">
419
+                                                  </nz-option>
420
+                                                </ng-container>
421
+                                                <nz-option *ngIf="false" nzDisabled nzCustomContent>
422
+                                                  <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
423
+                                                </nz-option>
424
+                                              </nz-select>
425
+                                            </nz-form-control>
426
+                                          </nz-form-item>
427
+                                        </form>
428
+                                      </div>
429
+                                    </div>
430
+                                    <!-- 工单备注: -->
431
+                                    <div style="width: 100%;margin: 10px auto 0;" *ngIf="buildMsg.remarksSwitch == 1">
432
+                                      <p>工单备注:</p>
433
+                                      <textarea nz-input [placeholder]="workOrderRemarkTips"
434
+                                        [nzAutosize]="{ minRows: 3, maxRows: 5 }" maxlength="100"
435
+                                        [(ngModel)]="workOrderRemark" #remarksEle></textarea>
436
+                                      <p class="mt8 mb8" *ngIf="customRemarks.length">快捷输入:</p>
437
+                                      <div *ngIf="customRemarks.length">
438
+                                        <span class="addRemarks" *ngFor="let item of customRemarks"
439
+                                          (click)="addRemarks(item)">【{{item}}】</span>
440
+                                      </div>
441
+                                      <p class="mt8 mb8" *ngIf="historyCustomRemarks.length">历史输入:</p>
442
+                                      <div *ngIf="historyCustomRemarks.length">
443
+                                        <span class="addRemarks" *ngFor="let item of historyCustomRemarks"
444
+                                          (click)="addRemarks(item)">【{{item}}】</span>
445
+                                      </div>
446
+                                    </div>
447
+                                  </div>
448
+                                  <div *ngIf="selectOtherId" class="btns display_flex justify-content_flex-center">
449
+                                    <button *ngIf="buildMsg.status!=100009&&buildMsg.status!=100010" nz-button
450
+                                      nzType="primary" [nzLoading]="loading5" (click)="confirmShortcut()">确认</button>
451
+                                  </div>
353 452
                                 </div>
354
-                              </div>
355
-                              <!-- 100014 (护士端一键建单展示策略)取终点科室和msg 值展示 -->
356
-                              <div class="content" *ngIf='buildMsg.status==100014'>
357
-                                <div>
358
-                                  <form nz-form [formGroup]="shortcutForm" class="shortcutForm">
359
-                                    <nz-form-item>
360
-                                      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="targetOffice">目标科室
361
-                                      </nz-form-label>
362
-                                      <nz-form-control nzErrorTip="请选择目标科室!">
363
-                                        <nz-select class="w100" formControlName="targetOffice"
364
-                                          [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
365
-                                          (nzOnSearch)="searchDept('target',buildMsg,$event)" nzAllowClear
366
-                                          nzPlaceHolder="请选择目标科室">
367
-                                          <ng-container *ngFor="let option of buildMsg.end.end.list">
368
-                                            <nz-option *ngIf="true" [nzLabel]="option.dept" [nzValue]="option.id">
369
-                                            </nz-option>
370
-                                          </ng-container>
371
-                                          <nz-option *ngIf="false" nzDisabled nzCustomContent>
372
-                                            <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
373
-                                          </nz-option>
374
-                                        </nz-select>
375
-                                      </nz-form-control>
376
-                                    </nz-form-item>
377
-                                  </form>
378
-                                </div>
379
-                              </div>
380
-                              <!-- 100015 (护士端一键建单展策略)起点科室和终点科室下拉展示 -->
381
-                              <div class="content" *ngIf='buildMsg.status==100015'>
382
-                                <div>
383
-                                  <form nz-form [formGroup]="shortcutForm" class="shortcutForm">
384
-                                    <nz-form-item>
385
-                                      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="originOffice">起点科室
386
-                                      </nz-form-label>
387
-                                      <nz-form-control nzErrorTip="请选择起点科室!">
388
-                                        <nz-select class="w100" formControlName="originOffice"
389
-                                          [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
390
-                                          (nzOnSearch)="searchDept('start',buildMsg,$event)" nzPlaceHolder="请选择起点科室">
391
-                                          <ng-container *ngFor="let option of buildMsg.start.start.list">
392
-                                            <nz-option *ngIf="true" [nzLabel]="option.dept" [nzValue]="option.id">
393
-                                            </nz-option>
394
-                                          </ng-container>
395
-                                          <nz-option *ngIf="false" nzDisabled nzCustomContent>
396
-                                            <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
397
-                                          </nz-option>
398
-                                        </nz-select>
399
-                                      </nz-form-control>
400
-                                    </nz-form-item>
401
-                                    <nz-form-item>
402
-                                      <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="targetOffice">目标科室
403
-                                      </nz-form-label>
404
-                                      <nz-form-control nzErrorTip="请选择目标科室!">
405
-                                        <nz-select class="w100" formControlName="targetOffice"
406
-                                          [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch
407
-                                          (nzOnSearch)="searchDept('target',buildMsg,$event)" nzPlaceHolder="请选择目标科室">
408
-                                          <ng-container *ngFor="let option of buildMsg.end.end.list">
409
-                                            <nz-option *ngIf="true" [nzLabel]="option.dept" [nzValue]="option.id">
410
-                                            </nz-option>
411
-                                          </ng-container>
412
-                                          <nz-option *ngIf="false" nzDisabled nzCustomContent>
413
-                                            <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
414
-                                          </nz-option>
415
-                                        </nz-select>
416
-                                      </nz-form-control>
417
-                                    </nz-form-item>
418
-                                  </form>
453
+                              </overlay-scrollbars>
454
+                            </div>
455
+                            <div class="modalBody_left nLoading" *ngIf="nLoading">
456
+                              <img src="../../../assets/images/loading.gif" alt="">
457
+                              <div>加载中...</div>
458
+                            </div>
459
+                            <div class="modalBody_left noData" *ngIf="!nLoading&&!selectOtherId">
460
+                              暂无数据
461
+                            </div>
462
+                            <div class="modalBody_right">
463
+                              <div class="modalBody_right_head">综合日志<span>{{logTime}}秒后自动刷新</span></div>
464
+                              <overlay-scrollbars class="modalBody_right_box" #osComponentRef9 style="height: 100%;"
465
+                                *ngIf="!rLoading&&listDeptOrderRecords.length">
466
+                                <div class="modalBody_right_box">
467
+                                  <div class="modalBody_right_list" *ngFor="let item of listDeptOrderRecords">
468
+                                    {{item.msg}}</div>
419 469
                                 </div>
470
+                              </overlay-scrollbars>
471
+                              <div class="modalBody_left nLoading w100" *ngIf="rLoading">
472
+                                <img src="../../../assets/images/loading.gif" alt="">
473
+                                <div>加载中...</div>
420 474
                               </div>
421
-                              <!-- 工单备注: -->
422
-                              <div style="width: 410px;margin: 10px auto 0;" *ngIf="buildMsg.remarksSwitch == 1">
423
-                                <p>工单备注:</p>
424
-                                <textarea nz-input [placeholder]="workOrderRemarkTips"
425
-                                  [nzAutosize]="{ minRows: 3, maxRows: 5 }" maxlength="100"
426
-                                  [(ngModel)]="workOrderRemark" #remarksEle></textarea>
427
-                                <p class="mt8 mb8" *ngIf="customRemarks.length">快捷输入:</p>
428
-                                <div *ngIf="customRemarks.length">
429
-                                  <span class="addRemarks" *ngFor="let item of customRemarks"
430
-                                    (click)="addRemarks(item)">【{{item}}】</span>
431
-                                </div>
432
-                                <p class="mt8 mb8" *ngIf="historyCustomRemarks.length">历史输入:</p>
433
-                                <div *ngIf="historyCustomRemarks.length">
434
-                                  <span class="addRemarks" *ngFor="let item of historyCustomRemarks"
435
-                                    (click)="addRemarks(item)">【{{item}}】</span>
436
-                                </div>
475
+                              <div class="modalBody_left noData w100" *ngIf="!rLoading&&!listDeptOrderRecords.length">
476
+                                暂无数据
437 477
                               </div>
438 478
                             </div>
439
-                            <div *ngIf="selectOtherId" class="btns display_flex justify-content_flex-center">
440
-                              <button *ngIf="buildMsg.status!=100009&&buildMsg.status!=100010" nz-button
441
-                                nzType="primary" [nzLoading]="loading5" (click)="confirmShortcut()">确认</button>
442
-                            </div>
443 479
                           </div>
444
-                        </overlay-scrollbars>
445
-                        <div class="modalBody nLoading" *ngIf="nLoading">
446
-                          <img src="../../../assets/images/loading.gif" alt="">
447
-                          <div>加载中...</div>
448
-                        </div>
449
-                        <div class="modalBody noData" *ngIf="!nLoading&&!selectOtherId">
450
-                          暂无数据
451 480
                         </div>
452 481
                         <!-- -----------------end------------------ -->
453 482
                       </div>

+ 69 - 13
src/app/views/hushijiandan/hushijiandan.component.less

@@ -264,7 +264,7 @@
264 264
       border: 1px solid #dde1e5;
265 265
       display: flex;
266 266
       .otherBox-nav {
267
-        width: 210px;
267
+        width: 20%;
268 268
         border-right: 1px solid #dde1e5;
269 269
         display: flex;
270 270
         flex-direction: column;
@@ -274,8 +274,9 @@
274 274
           flex-direction: column;
275 275
           justify-content: flex-end;
276 276
           align-items: center;
277
+          padding-left: 8px;
278
+          padding-right: 8px;
277 279
           input {
278
-            width: 192px;
279 280
             height: 36px;
280 281
           }
281 282
         }
@@ -299,13 +300,15 @@
299 300
               margin-top: 0;
300 301
             }
301 302
             .otherBox-nav__mainItem {
302
-              width: 180px;
303 303
               line-height: 26px;
304 304
               color: #333;
305 305
               padding-left: 8px;
306 306
               margin-bottom: 8px;
307 307
               border-radius: 4px;
308 308
               cursor: pointer;
309
+              overflow: hidden;
310
+              text-overflow: ellipsis;
311
+              white-space: nowrap;
309 312
               &.active {
310 313
                 color: @primary-color;
311 314
                 background-color: #f0f6ed;
@@ -318,13 +321,6 @@
318 321
         flex: 1;
319 322
         display: flex;
320 323
         flex-direction: column;
321
-        .otherBox-main__head {
322
-          height: 50px;
323
-          border-bottom: 1px solid #dde1e5;
324
-          display: flex;
325
-          justify-content: center;
326
-          align-items: center;
327
-        }
328 324
         .otherBox-main__main {
329 325
           position: relative;
330 326
           flex: 1;
@@ -333,6 +329,11 @@
333 329
             width: 100%;
334 330
             height: 100%;
335 331
             display: flex;
332
+          }
333
+          .modalBody_left {
334
+            width: 50%;
335
+            height: 100%;
336
+            display: flex;
336 337
             flex-direction: column;
337 338
             justify-content: space-between;
338 339
             &.nLoading,
@@ -346,21 +347,76 @@
346 347
                 display: inline-block;
347 348
               }
348 349
             }
350
+          }
351
+          .modalBody_left_box {
352
+            height: calc(100vh - 279px);
353
+            box-sizing: border-box;
354
+            padding: 8px;
355
+            display: flex;
356
+            flex-direction: column;
357
+            justify-content: space-between;
358
+          }
359
+          .modalBody_right_head {
360
+            font-size: 16px;
361
+            font-weight: bold;
362
+            border-bottom: 1px solid #dde1e5;
363
+            padding-bottom: 8px;
364
+            display: flex;
365
+            justify-content: space-between;
366
+            span{
367
+              font-weight: normal;
368
+              font-size: 14px;
369
+              color: @primary-color;
370
+            }
371
+          }
372
+          .modalBody_right_box {
373
+            box-sizing: border-box;
374
+            padding: 0 8px;
375
+            display: flex;
376
+            flex-direction: column;
377
+            justify-content: center;
378
+          }
379
+          .modalBody_right {
380
+            width: 50%;
381
+            height: 100%;
382
+            display: flex;
383
+            flex-direction: column;
384
+            justify-content: center;
385
+            border-left: 1px solid #dde1e5;
386
+            padding: 8px;
387
+            .modalBody_right_list {
388
+              text-align: justify;
389
+              border-bottom: 1px solid #dde1e5;
390
+              padding: 8px 0;
391
+            }
392
+          }
393
+          .modalBody_box {
394
+            position: absolute;
395
+            width: 100%;
396
+            height: 100%;
397
+            display: flex;
398
+            flex-direction: column;
399
+            justify-content: space-between;
400
+
349 401
             .content {
402
+              width: 100%;
350 403
               display: flex;
351 404
               flex-direction: column;
352 405
               justify-content: center;
353 406
               align-items: center;
407
+              & > div {
408
+                width: 100%;
409
+              }
354 410
               .shortcutForm {
355
-                width: 410px;
411
+                width: 100%;
356 412
                 .ant-form-item-label {
357 413
                   text-align: left;
358 414
                 }
359 415
               }
360 416
             }
361 417
             .btns {
362
-              margin-bottom: 16px;
363
-              margin-top: 16px;
418
+              padding-bottom: 16px;
419
+              padding-top: 16px;
364 420
             }
365 421
           }
366 422
         }

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

@@ -74,6 +74,11 @@ export class HushijiandanComponent implements OnInit {
74 74
     static: false,
75 75
   })
76 76
   osComponentRef8: OverlayScrollbarsComponent;
77
+  @ViewChild("osComponentRef9", {
78
+    read: OverlayScrollbarsComponent,
79
+    static: false,
80
+  })
81
+  osComponentRef9: OverlayScrollbarsComponent;
77 82
   othersListOptions: any;
78 83
   sortableTimer = null;
79 84
   searchTabInpSubject = new Subject(); //左侧查患者信息和检查信息防抖
@@ -113,6 +118,9 @@ export class HushijiandanComponent implements OnInit {
113 118
   timerCloseTime = null;
114 119
   changeShow = true;
115 120
   currentHospital; //当前院区
121
+  logTimer = null; //综合日志定时器
122
+  logTime = 0; //综合日志自动刷新秒数
123
+  logTimeConst = 30; //综合日志自动刷新秒数
116 124
   ngOnInit() {
117 125
     //防抖
118 126
     this.searchTabInpSubject.pipe(debounceTime(500)).subscribe((v) => {
@@ -133,6 +141,15 @@ export class HushijiandanComponent implements OnInit {
133 141
     this.refreshSpecimenWorkOrderMsg();
134 142
     this.initRole();
135 143
     this.getWebsocket();
144
+    this.listDeptOrderRecord();
145
+    this.logTime = this.logTimeConst;
146
+    this.logTimer = setInterval(() => {
147
+      this.logTime--;
148
+      if (this.logTime === 0) {
149
+        this.logTime = this.logTimeConst;
150
+        this.listDeptOrderRecord();
151
+      }
152
+    }, 1000);
136 153
   }
137 154
   ngOnDestroy() {
138 155
     console.log("关闭护士端", this.webs.ws);
@@ -181,6 +198,20 @@ export class HushijiandanComponent implements OnInit {
181 198
     this.remarksEle.nativeElement.focus();
182 199
     this.workOrderRemark += item;
183 200
   }
201
+  //获取综合日志
202
+  rLoading = false;
203
+  listDeptOrderRecords: any = [];
204
+  listDeptOrderRecord() {
205
+    this.rLoading = true;
206
+    this.mainService
207
+      .listDeptOrderRecord({ deptId: this.loginUserDeptId })
208
+      .subscribe((result) => {
209
+        this.rLoading = false;
210
+        if (result["status"] == 200) {
211
+          this.listDeptOrderRecords = result["data"].slice(0, 15);
212
+        }
213
+      });
214
+  }
184 215
   // 查看标本历史记录
185 216
   historyPromptModalShow = false; //标本历史记录弹窗开关
186 217
   scode = ""; //查看历史记录携带