院区报修是否开启配置

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-    "target": "http://192.168.3.108",
+    "target": "http://192.168.4.170",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

src/app/views/hospital-config/hospital-config.component.html

@@ -432,6 +432,28 @@
                 </nz-form-control>
               </ng-container>
             </ng-container>
+            <ng-container *ngSwitchCase="'hos_itsmIncident'">
+              <ng-container *ngIf="isHosItsmIncident">
+                <nz-form-label
+                  [nzSpan]="24"
+                  [nzFor]="config.key"
+                  class="label"
+                  [nzRequired]="config.required"
+                  >{{config.desc}}</nz-form-label
+                >
+                <nz-form-control
+                  [nzSpan]="24"
+                  [nzErrorTip]="'请选择!'"
+                >
+                  <nz-radio-group
+                    [formControlName]="config.key"
+                  >
+                    <label nz-radio nzValue="1">是</label>
+                    <label nz-radio nzValue="0">否</label>
+                  </nz-radio-group>
+                </nz-form-control>
+              </ng-container>
+            </ng-container>
             <ng-container *ngSwitchDefault>
               <nz-form-label
                 [nzSpan]="24"

src/app/views/hospital-config/hospital-config.component.ts

@@ -20,6 +20,7 @@ import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
 })
 export class HospitalConfigComponent implements OnInit {
   saveLoading = false;
+  isHosItsmIncident = false;
   hosId;
   validateForm: FormGroup;
   isLoading: boolean = false;
@@ -39,7 +40,7 @@ export class HospitalConfigComponent implements OnInit {
   repairSpecimenStatusMinute = 0; //验证时间
   repairSpecimenStatusCheckDeptIds = []; //验证检验科范围
   allowNucleicAcidPrinting = "0"; //是否允许核酸打印
-  nucleicAcidPrintingTaskType = []; //核酸打印任务类型
+  nucleicAcidPrintingTaskType = null; //核酸打印任务类型
   formatterDollar = (value) => Number(value);
   constructor(
     private mainService: MainService,
@@ -143,7 +144,7 @@ export class HospitalConfigComponent implements OnInit {
         }
         if (config.key === "nucleicAcidPrintingTaskType") {
           this.validateForm.controls[config.key].setValue(
-            config.value ? config.value.split(",").map(Number) : []
+            config.value ? Number(config.value) : null
           );
         }
       });
@@ -169,6 +170,7 @@ export class HospitalConfigComponent implements OnInit {
       this.getClassesList(),
       this.getDeptList2(this.hosId),
       this.getTaskTypeList(),
+      this.getSysConfig(),
     ])
       .then((result) => {
         if (result[0].status == 200) {
@@ -197,12 +199,16 @@ export class HospitalConfigComponent implements OnInit {
         if (result[6].status == 200) {
           this.allTaskTypeList = result[6].list;
         }
+        if (result[7].status == 200) {
+          this.isHosItsmIncident = result[7].list.find(v => v.keyconfig == 'itsmIncident').valueconfig == 1;
+        }
         this.getHospitalConfigList(this.hosId).subscribe((res) => {
           if (res.status == 200) {
             this.hospitalConfigList = res.list;
             //创建表单
             let fbGroup = {};
             this.hospitalConfigList.forEach((item) => {
+              item.show = true;
               if (
                 item.key === "repairSpecimenStatusMinute" ||
                 item.key === "repairSpecimenStatusCheckDeptIds"
@@ -216,8 +222,6 @@ export class HospitalConfigComponent implements OnInit {
                 } else {
                   item.show = false;
                 }
-              } else {
-                item.show = true;
               }
               if (
                 item.key === "nucleicAcidPrintingTaskType"
@@ -231,8 +235,6 @@ export class HospitalConfigComponent implements OnInit {
                 } else {
                   item.show = false;
                 }
-              } else {
-                item.show = true;
               }
               if (item.key.includes("phone_num_port")) {
                 //坐席号码
@@ -378,6 +380,13 @@ export class HospitalConfigComponent implements OnInit {
       .getFetchDataList("configuration", "taskType", postData)
       .toPromise();
   }
+  // 获取系统配置
+  getSysConfig() {
+    let postData: any = { idx: 0, sum: 99 };
+    return this.mainService
+      .getFetchDataList("simple/data", "systemConfiguration", postData)
+      .toPromise();
+  }
   /**
    * 获取科室列表
    * @param hosId 院区id

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -148,6 +148,7 @@ export class HushijiandanComponent implements OnInit {
   deptDisplay; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
 
   ngOnInit() {
+    this.currentHospital = this.tool.getCurrentHospital();
     this.tool.getDeptDisplay().subscribe((result) => {
       if (result.status == 200) {
         this.deptDisplay = result.list[0].valueconfig;
@@ -171,7 +172,6 @@ export class HushijiandanComponent implements OnInit {
       .subscribe((v: string) => {
         this.getIncidentcategory(v);
       });
-    this.currentHospital = this.tool.getCurrentHospital();
 
     this.getTodayNum();
     this.initLogin();
@@ -397,16 +397,10 @@ export class HushijiandanComponent implements OnInit {
   // 获取系统配置，护士端是否显示报修
   isShowBx = false;
   getItsmIncident() {
-    let postData = {
-      idx: 0,
-      sum: 1,
-      systemConfiguration: { keyconfig: "itsmIncident" },
-    };
-    this.mainService
-      .getFetchDataList("simple/data", "systemConfiguration", postData)
-      .subscribe((result) => {
+    let postData = { idx: 0, sum: 100, hospitalConfig: { hosId: this.currentHospital.id } };
+    this.mainService.getFetchDataList("simple/data", "hospitalConfig", postData).subscribe((result) => {
         if (result.status == 200) {
-          this.isShowBx = result.list[0].valueconfig == 1;
+          this.isShowBx = result.list.find(v => v.key == 'hos_itsmIncident').value == 1;
           if (this.isShowBx) {
             this.smallTabs = [
               { id: 1, name: "综合日志" },

src/main.ts

@@ -8,7 +8,7 @@ if (environment.production) {
   enableProdMode();
   if (window) {
     window.console.log = function () { };
-    console.info('v2.4.25');
+    console.info('v2.4.26');
   }
 }
 platformBrowserDynamic().bootstrapModule(AppModule)