浏览代码

bug修复

seimin 1 年之前
父节点
当前提交
fdc7289e31

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

@@ -773,6 +773,7 @@ export class HushijiandanComponent implements OnInit {
773
     this.selectOtherId = item.id;
773
     this.selectOtherId = item.id;
774
     this.newShortcutOrder(item, "other");
774
     this.newShortcutOrder(item, "other");
775
     this.account = null;
775
     this.account = null;
776
+    this.userAccount = null;
776
   }
777
   }
777
   selectIncidentId; //选中的id
778
   selectIncidentId; //选中的id
778
   incidentClick(item) {
779
   incidentClick(item) {
@@ -1308,10 +1309,10 @@ export class HushijiandanComponent implements OnInit {
1308
             that.othersList[v.id] = v.taskTypeList || [];
1309
             that.othersList[v.id] = v.taskTypeList || [];
1309
           }
1310
           }
1310
         })
1311
         })
1311
-        
1312
+
1312
         if (data.data.allTaskTypes) {
1313
         if (data.data.allTaskTypes) {
1313
           that.patientMsgList = [];
1314
           that.patientMsgList = [];
1314
-          
1315
+
1315
           data.data.allTaskTypes.forEach((e) => {
1316
           data.data.allTaskTypes.forEach((e) => {
1316
             if (e.associationType.value == "other") {
1317
             if (e.associationType.value == "other") {
1317
               if(that.othersList['other']){
1318
               if(that.othersList['other']){

+ 1 - 3
src/app/views/qrcode-configuration/qrcode-configuration.service.ts

@@ -52,9 +52,7 @@ export class QRCodeConfigurationService {
52
   queryOtherTasktype({hosId, keywords}){
52
   queryOtherTasktype({hosId, keywords}){
53
     let postData = {
53
     let postData = {
54
       department: {
54
       department: {
55
-        hospital: {
56
-          id: hosId
57
-        },
55
+        cascadeHosId: hosId,
58
         dept: keywords,
56
         dept: keywords,
59
       },
57
       },
60
       idx: 0,
58
       idx: 0,

+ 2 - 1
src/app/views/quick-combination/quick-combination.component.ts

@@ -539,8 +539,9 @@ export class QuickCombinationComponent implements OnInit {
539
   }
539
   }
540
   // 选择科室
540
   // 选择科室
541
   selectDeptList(ids) {
541
   selectDeptList(ids) {
542
-    console.log(ids, this.info.departmentDTOSId);
542
+    console.log(ids);
543
     if (!this.add) {
543
     if (!this.add) {
544
+      console.log(this.info.departmentDTOSId);
544
       this.info.departmentDTOSId = ids;
545
       this.info.departmentDTOSId = ids;
545
     }
546
     }
546
   }
547
   }

+ 1 - 1
src/app/views/tab-custom/tab-custom.component.ts

@@ -147,7 +147,7 @@ export class TabCustomComponent implements OnInit {
147
     this.validateForm = this.fb.group({
147
     this.validateForm = this.fb.group({
148
       title: ['', [Validators.required]],
148
       title: ['', [Validators.required]],
149
       orders: [0, [Validators.required]],
149
       orders: [0, [Validators.required]],
150
-      tabTypeList: [null],
150
+      tabTypeList: [[]],
151
     });
151
     });
152
   }
152
   }
153
   // 表单提交
153
   // 表单提交