解决冲突

src/app/components/configurationCenter/configuration-inspect/configuration-inspect-inspects/configuration-inspect-inspects.component.html

@@ -12,8 +12,8 @@
                 </nz-select>
               </div>
               <div class="list-template__searchItem">
-                <span class="label">检查科室</span>：
-                <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择检查科室" [(ngModel)]="queryData.extra4" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeDeptInp($event)" (nzOpenChange)="openChangeDept($event)" (ngModelChange)="setIsSelecting(true)">
+                <span class="label label--big">默认检查科室</span>：
+                <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择默认检查科室" [(ngModel)]="queryData.extra4" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeDeptInp($event)" (nzOpenChange)="openChangeDept($event)" (ngModelChange)="setIsSelecting(true)">
                   <ng-container *ngFor="let option of deptList">
                     <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
                   </ng-container>
@@ -26,6 +26,13 @@
                 <span class="label">项目名称</span>：
                 <input nz-input class="formItem" placeholder="请输入项目名称" [(ngModel)]="queryData.name" />
               </div>
+              <div class="list-template__searchItem">
+                <span class="label">是否初始化</span>：
+                <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择是否初始化" [(ngModel)]="queryData.extra8" nzAllowClear>
+                  <nz-option nzLabel="已初始化" nzValue="1"></nz-option>
+                  <nz-option nzLabel="未初始化" nzValue="0"></nz-option>
+                </nz-select>
+              </div>
             </div>
             <div nz-col nzXl="7" class="list-template__btns">
               <button nz-button class="btn default" (click)="addWechatModal()">新增</button>
@@ -38,17 +45,17 @@
             <thead>
               <tr class="thead">
                 <th nzWidth="20%">排序号</th>
-                <th nzWidth="20%">项目名称</th>
-                <th nzWidth="20%">检查科室</th>
+                <th nzWidth="20%">检查项目标识</th>
+                <th nzWidth="20%">检查项目名称</th>
                 <th nzWidth="20%">检查类型</th>
                 <th nzWidth="20%">操作</th>
               </tr>
             </thead>
             <tbody>
               <tr *ngFor="let data of dataList;let i = index">
-                <td>{{data.orders}}</td>
+                <td><span class="circleWrap"><span class="circle" [ngClass]="{ red: data.extra8 != 1 }" title="未初始化"></span>{{data.orders}}</span></td>
+                <td>{{data.extra6}}</td>
                 <td>{{data.name}}</td>
-                <td>{{data.extra4DTO?.dept}}</td>
                 <td>{{data.extra5DTO?.name}}</td>
                 <td>
                   <div class="coop">
@@ -97,9 +104,17 @@
           </nz-form-control>
         </nz-form-item>
         <nz-form-item>
-          <nz-form-label [nzSpan]="6" nzRequired nzFor="extra4">检查科室</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择检查科室!">
-            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="extra4" nzPlaceHolder="请选择检查科室" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeDeptInp($event)" (nzOpenChange)="openChangeDept($event)" (ngModelChange)="setIsSelecting(true)">
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="extra6">项目标识</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请输入项目标识!">
+            <nz-input-group>
+              <input formControlName="extra6" nz-input placeholder="请输入项目标识">
+            </nz-input-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="extra4">默认检查科室</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择默认检查科室!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="extra4" nzPlaceHolder="请选择默认检查科室" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeDeptInp($event)" (nzOpenChange)="openChangeDept($event)" (ngModelChange)="setIsSelecting(true)">
               <ng-container *ngFor="let option of deptList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
               </ng-container>
@@ -110,9 +125,9 @@
           </nz-form-control>
         </nz-form-item>
         <nz-form-item>
-          <nz-form-label [nzSpan]="6" nzRequired nzFor="extra5">检查项目</nz-form-label>
-          <nz-form-control [nzSpan]="18" nzErrorTip="请选择检查项目!">
-            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="extra5" nzPlaceHolder="请选择检查项目" nzServerSearch>
+          <nz-form-label [nzSpan]="6" nzRequired nzFor="extra5">检查类型</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择检查类型!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="extra5" nzPlaceHolder="请选择检查类型" nzServerSearch>
               <ng-container *ngFor="let data of typeList">
                 <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
               </ng-container>
@@ -122,6 +137,19 @@
             </nz-select>
           </nz-form-control>
         </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzFor="extra7">检查科室</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择检查科室!">
+            <nz-select nzMode="multiple" [nzDropdownMatchSelectWidth]="false" formControlName="extra7" nzPlaceHolder="请选择检查科室" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeDeptsInp($event)" (nzOpenChange)="openChangeDepts($event)" (ngModelChange)="setIsSelecting(true)">
+              <ng-container *ngFor="let option of deptsList">
+                <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
       </form>
     </div>
     <div class=" display_flex justify-content_flex-center">

src/app/components/configurationCenter/configuration-inspect/configuration-inspect-inspects/configuration-inspect-inspects.component.less

@@ -16,6 +16,21 @@
     height: 100%!important;
     padding: 0!important;
   }
+  .circleWrap{
+    position: relative;
+    .circle{
+      width: 8px;
+      height: 8px;
+      border-radius: 50%;
+      position: absolute;
+      top: 50%;
+      left: -8px;
+      transform: translate(-50%,-50%);
+      &.red{
+        background-color: red;
+      }
+    }
+  }
   .content{
     flex: 1;
     min-height: 0;

src/app/components/configurationCenter/configuration-inspect/configuration-inspect-inspects/configuration-inspect-inspects.component.ts

@@ -61,10 +61,13 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
     this.coopData = data;
     this.validateForm.controls.orders.setValue(data.orders);
     this.validateForm.controls.name.setValue(data.name);
+    this.validateForm.controls.extra6.setValue(data.extra6);
     this.validateForm.controls.extra4.setValue(data.extra4DTO ? data.extra4DTO.id : null);
     this.validateForm.controls.extra5.setValue(data.extra5DTO ? data.extra5DTO.id : null);
+    this.validateForm.controls.extra7.setValue(data.deptList ? data.deptList.map(v => v.id) : []);
 
     data.extra4DTO && (this.deptList = [data.extra4DTO]);
+    data.deptList && (this.deptsList = data.deptList);
   }
 
   // 新增/编辑表单提交
@@ -112,8 +115,11 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
           desc: "检查项目",
           orders: this.validateForm.value.orders,
           name: this.validateForm.value.name,
+          extra6: this.validateForm.value.extra6,
           extra4: this.validateForm.value.extra4,
           extra5: this.validateForm.value.extra5,
+          extra7: this.validateForm.value.extra7.toString(),
+          extra8: '1',
         // }
       };
     } else {
@@ -124,8 +130,10 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
           ...{
             orders: this.validateForm.value.orders,
             name: this.validateForm.value.name,
+            extra6: this.validateForm.value.extra6,
             extra4: this.validateForm.value.extra4,
             extra5: this.validateForm.value.extra5,
+            extra7: this.validateForm.value.extra7.toString(),
           }
         // }
       };
@@ -155,8 +163,10 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
     this.validateForm = this.fb.group({
       orders: [null, [Validators.required]],
       name: [null, [Validators.required]],
+      extra6: [null, [Validators.required]],
       extra4: [null, [Validators.required]],
       extra5: [null, [Validators.required]],
+      extra7: [[]],
     });
   }
 
@@ -177,9 +187,10 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
       sum: 9999,
       dictionary: {
         key: "inspect_check_type",
-        name: this.queryData.name,
-        extra4: this.queryData.extra4,
-        extra5: this.queryData.extra5,
+        name: this.queryData.name || undefined,
+        extra4: this.queryData.extra4 || undefined,
+        extra5: this.queryData.extra5 || undefined,
+        extra8: this.queryData.extra8 || undefined,
       },
     };
     this.loading1 = true;
@@ -222,7 +233,7 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
     this.searchTimer(this.getDeptList, e);
   }
 
-  // 获取检查科室
+  // 获取默认检查科室
   deptList: any = [];
   getDeptList(e = undefined) {
     let postData = {
@@ -243,6 +254,37 @@ export class ConfigurationInspectInspectsComponent implements OnInit {
       });
   }
 
+  openChangeDepts(flag){
+    flag && this.setIsSelecting(false);
+    flag && this.getDeptsList();
+  }
+
+  // 科室搜索
+  changeDeptsInp(e) {
+    this.searchTimer(this.getDeptsList, e);
+  }
+
+  // 获取检查科室
+  deptsList: any = [];
+  getDeptsList(e = undefined) {
+    let postData = {
+      idx: 0,
+      sum: 20,
+      department: {
+        searchType: 1,// 简单查询
+        cascadeHosId: this.hosId,
+        dept: e,
+      }
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("simple/data", "department", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.deptsList = data.list || [];
+      });
+  }
+
   // 获取检查类型
   typeList: any = [];
   getTypes() {

src/app/components/configurationCenter/configuration-message/configuration-message.component.html

@@ -58,12 +58,12 @@
         </span>
       </div>
       <div class="message_tab">
-        <div class="tab" *ngFor="let item of tabs;let i = index;" (click)="selectTab(i)" [ngClass]="{ active: i == currentIndex }">
+        <div class="tab" *ngFor="let item of tabs;let i = index;" (click)="selectTab(i)" [ngClass]="{ active: i == currentIndex }" [hidden]="item.hidden">
           <label nz-checkbox [(ngModel)]="item.checkboxFlag" (ngModelChange)="selectThis($event, i)"></label><span class="ml8">{{item.tabName}}</span>
         </div>
       </div>
       <div class="message_body">
-        <div class="message_body_list" *ngFor="let item of tabs;let i = index;" [hidden]="i != currentIndex">
+        <div class="message_body_list" *ngFor="let item of tabs;let i = index;" [hidden]="item.hidden && i != currentIndex">
           <div class="message_body_list_title" *ngIf="!(i == 1)">
             <span>通知标题：</span><input nz-input placeholder="请输入通知标题" [(ngModel)]="item.processTitle" [disabled]="item.disable" />
           </div>
@@ -74,7 +74,7 @@
             <span style="visibility: hidden">变量名称{{currentIndex}}：</span>
             <p>备注：[$变量名称$]可添加<em *ngFor="let v of varArr;let first = first;let last = last;"><span (click)="writeIn(item, v, $event, 'processContent')">{{v}}</span><i *ngIf="!last">、</i><i *ngIf="last">。</i></em></p>
           </div>
-          <div class="message_body_list_wechatConfig" *ngIf="currentIndex == 2">
+          <!-- <div class="message_body_list_wechatConfig" *ngIf="currentIndex == 2">
             <span><i class="icon_transport transport-required red"></i>配置类型：</span>
             <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzAllowClear [(ngModel)]="editData.wechatConfigTypeId"
               nzPlaceHolder="请选择微信配置类型" nzServerSearch>
@@ -85,7 +85,7 @@
                 <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
               </nz-option>
             </nz-select>
-          </div>
+          </div> -->
           <div class="message_body_list_title">
             <span><i class="icon_transport transport-required red"></i>是否开启：</span>
             <nz-radio-group [(ngModel)]="editData.flag">

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

@@ -1,4 +1,4 @@
-import { Component, OnInit } from "@angular/core";
+import { Component, OnInit, Input } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
 import { MainService } from "../../../services/main.service";
 import { ToolService } from 'src/app/services/tool.service';
@@ -10,6 +10,7 @@ import { NzMessageService } from 'ng-zorro-antd';
   styleUrls: ["./configuration-message.component.less"],
 })
 export class ConfigurationMessageComponent implements OnInit {
+  @Input() wechatConfigTypeValue: string;
   constructor(
     private route: ActivatedRoute,
     private mainService: MainService,
@@ -43,36 +44,7 @@ export class ConfigurationMessageComponent implements OnInit {
   tabs = []
 
   //变量参数
-  varArr = [
-    "[$报修单号$]",
-    "[$报修科室$]",
-    "[$报修时间$]",
-    "[$报修人$]",
-    "[$详细地址$]",
-    "[$不受理时间$]",
-    "[$不受理原因$]",
-    "[$故障描述$]",
-    "[$服务台人员$]",
-    "[$受理时间$]",
-    "[$事件单号$]",
-    "[$地点$]",
-    "[$区域$]",
-    "[$学工号$]",
-    "[$联系人电话$]",
-    "[$受理人$]",
-    "[$受理人电话$]",
-    "[$处理人$]",
-    "[$处理人电话$]",
-    "[$指派人$]",
-    "[$转派人$]",
-    "[$延期原因$]",
-    "[$进入系统$]",
-    "[$回访满意度$]",
-    "[$回访备注$]",
-    "[$回访处理结果$]",
-    "[$评价满意度$]",
-    "[$评价内容$]",
-  ];
+  varArr = [];
 
   // 写入
   writeIn(tab, content, event, type){
@@ -124,31 +96,103 @@ export class ConfigurationMessageComponent implements OnInit {
         wechatConfigTypeId: data.wechatConfigType ? data.wechatConfigType.id : null,//微信配置类型
     };
 
-    this.tabs = [
-      {
-        tabName: "站内消息",
-        processTitle: this.editData.messageStationTitle,
-        processContent: this.editData.messageStationContent,
-        checkboxFlag: this.editData.messageStationFlag,
-        disable: !this.editData.messageStationFlag,
-      },
-      {
-        tabName: "短信",
-        processTitle: '',
-        processContent: this.editData.shortMessageContent,
-        checkboxFlag: this.editData.shortMessageFlag,
-        disable: !this.editData.shortMessageFlag,
-      },
-      {
-        tabName: "微信",
-        processTitle: this.editData.wechatMessageTitle,
-        processContent: this.editData.wechatMessageContent,
-        checkboxFlag: this.editData.wechatMessageFlag,
-        disable: !this.editData.wechatMessageFlag,
-      }
-    ];
+    if(this.wechatConfigTypeValue === 'hsms'){
+      // 转运
+      this.tabs = [
+        {
+          tabName: "站内消息",
+          processTitle: this.editData.messageStationTitle,
+          processContent: this.editData.messageStationContent,
+          checkboxFlag: this.editData.messageStationFlag,
+          disable: !this.editData.messageStationFlag,
+          hidden: true,
+        },
+        {
+          tabName: "短信",
+          processTitle: '',
+          processContent: this.editData.shortMessageContent,
+          checkboxFlag: this.editData.shortMessageFlag,
+          disable: !this.editData.shortMessageFlag,
+          hidden: true,
+        },
+        {
+          tabName: "微信",
+          processTitle: this.editData.wechatMessageTitle,
+          processContent: this.editData.wechatMessageContent,
+          checkboxFlag: this.editData.wechatMessageFlag,
+          disable: !this.editData.wechatMessageFlag,
+          hidden: false,
+        }
+      ];
+
+      this.varArr = [
+        "[$患者信息$]",
+        "[$建单人$]",
+      ];
 
-    this.currentIndex = 0;
+      this.currentIndex = 2;
+    }else if(this.wechatConfigTypeValue === 'mdv2_handle'){
+      // 运维
+      this.tabs = [
+        {
+          tabName: "站内消息",
+          processTitle: this.editData.messageStationTitle,
+          processContent: this.editData.messageStationContent,
+          checkboxFlag: this.editData.messageStationFlag,
+          disable: !this.editData.messageStationFlag,
+          hidden: false,
+        },
+        {
+          tabName: "短信",
+          processTitle: '',
+          processContent: this.editData.shortMessageContent,
+          checkboxFlag: this.editData.shortMessageFlag,
+          disable: !this.editData.shortMessageFlag,
+          hidden: false,
+        },
+        {
+          tabName: "微信",
+          processTitle: this.editData.wechatMessageTitle,
+          processContent: this.editData.wechatMessageContent,
+          checkboxFlag: this.editData.wechatMessageFlag,
+          disable: !this.editData.wechatMessageFlag,
+          hidden: false,
+        }
+      ];
+
+      this.varArr = [
+        "[$报修单号$]",
+        "[$报修科室$]",
+        "[$报修时间$]",
+        "[$报修人$]",
+        "[$详细地址$]",
+        "[$不受理时间$]",
+        "[$不受理原因$]",
+        "[$故障描述$]",
+        "[$服务台人员$]",
+        "[$受理时间$]",
+        "[$事件单号$]",
+        "[$地点$]",
+        "[$区域$]",
+        "[$学工号$]",
+        "[$联系人电话$]",
+        "[$受理人$]",
+        "[$受理人电话$]",
+        "[$处理人$]",
+        "[$处理人电话$]",
+        "[$指派人$]",
+        "[$转派人$]",
+        "[$延期原因$]",
+        "[$进入系统$]",
+        "[$回访满意度$]",
+        "[$回访备注$]",
+        "[$回访处理结果$]",
+        "[$评价满意度$]",
+        "[$评价内容$]",
+      ];
+
+      this.currentIndex = 0;
+    }
   }
 
   //tab页面切换
@@ -267,7 +311,10 @@ export class ConfigurationMessageComponent implements OnInit {
       idx: 0,
       sum: 9999,
       messageManager: {
-        "noticeProcess": 1
+        "noticeProcess": 1,
+        "wechatConfigType": {
+          value: this.wechatConfigTypeValue,
+        },
       },
     };
     this.loading1 = true;

src/app/components/configurationCenter/configuration-message/configuration-message.module.ts

@@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+import { ConfigurationMessageComponent } from './configuration-message.component';
+import { ShareModule } from 'src/app/share/share.module';
+
+
+@NgModule({
+  declarations: [
+    ConfigurationMessageComponent,
+  ],
+  imports: [
+    CommonModule,
+    ShareModule,
+  ],
+  exports: [
+    ConfigurationMessageComponent,
+  ]
+})
+export class ConfigurationMessageModule { }

src/app/type/types.ts

@@ -16,6 +16,7 @@ export interface baseUrlType {
   specimenViewHost: string; //业务视图地址
   bigScreenHost: string; //大屏地址地址
   bigScreenHost2: string; //大屏地址2地址
+  bigScreenHost3: string; //大屏地址3地址
   homeWs: string; //websocket首页地址
   mainWs: string; //websocket管理端地址
   nurseWs: string; //websocket护士端地址

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

@@ -22,7 +22,7 @@
   </ng-container>
   <!-- 消息通知 -->
   <ng-container *ngIf="activeTagLink === 'incidentConfigMessage'">
-    <app-configuration-message></app-configuration-message>
+    <app-configuration-message wechatConfigTypeValue="mdv2_handle"></app-configuration-message>
   </ng-container>
 	<!-- 工时管理 -->
 	<ng-container *ngIf="activeTagLink === 'incidentConfigManHour'">

src/app/views/incident-config/incident-config.module.ts

@@ -8,9 +8,9 @@ import { ConfigurationCategoryComponent } from 'src/app/components/configuration
 import { ConfigurationPriorityComponent } from 'src/app/components/configurationCenter/configuration-priority/configuration-priority.component';
 import { ConfigurationManHourComponent } from 'src/app/components/configurationCenter/configuration-manHour/configuration-manHour.component';
 import { ConfigurationDeptUserComponent } from 'src/app/components/configurationCenter/configuration-deptUser/configuration-deptUser.component';
-import { ConfigurationMessageComponent } from 'src/app/components/configurationCenter/configuration-message/configuration-message.component';
 import { ConfigurationHospitalComponent } from 'src/app/components/configurationCenter/configuration-hospital/configuration-hospital.component';
 import { ConfigurationDictionaryModule } from 'src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.module';
+import { ConfigurationMessageModule } from 'src/app/components/configurationCenter/configuration-message/configuration-message.module';
 import { ConfigurationCommonFaultsComponent } from 'src/app/components/configurationCenter/configuration-commonFaults/configuration-commonFaults.component';
 import { ConfigurationSysComponent } from 'src/app/components/configurationCenter/configuration-sys/configuration-sys.component';
 
@@ -22,7 +22,6 @@ import { ConfigurationSysComponent } from 'src/app/components/configurationCente
     ConfigurationPriorityComponent,
 		ConfigurationManHourComponent,
 		ConfigurationDeptUserComponent,
-    ConfigurationMessageComponent,
     ConfigurationHospitalComponent,
     ConfigurationCommonFaultsComponent,
 		ConfigurationSysComponent
@@ -32,6 +31,7 @@ import { ConfigurationSysComponent } from 'src/app/components/configurationCente
     IncidentConfigRoutingModule,
     ShareModule,
     ConfigurationDictionaryModule,
+    ConfigurationMessageModule,
   ]
 })
 export class IncidentConfigModule { }

src/app/views/inspect-and-patient-transport-config/inspect-and-patient-transport-config.component.html

@@ -162,6 +162,11 @@
           <nz-form-label class="label">是否开启护士端追加检查</nz-form-label>
           <nz-checkbox-group [(ngModel)]="nurseAppendInspect"></nz-checkbox-group>
         </div>
+        <!-- 是否支持签到并转派 -->
+        <div class="display_flex align-items_center mb8">
+          <nz-form-label class="label">是否支持签到并转派</nz-form-label>
+          <nz-checkbox-group [(ngModel)]="signReassign"></nz-checkbox-group>
+        </div>
         <!-- 检查预约不进行工单合并 -->
         <!-- <div class="display_flex align-items_center mb8">
           <nz-form-label class="label">检查预约不进行工单合并</nz-form-label>

src/app/views/inspect-and-patient-transport-config/inspect-and-patient-transport-config.component.ts

@@ -96,6 +96,10 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
   nurseAppendInspect:any[] = [
     {label:'是否开启',value: 0}
   ];
+  // 是否支持签到并转派
+  signReassign:any[] = [
+    {label:'是否开启',value: 0}
+  ];
   // 检查预约不进行工单合并
   // yyInspectMergeOrder:any[] = [
   //   {label:'是否开启',value: 0}
@@ -297,6 +301,7 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
       enableGoods: this.enableGoods[0].checked ? 1 : 0,
       enableTripType: this.enableTripType[0].checked ? 1 : 0,
       nurseAppendInspect: this.nurseAppendInspect[0].checked ? 1 : 0,
+      signReassign: this.signReassign[0].checked ? 1 : 0,
       // yyInspectMergeOrder: this.yyInspectMergeOrder[0].checked ? 1 : 0,
       addService: this.addService[0].checked ? 1 : 0,
       addServiceTaskIds: this.addServiceTaskIds.length ? this.addServiceTaskIds.toString() : undefined,
@@ -428,6 +433,7 @@ export class InspectAndPatientTransportConfigComponent implements OnInit {
           this.enableGoods[0].checked = this.configs.enableGoods == 1;
           this.enableTripType[0].checked = this.configs.enableTripType == 1;
           this.nurseAppendInspect[0].checked = this.configs.nurseAppendInspect == 1;
+          this.signReassign[0].checked = this.configs.signReassign == 1;
           // this.yyInspectMergeOrder[0].checked = this.configs.yyInspectMergeOrder == 1;
           this.addService[0].checked = this.configs.addService == 1;
           this.addServiceTaskIds = this.configs.addServiceTaskIds ? this.configs.addServiceTaskIds.split(',').map(v => +v) : [];

src/app/views/main/main.component.html

@@ -42,13 +42,14 @@
           <i class="icon_transport transport-tongji-2 green" *ngIf="newStatisticsRole" (click)="toNewStatistics()" nz-tooltip nzTooltipTitle="统计"></i>
           <i class="icon_transport transport-shangban green" *ngIf='PCCommutesToWork && userInfo.user && !userInfo.user.online' (click)="GoWork()" nz-tooltip nzTooltipTitle="我要上班"></i>
           <i class="icon_transport transport-shangban green" *ngIf='PCCommutesToWork && userInfo.user && userInfo.user.online' (click)="GoWork()" nz-tooltip nzTooltipTitle="我要下班"></i>
-          <div class="dropdown" *ngIf="pharmacyRole || largeScreenRole || largeScreenRole2 || specimenViewRole || specimenViewRole2 || specimenRoomView || pathology || disinfectionSupplyRole || sampling || communicationBook || realtimeBroadcastRole || inspectClosedLoopViewRole">
+          <div class="dropdown" *ngIf="pharmacyRole || largeScreenRole || largeScreenRole2 || largeScreenRole3 || specimenViewRole || specimenViewRole2 || specimenRoomView || pathology || disinfectionSupplyRole || sampling || communicationBook || realtimeBroadcastRole || inspectClosedLoopViewRole">
             <i class="icon_transport transport-gengduoda-copy" (mouseenter)="showDropdown1 = true" (mouseleave)="showDropdown1 = false"></i>
             <div class="dropdown-content ct" [hidden]="!showDropdown1" (mouseenter)="showDropdown1 = true" (mouseleave)="showDropdown1 = false">
               <div class="dropdownItem" *ngIf="pharmacyRole" (click)="toPharmacy()">药房端</div>
               <div class="dropdownItem" *ngIf="pharmacyRole" (click)="toPharmacy2()">药房端2</div>
               <div class="dropdownItem" *ngIf="largeScreenRole" (click)="toBigScreen('largeScreen')">大屏端</div>
               <div class="dropdownItem" *ngIf="largeScreenRole2" (click)="toBigScreen('largeScreen2')">大屏端2</div>
+              <div class="dropdownItem" *ngIf="largeScreenRole3" (click)="toBigScreen('largeScreen3')">大屏端3</div>
               <div class="dropdownItem" *ngIf="specimenViewRole" (click)="toBigScreen('specimenView')">业务视图</div>
               <div class="dropdownItem" *ngIf="specimenViewRole2" (click)="toSpecimenView2()">标本视图</div>
               <div class="dropdownItem" *ngIf="specimenRoomView" (click)="toSpecimenRoomView()">标本间端</div>
@@ -508,7 +509,7 @@
 						</div>
 					</overlay-scrollbars>
 				</div>
-			
+
 				<!-- 近期维修 start -->
 				<div class="cots_body weifenpai" *ngIf="currentRTab == 2" [ngClass]="{ top185: hurseInfoHiding != 1 }">
 					<overlay-scrollbars #osComponentRef16 [ngStyle]="{ height: '100%' }">

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

@@ -22,6 +22,16 @@
   <ng-container *ngIf="activeTagLink === 'pageConfigInspect'">
     <app-configuration-inspect></app-configuration-inspect>
   </ng-container>
+
+  <!-- 数据字典 -->
+  <ng-container *ngIf="activeTagLink === 'pageConfigDictionary'">
+    <app-configuration-dictionary [dictionaryKeyList]="dictionaryKeyList"></app-configuration-dictionary>
+  </ng-container>
+
+  <!-- 消息通知 -->
+  <ng-container *ngIf="activeTagLink === 'pageConfigMessage'">
+    <app-configuration-message wechatConfigTypeValue="hsms"></app-configuration-message>
+  </ng-container>
 </div>
 
 

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

@@ -16,6 +16,11 @@ export class PageConfigComponent implements OnInit, AfterViewInit {
     // { id: 1, name: '标本',},
   ];
 
+  // 数据字典
+  dictionaryKeyList:any[] = [
+    { id: 1, name: '检查类型', key: "inspect_check_item"},
+  ]
+
   ngOnInit(): void {}
 
   ngAfterViewInit(){

src/app/views/page-config/page-config.module.ts

@@ -7,6 +7,8 @@ import { ShareModule } from 'src/app/share/share.module';
 import { ConfigurationSpecimenComponent } from 'src/app/components/configurationCenter/configuration-specimen/configuration-specimen.component';
 import { ConfigurationDrugComponent } from 'src/app/components/configurationCenter/configuration-drug/configuration-drug.component';
 import { ConfigurationInspectModule } from 'src/app/components/configurationCenter/configuration-inspect/configuration-inspect.module';
+import { ConfigurationDictionaryModule } from 'src/app/components/configurationCenter/configuration-dictionary/configuration-dictionary.module';
+import { ConfigurationMessageModule } from 'src/app/components/configurationCenter/configuration-message/configuration-message.module';
 
 
 @NgModule({
@@ -20,6 +22,8 @@ import { ConfigurationInspectModule } from 'src/app/components/configurationCent
     PageConfigRoutingModule,
     ShareModule,
     ConfigurationInspectModule,
+    ConfigurationDictionaryModule,
+    ConfigurationMessageModule,
   ]
 })
 export class PageConfigModule { }

src/assets/js/http.ts

@@ -10,6 +10,7 @@ const baseUrl: baseUrlType = {
   specimenViewHost: `${protocolName}//${domainName}:${port}/specimenView`, //业务视图地址
   bigScreenHost: `${protocolName}//${domainName}:${port}/largeScreen`, //大屏地址地址
   bigScreenHost2: `${protocolName}//${domainName}:${port}/largeScreen2`, //大屏地址2地址
+  bigScreenHost3: `${protocolName}//${domainName}:${port}/largeScreen3`, //大屏地址3地址
   homeWs: `${wsName}://${domainName}:${port}/webSocket/index`, //websocket首页地址
   mainWs: `${wsName}://${domainName}:${port}/webSocket/message/manage`, //websocket管理端地址
   nurseWs: `${wsName}://${domainName}:${port}/webSocket/message/nurse`, //websocket护士端地址