快捷建单增加院区选择，系统配置增加是否显示报修的开关

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

@@ -146,6 +146,7 @@ export class HushijiandanComponent implements OnInit {
         this.deptDisplay = result.list[0].valueconfig;
       }
     });
+    this.getItsmIncident();
     this.getUpdateTipsForNurses();
     this.getSpecimenButton();
     this.getCloseTimeFlag();
@@ -366,6 +367,22 @@ export class HushijiandanComponent implements OnInit {
   closeExecModal() {
     this.execModal = false;
   }
+  // 获取系统配置，护士端是否显示报修
+  isShowBx = false;
+  getItsmIncident() {
+    let postData = {
+      idx: 0,
+      sum: 1,
+      systemConfiguration: { keyconfig: "itsmIncident" },
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "systemConfiguration", postData)
+      .subscribe((result) => {
+        if (result.status == 200) {
+          this.isShowBx = result.list[0].valueconfig == 1;
+        }
+      });
+  }
   // 获取护士端更新提示
   updateTipsForNurses = "";
   getUpdateTipsForNurses() {
@@ -2424,7 +2441,6 @@ export class HushijiandanComponent implements OnInit {
 
   // 页面中间部分tab切换
   checkedTableType: string = "other";
-  isShowBx = false;
   checkTable(type) {
     this.checkedTableType = type;
     if (type === "historySpecimen") {

src/app/views/shortcut-build-orders/shortcut-build-orders.component.html

@@ -6,7 +6,7 @@
           <span class="label label--big">快捷建单名称：</span>
           <input nz-input class="formItem" placeholder="请输入关键字" [(ngModel)]="searchCriteria.name" />
         </div>
-        <div class="list-template__searchItem">
+        <!-- <div class="list-template__searchItem">
           <span class="label">起点科室：</span>
           <nz-select [nzDropdownMatchSelectWidth]="false" class="formItem" nzServerSearch nzShowSearch nzAllowClear
             nzPlaceHolder="请选择起点科室" [(ngModel)]="searchCriteria.startDepartment"
@@ -18,7 +18,7 @@
               <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
             </nz-option>
           </nz-select>
-        </div>
+        </div> -->
       </div>
       <div nz-col nzXl="12" class="list-template__btns">
         <button nz-button class="btn default" (click)='reset()'>重置</button>
@@ -99,6 +99,20 @@
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="startDepartmentHospital">起点科室院区</nz-form-label>
+            <nz-form-control nzErrorTip="请选择起点科室院区!">
+              <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="startDepartmentHospital" nzShowSearch
+                nzAllowClear nzPlaceHolder="请选择起点科室院区" nzServerSearch (ngModelChange)="changeStartHospital($event)">
+                <ng-container *ngFor="let data of userInfo.infoPermission.hospitals">
+                  <nz-option *ngIf="!isLoading" nzLabel="{{data.hosName}}" nzValue="{{data.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>
+          <nz-form-item>
             <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="startDepartment">起点科室</nz-form-label>
             <nz-form-control nzErrorTip="请选择起点科室!">
               <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="startDepartment" nzShowSearch
@@ -114,6 +128,20 @@
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="endDepartmentHospital">终点科室院区</nz-form-label>
+            <nz-form-control nzErrorTip="请选择终点科室院区!">
+              <nz-select [nzDropdownMatchSelectWidth]="false" formControlName="endDepartmentHospital" nzShowSearch
+                nzAllowClear nzPlaceHolder="请选择终点科室院区" nzServerSearch (ngModelChange)="changeEndHospital($event)">
+                <ng-container *ngFor="let data of userInfo.infoPermission.hospitals">
+                  <nz-option *ngIf="!isLoading" nzLabel="{{data.hosName}}" nzValue="{{data.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>
+          <nz-form-item>
             <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired nzFor="endDepartment">终点科室</nz-form-label>
             <nz-form-control nzErrorTip="请选择终点科室!">
               <nz-select [nzMode]="'multiple'" [nzDropdownMatchSelectWidth]="false" formControlName="endDepartment"

src/app/views/shortcut-build-orders/shortcut-build-orders.component.less

@@ -107,7 +107,7 @@
         width: 100%;
         height: auto;
         padding: 18px 14px 0 14px;
-        max-height: 497px;
+        max-height: 550px;
         overflow-y: auto;
 
         .addForm {

src/app/views/shortcut-build-orders/shortcut-build-orders.component.ts

@@ -235,6 +235,16 @@ export class ShortcutBuildOrdersComponent implements OnInit {
     this.isLoading = true;
     this.changeInpSubject.next([dept, type]);
   }
+  // 修改起点科室院区
+  changeStartHospital(e){
+    console.log(e);
+    this.validateForm.controls.startDepartment.setValue(null);
+  }
+  // 修改终点科室院区
+  changeEndHospital(e){
+    console.log(e);
+    this.validateForm.controls.endDepartment.setValue(null);
+  }
   // 搜索科室
   snum = 0;
   searchDepartment(dept, type) {
@@ -249,9 +259,25 @@ export class ShortcutBuildOrdersComponent implements OnInit {
       idx: 0,
       sum: 20,
     };
+    if (type === "form") {
+      if(this.validateForm.value.startDepartmentHospital){
+        data.department.hospital.id = this.validateForm.value.startDepartmentHospital;
+      }else{
+        this.department = [];
+        this.isLoading = false;
+        return;
+      }
+    }
     // 终点科室的科室类型为检验科
     if (type === "formEnd") {
       data.department.type.id = 282;
+      if(this.validateForm.value.endDepartmentHospital){
+        data.department.hospital.id = this.validateForm.value.endDepartmentHospital;
+      }else{
+        this.department1 = [];
+        this.isLoading = false;
+        return;
+      }
     }
     this.snum++;
     this.mainService
@@ -348,7 +374,9 @@ export class ShortcutBuildOrdersComponent implements OnInit {
     this.validateForm = this.fb.group({
       roundRobinName: [null, [Validators.required]],
       roundRobinType: [null, [Validators.required]],
+      startDepartmentHospital: [null, [Validators.required]],
       startDepartment: [null, [Validators.required]],
+      endDepartmentHospital: [null, [Validators.required]],
       endDepartment: [null, [Validators.required]],
     });
     this.validateForm.controls.roundRobinType.setValue(
@@ -417,6 +445,8 @@ export class ShortcutBuildOrdersComponent implements OnInit {
     this.coopId = data.id;
     this.createUser = data.createUserName; //创建人
     this.validateForm.controls.roundRobinName.setValue(data.title); //名称
+    this.validateForm.controls.startDepartmentHospital.setValue(data.startDeptHosId.toString());//起点科室院区
+    this.validateForm.controls.endDepartmentHospital.setValue(data.targetDeptHosId.toString());//终点科室院区
     let taskType$ = this.mainService.getFetchDataList(
       "configuration",
       "taskType",
@@ -437,7 +467,7 @@ export class ShortcutBuildOrdersComponent implements OnInit {
     startDeptArr.push({ id: startDept, dept: startDeptShow });
     let startDept$ = this.mainService.getFetchDataList("data", "department", {
       department: {
-        hospital: { id: data.hospital },
+        hospital: { id: data.startDeptHosId },
         type: { id: 383 }, //科室类型为中转科室
       },
       idx: 0,
@@ -453,7 +483,7 @@ export class ShortcutBuildOrdersComponent implements OnInit {
     });
     let targetDept$ = this.mainService.getFetchDataList("data", "department", {
       department: {
-        hospital: { id: data.hospital },
+        hospital: { id: data.targetDeptHosId },
         type: { id: 282 },
       },
       idx: 0,

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

@@ -112,6 +112,16 @@
               [nzAutosize]="{ minRows: 3, maxRows: 3 }" maxlength="50"></textarea>
           </nz-form-control>
         </nz-form-item>
+        <nz-form-item class="formItem">
+          <nz-form-label [nzSpan]="12" nzFor="itsmIncident" nzRequired class="label">护士端是否显示报修
+          </nz-form-label>
+          <nz-form-control [nzSpan]="12" nzErrorTip="护士端是否显示报修是必填项!">
+            <nz-radio-group formControlName="itsmIncident">
+              <label nz-radio nzValue="1">是</label>
+              <label nz-radio nzValue="0">否</label>
+            </nz-radio-group>
+          </nz-form-control>
+        </nz-form-item>
       </div>
     </form>
   </overlay-scrollbars>

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

@@ -42,6 +42,7 @@ export class SysConfigComponent implements OnInit {
       specimenButton: [null, [Validators.required]],
       deptDisplay: [null, [Validators.required]],
       orderClearUserSwitch: [null, [Validators.required]],
+      itsmIncident: [null, [Validators.required]],
       workOrderSettings: [5, [Validators.required]],
       nurseDeptSwitchTip: [0, [Validators.required]],
       updateTipsForNurses: [""],
@@ -103,6 +104,7 @@ export class SysConfigComponent implements OnInit {
         item.keyconfig === "specimenButton" ||
         item.keyconfig === "deptDisplay" ||
         item.keyconfig === "orderClearUserSwitch" ||
+        item.keyconfig === "itsmIncident" ||
         item.keyconfig === "workOrderSettings" ||
         item.keyconfig === "nurseDeptSwitchTip" ||
         item.keyconfig === "updateTipsForNurses" ||
@@ -121,6 +123,9 @@ export class SysConfigComponent implements OnInit {
       } else if (item.keyconfig === "orderClearUserSwitch") {
         item.valueconfig =
           this.validateForm.controls.orderClearUserSwitch.value;
+      } else if (item.keyconfig === "itsmIncident") {
+        item.valueconfig =
+          this.validateForm.controls.itsmIncident.value;
       } else if (item.keyconfig === "workOrderSettings") {
         item.valueconfig = this.validateForm.controls.workOrderSettings.value;
       } else if (item.keyconfig === "nurseDeptSwitchTip") {
@@ -194,6 +199,11 @@ export class SysConfigComponent implements OnInit {
                     c[1]
                   );
                   break;
+                case "itsmIncident":
+                  this.validateForm.controls.itsmIncident.setValue(
+                    c[1]
+                  );
+                  break;
                 case "workOrderSettings":
                   this.validateForm.controls.workOrderSettings.setValue(c[1]);
                   break;