拉取代码

src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component.ts

@@ -321,25 +321,28 @@ export class ConfigurationSpecimenComponent implements OnInit {
         this.loading = false;
         if (result.status == 200) {
           this.configs = result.list[0] || {};
-					// 病理标本
-					this.autoCreate[0].checked = this.configs.autoCreate == 1;
-					this.outpatientCreatePathologyForm[0].checked = this.configs.outpatientCreatePathologyForm == 1;
-					this.outpatientInVitroFixation[0].checked = this.configs.outpatientInVitroFixation == 1;
-					this.pathologyBarCode = this.configs.pathologyBarCode;
-					this.outpatientPathologyLabelSize = this.configs.outpatientPathologyLabelSize.id; //门诊病理标签样式
-					this.surgeryPathologyLabelSize = this.configs.surgeryPathologyLabelSize.id //手术病理标签样式
-					// 检查标本
-          this.deptNotAlert[0].checked = this.configs.deptNotAlert == 1;
-          this.arriveScanCode[0].checked = this.configs.arriveScanCode == 1;
-          this.arriveScanDynamicCode[0].checked = this.configs.arriveScanDynamicCode == 1;
-					this.enterDynamicDigitalKey[0].checked = this.configs.enterDynamicDigitalKey == 1;
-					this.returnSpecimenWhetherHandover[0].checked = this.configs.returnSpecimenWhetherHandover == 1;
-          this.bigScanShowSignBtn[0].checked = this.configs.bigScanShowSignBtn == 1;
-          this.bigScanArriveNotOwner[0].checked = this.configs.bigScanArriveNotOwner == 1;
-          this.bigScanShowCreateBtn[0].checked = this.configs.bigScanShowCreateBtn == 1;
-          this.defaultScanSpe[0].checked = this.configs.defaultScanSpe == 1;
-          this.deptNotAlertIds = this.configs.deptNotAlertIds ? this.configs.deptNotAlertIds.split(',').map(v => +v) : [];
-          this.deptList = this.configs.deptNotAlertList || [];
+					if(this.activeDictionaryKey=='examine'){
+						// 检查标本
+						this.deptNotAlert[0].checked = this.configs.deptNotAlert == 1;
+						this.arriveScanCode[0].checked = this.configs.arriveScanCode == 1;
+						this.arriveScanDynamicCode[0].checked = this.configs.arriveScanDynamicCode == 1;
+						this.enterDynamicDigitalKey[0].checked = this.configs.enterDynamicDigitalKey == 1;
+						this.returnSpecimenWhetherHandover[0].checked = this.configs.returnSpecimenWhetherHandover == 1;
+						this.bigScanShowSignBtn[0].checked = this.configs.bigScanShowSignBtn == 1;
+						this.bigScanArriveNotOwner[0].checked = this.configs.bigScanArriveNotOwner == 1;
+						this.bigScanShowCreateBtn[0].checked = this.configs.bigScanShowCreateBtn == 1;
+						this.defaultScanSpe[0].checked = this.configs.defaultScanSpe == 1;
+						this.deptNotAlertIds = this.configs.deptNotAlertIds ? this.configs.deptNotAlertIds.split(',').map(v => +v) : [];
+						this.deptList = this.configs.deptNotAlertList || [];
+					}else{
+						// 病理标本
+						this.autoCreate[0].checked = this.configs.autoCreate == 1;
+						this.outpatientCreatePathologyForm[0].checked = this.configs.outpatientCreatePathologyForm == 1;
+						this.outpatientInVitroFixation[0].checked = this.configs.outpatientInVitroFixation == 1;
+						this.pathologyBarCode = this.configs.pathologyBarCode;
+						this.outpatientPathologyLabelSize = this.configs.outpatientPathologyLabelSize.id; //门诊病理标签样式
+						this.surgeryPathologyLabelSize = this.configs.surgeryPathologyLabelSize.id //手术病理标签样式
+					}
         }
       });
   }