浏览代码

7.增加患者信息显示;如果工单包含患者信息则显示患者姓名;护士端;关联类型限制:患者陪检业务、患者其他服务

seimin 3 年之前
父节点
当前提交
fa5ec3172d
共有 2 个文件被更改,包括 10 次插入3 次删除
  1. 1 1
      proxy.conf.json
  2. 9 2
      src/app/views/hushijiandan/hushijiandan.component.html

+ 1 - 1
proxy.conf.json

@@ -1,6 +1,6 @@
1
 {
1
 {
2
   "/service": {
2
   "/service": {
3
-    "target": "http://192.168.3.108",
3
+    "target": "http://192.168.3.87",
4
     "logLevel": "debug",
4
     "logLevel": "debug",
5
     "changeOrigin": true,
5
     "changeOrigin": true,
6
     "pathRewrite": {
6
     "pathRewrite": {

+ 9 - 2
src/app/views/hushijiandan/hushijiandan.component.html

@@ -644,7 +644,13 @@
644
                       <div class="orderItem borderB" *ngFor="let item of orderList">
644
                       <div class="orderItem borderB" *ngFor="let item of orderList">
645
                         <div class="info">
645
                         <div class="info">
646
                           <div class="row" nz-row>
646
                           <div class="row" nz-row>
647
-                            <div nz-col nzSpan="12" class="col txtL">{{item.taskType.taskName}}</div>
647
+                            <div nz-col nzSpan="12" class="col txtL">
648
+                              {{item.taskType.taskName}}
649
+                              <span
650
+                                *ngIf="item.patient&&(item.taskType.associationType.id == 255||item.taskType.associationType.id == 260)">
651
+                                ({{item.patient.patientName}})
652
+                              </span>
653
+                            </div>
648
                             <div nz-col nzSpan="12" class="col txtR">{{item.gdState.name}}</div>
654
                             <div nz-col nzSpan="12" class="col txtR">{{item.gdState.name}}</div>
649
                           </div>
655
                           </div>
650
                           <div class="row" nz-row>
656
                           <div class="row" nz-row>
@@ -653,7 +659,8 @@
653
                             </div>
659
                             </div>
654
                             <div *ngIf="item.showCreateTime" nz-col nzSpan="12" class="col txtR">{{item.showCreateTime}}
660
                             <div *ngIf="item.showCreateTime" nz-col nzSpan="12" class="col txtR">{{item.showCreateTime}}
655
                             </div>
661
                             </div>
656
-                            <div *ngIf="item.yyjdTime" nz-col nzSpan="12" class="col txtR">{{item.yyjdTime|date:'MM-dd HH:mm'}}
662
+                            <div *ngIf="item.yyjdTime" nz-col nzSpan="12" class="col txtR">{{item.yyjdTime|date:'MM-dd
663
+                              HH:mm'}}
657
                             </div>
664
                             </div>
658
                           </div>
665
                           </div>
659
                           <div class="row" nz-row>
666
                           <div class="row" nz-row>