seimin hai 1 ano
pai
achega
3314b6ccfe

+ 1 - 1
proxy.conf.json

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

+ 1 - 1
src/app/share/relationTrans-detail-modal/relationTrans-detail-modal.component.html

@@ -33,7 +33,7 @@
33
             <td>{{ data.extra5 || '' }}</td>
33
             <td>{{ data.extra5 || '' }}</td>
34
             <td>{{ data.extra1Time | date:"yyyy-MM-dd" }}<br>{{ data.extra1Time | date:"HH:mm:ss" }}</td>
34
             <td>{{ data.extra1Time | date:"yyyy-MM-dd" }}<br>{{ data.extra1Time | date:"HH:mm:ss" }}</td>
35
             <td>{{ data.code || '' }}</td>
35
             <td>{{ data.code || '' }}</td>
36
-            <td>{{ data.startDept || '' }}</td>
36
+            <td>{{ data.startDeptDTO ? (deptDisplay == 2 ? data.startDeptDTO.deptalias : data.startDeptDTO.dept) : '' }}</td>
37
           </tr>
37
           </tr>
38
         </tbody>
38
         </tbody>
39
       </nz-table>
39
       </nz-table>

+ 4 - 0
src/app/share/relationTrans-detail-modal/relationTrans-detail-modal.component.ts

@@ -12,6 +12,7 @@ export class RelationTransDetailModalComponent implements OnInit {
12
   listOfDisplayData: any[] = [];
12
   listOfDisplayData: any[] = [];
13
   mapOfCheckedId: { [key: string]: boolean } = {};
13
   mapOfCheckedId: { [key: string]: boolean } = {};
14
   isIndeterminate = false;
14
   isIndeterminate = false;
15
+  currentDept; //当前科室
15
 
16
 
16
   hosId;
17
   hosId;
17
   hsLoading = false;
18
   hsLoading = false;
@@ -24,6 +25,7 @@ export class RelationTransDetailModalComponent implements OnInit {
24
     specimenDesc: 0,
25
     specimenDesc: 0,
25
   }
26
   }
26
   @Input() show: Boolean;
27
   @Input() show: Boolean;
28
+  @Input() deptDisplay: string | number;
27
   @Input() otherBindConfigDto: any;
29
   @Input() otherBindConfigDto: any;
28
 
30
 
29
   @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性,当事件发生时,子组件利用该属性 emits(向上弹射)事件
31
   @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性,当事件发生时,子组件利用该属性 emits(向上弹射)事件
@@ -33,6 +35,7 @@ export class RelationTransDetailModalComponent implements OnInit {
33
 
35
 
34
   ngOnInit() {
36
   ngOnInit() {
35
     this.hosId = this.tool.getCurrentHospital().id;
37
     this.hosId = this.tool.getCurrentHospital().id;
38
+    this.currentDept = this.tool.getCurrentUserDept();
36
     this.tabType = 1;
39
     this.tabType = 1;
37
     this.getOtherTransState();
40
     this.getOtherTransState();
38
   }
41
   }
@@ -127,6 +130,7 @@ export class RelationTransDetailModalComponent implements OnInit {
127
         relationTrans: this.otherBindConfigDto.relationTrans,
130
         relationTrans: this.otherBindConfigDto.relationTrans,
128
         hosId: this.hosId,
131
         hosId: this.hosId,
129
         state: this.other_trans_state1,
132
         state: this.other_trans_state1,
133
+        startDept: this.currentDept.id,
130
       }
134
       }
131
     }
135
     }
132
     this.hsLoading = true;
136
     this.hsLoading = true;

+ 1 - 1
src/app/views/hushijiandan/hushijiandan.component.html

@@ -3812,4 +3812,4 @@
3812
 (confirmDelEvent)="confirmLimitTime()" [content]="limitTimeInfo" confirmTxt="继续建单" [isShowConfirm]="isShowConfirm" [isShowConfirmInfo]="isShowConfirmInfo"></app-dialog-delete>
3812
 (confirmDelEvent)="confirmLimitTime()" [content]="limitTimeInfo" confirmTxt="继续建单" [isShowConfirm]="isShowConfirm" [isShowConfirmInfo]="isShowConfirmInfo"></app-dialog-delete>
3813
 
3813
 
3814
 <!-- 关联业务查看 -->
3814
 <!-- 关联业务查看 -->
3815
-<app-relationTrans-detail-modal *ngIf="relationTransModalShow" [show]="relationTransModalShow" [otherBindConfigDto]="otherBindConfigDto" (closeModelHs)="closeModelRelationTrans($event)" (confirmModelHs)="confirmModelRelationTrans($event)"></app-relationTrans-detail-modal>
3815
+<app-relationTrans-detail-modal *ngIf="relationTransModalShow" [show]="relationTransModalShow" [otherBindConfigDto]="otherBindConfigDto" (closeModelHs)="closeModelRelationTrans($event)" (confirmModelHs)="confirmModelRelationTrans($event)" [deptDisplay]="deptDisplay"></app-relationTrans-detail-modal>