Merge branch 'develop' into lmm

src/app/components/build-quick-confirm/build-quick-confirm.component.html

@@ -1,10 +1,10 @@
 <div class="save add display_flex align-items_center justify-content_flex-center">
-  <div class="modalBody">
-    <div class="title">{{buildQuickConfirmData.name}}<i class="icon_transport transport-guanbi" (click)="cancel()"></i>
+  <div class="modalBody" *ngIf="pagePermissionConfig.id">
+    <div class="title">{{pagePermissionConfig.name}}<i class="icon_transport transport-guanbi" (click)="cancel()"></i>
     </div>
     <div class="contentBody">
       <overlay-scrollbars #osComponentRef1 class="nav">
-        <div class="navItem ellipsis-oneline" [title]="item.taskName" [ngClass]="{ active: activeTabId === item.id }" (click)="clickTab(item)" *ngFor="let item of buildQuickConfirmData.taskTypeList">{{item.taskName}}</div>
+        <div class="navItem ellipsis-oneline" [title]="item.taskName" [ngClass]="{ active: activeTabId === item.id }" (click)="clickTab(item)" *ngFor="let item of pagePermissionConfig.taskTypeList">{{item.taskName}}</div>
       </overlay-scrollbars>
       <div class="body modalBody_box">
         <div class="modalBody_left" *ngIf="!nLoading && activeTabId">
@@ -124,7 +124,7 @@
                   </div>
                 </div>
                 <!-- 其他 （护士端一键建单展策略）起点科室和终点科室下拉展示 -->
-                <div class="content" *ngIf="buildMsg.status != 100013 && buildMsg.status != 100014 && buildMsg.status != 100015">
+                <div class="content" *ngIf="buildMsg.status != 100013 && buildMsg.status != 100014 && buildMsg.status != 100015 && buildMsg.status != 100009 && buildType != 'specimen'">
                   <div>
                     <form nz-form [formGroup]="shortcutForm" class="shortcutForm">
                       <nz-form-item nz-row>
@@ -144,17 +144,23 @@
                 </div>
                 <!-- 工号 -->
                 <div style="width: 100%; margin: 10px auto 0" *ngIf="buildMsg.reserveUserSwitch == 1">
-                  <p><span class="red">*</span>工号：</p>
-                  <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchAccount($event)" nzPlaceHolder="请选择工号" [(ngModel)]="account" (ngModelChange)="changeAccount($event)">
-                    <ng-container *ngFor="let option of accountList">
-                      <nz-option *ngIf="!isLoading" [nzLabel]="option.account + '-' + option.name" [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>
+                  <div nz-row class="tabRow">
+                    <div nz-col [nzSpan]="6">
+                      <p><span class="red">*</span>工号：</p>
+                    </div>
+                    <div nz-col [nzSpan]="14">
+                      <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchAccount($event)" nzPlaceHolder="请选择工号" [(ngModel)]="account" (ngModelChange)="changeAccount($event)">
+                        <ng-container *ngFor="let option of accountList">
+                          <nz-option *ngIf="!isLoading" [nzLabel]="option.account + '-' + option.name" [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>
+                    </div>
+                  </div>
                 </div>
                 <!-- 工单备注： -->
                 <div class="w100" *ngIf="buildMsg.remarksSwitch == 1">
@@ -205,4 +211,10 @@
       <button nzType="primary" nz-button (click)="confirm()" *ngIf="buildMsg.status != 100009 && buildMsg.status != 100010" [nzLoading]="loading5">确认</button>
     </div>
   </div>
+  <div class="modalBody" *ngIf="!pagePermissionConfig.id">
+    <div class="modalBody_left nLoading">
+      <img src="../../../assets/images/loading.gif" alt="" />
+      <div>加载中...</div>
+    </div>
+  </div>
 </div>

src/app/components/build-quick-confirm/build-quick-confirm.component.less

@@ -65,27 +65,6 @@
           color: @primary-color;
           cursor: pointer;
         }
-        .modalBody_left {
-          width: 100%;
-          height: 100%;
-          display: flex;
-          flex-direction: column;
-          justify-content: space-between;
-
-          &.nLoading,
-          &.noData {
-            justify-content: center;
-            align-items: center;
-
-            img {
-              width: 24px;
-            }
-
-            div {
-              display: inline-block;
-            }
-          }
-        }
 
         .modalBody_left_box {
           height: 100%;
@@ -146,3 +125,24 @@
     }
   }
 }
+.modalBody_left {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+
+  &.nLoading,
+  &.noData {
+    justify-content: center;
+    align-items: center;
+
+    img {
+      width: 24px;
+    }
+
+    div {
+      display: inline-block;
+    }
+  }
+}

src/app/components/build-quick-confirm/build-quick-confirm.component.ts

@@ -4,6 +4,8 @@ import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
 import { FormGroup, FormBuilder, FormControl } from '@angular/forms';
 import { MainService } from 'src/app/services/main.service';
 import { ToolService } from 'src/app/services/tool.service';
+import { Subject } from 'rxjs';
+import { debounceTime } from 'rxjs/operators';
 
 @Component({
   selector: 'app-build-quick-confirm',
@@ -21,9 +23,9 @@ export class BuildQuickConfirmComponent implements OnInit {
   @Output() confirmModal = new EventEmitter();
   @Input() buildQuickConfirmData: any = {};//数据
   @Input() loading5: boolean = false;//loading
-  allHospital: any;//所有院区
   hosLoading: boolean = false;//确定按钮的loading
   configurationCenterMenus: any[] = [];//配置中心菜单
+  searchAccountSubject = new Subject(); //查工号防抖
   constructor(
     private mainService: MainService,
     private fb: FormBuilder,
@@ -31,11 +33,12 @@ export class BuildQuickConfirmComponent implements OnInit {
   ) { }
 
   ngOnInit() {
-    this.buildQuickConfirmData.taskTypeList = this.buildQuickConfirmData.taskTypeList || [];
-    if(this.buildQuickConfirmData.taskTypeList.length > 0){
-      this.clickTab(this.buildQuickConfirmData.taskTypeList[0]);
-    }
-    console.log(this.buildQuickConfirmData)
+    this.getPagePermissionConfigById();
+    //防抖
+    this.getAccountList();
+    this.searchAccountSubject.pipe(debounceTime(500)).subscribe((v:any) => {
+      this.getAccountList(v);
+    });
   }
 
   activeTabId:any;
@@ -182,13 +185,76 @@ export class BuildQuickConfirmComponent implements OnInit {
       });
   }
 
+  // 工号输入搜索
+  searchAccount(e) {
+    this.searchAccountSubject.next(e);
+  }
+
+  // 根据工号获取用户
+  account = null;
+  accountList = [];
+  getAccountList(key = ''): void {
+    let postData = {
+      idx: 0,
+      sum: 10,
+      user: {
+        account: key,
+        hospital: {
+          id: this.tool.getCurrentHospital().id
+        }
+      }
+    };
+    this.isLoading = true;
+    this.mainService
+      .getFetchDataList("data", "user", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this.accountList = data.list || [];
+      });
+  }
+
+  // 修改工号
+  userAccount = null;
+  changeAccount(e){
+    this.userAccount =this.accountList.find(v => v.id == e);
+  }
+
+  // 根据ID获取快捷配置
+  pagePermissionConfig: any = {};
+  getPagePermissionConfigById() {
+    let data = {
+			idx: 0,
+			sum: 99999,
+			pagePermissionConfig: {
+        id: this.buildQuickConfirmData.id,
+        taskTypeDeptId: this.tool.getCurrentUserDept().id,
+      },
+		};
+		this.mainService
+			.getFetchDataList("simple/data", "pagePermissionConfig", data)
+			.subscribe((data) => {
+				let pagePermissionConfigList = data.list || [];
+        if(pagePermissionConfigList.length){
+          this.pagePermissionConfig = pagePermissionConfigList[0];
+
+          // 默认选中第一项
+          this.pagePermissionConfig.taskTypeList = this.pagePermissionConfig.taskTypeList || [];
+          if(this.pagePermissionConfig.taskTypeList.length > 0){
+            this.clickTab(this.pagePermissionConfig.taskTypeList[0]);
+          }
+        }else{
+          this.pagePermissionConfig = {};
+        }
+			});
+  }
+
   // 取消
   cancel() {
     this.cancelModal.emit(false)
   }
   // 确认
   confirm() {
-    let taskType = this.buildQuickConfirmData.taskTypeList.find(item => item.id == this.activeTabId);
-    this.confirmModal.emit({taskType, shortcutForm: this.shortcutForm, buildMsg: this.buildMsg, workOrderRemark: this.workOrderRemark})
+    let taskType = this.pagePermissionConfig.taskTypeList.find(item => item.id == this.activeTabId);
+    this.confirmModal.emit({taskType, shortcutForm: this.shortcutForm, buildMsg: this.buildMsg, workOrderRemark: this.workOrderRemark, userAccount: this.userAccount})
   }
 }

src/app/views/hushijiandan/hushijiandan.component.html

@@ -206,7 +206,7 @@
             <div class="cont">
               <div class="top" [ngSwitch]="currentDept.typeValue">
                 <div class="nums borderB" nz-row *ngSwitchCase="'outpatientService'" hidden></div>
-                <div class="nums borderB" nz-row *ngSwitchCase="'surgery'">
+                <div class="nums borderB surgeryNums" nz-row *ngSwitchCase="'surgery'">
                   <!-- 手术未开通 -->
                   <div
                     *ngIf="!deptTaskTypeRules.openPatientTransport && !surgeryLoading"
@@ -353,7 +353,7 @@
                       <div class="navIcon" [ngClass]="backColorComputed(item.icon.extra1)"><i class="icon_transport" [ngClass]="[item.icon.extra1]"></i></div>
                       <div class="navContent">
                         <h2>{{item.name}}</h2>
-                        <div class="navSpecimen" *ngIf="item.urgentFlag || item.ordinaryFlag">
+                        <div class="navSpecimen" *ngIf="(item.urgentFlag || item.ordinaryFlag) && deptTaskTypeRules.openSpecimen">
                           <span *ngIf="item.urgentFlag" (click)="changeSpeDetail($event, 1)">急:<span class="red">{{ specimenWorkOrderMsg.specimenCount ? specimenWorkOrderMsg.specimenCount.urgent : 0 }}</span></span>
                           <span *ngIf="item.ordinaryFlag" (click)="changeSpeDetail($event, 0)">普:{{ specimenWorkOrderMsg.specimenCount ? specimenWorkOrderMsg.specimenCount.noUrgent : 0 }}</span>
                         </div>
@@ -2988,7 +2988,7 @@
 		<div class="title">多条申请单提示<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
 		</div>
 		<div class="content">
-			<div class="weight">
+			<div class="weight" *ngIf="viewData.length>0">
 				提示：查询到{{viewData[0].patientDTO.patientName}}（{{viewData[0].patientDTO.patientCode}}）患者有多条申请单，请选择对应申请单
 			</div>
 			<div class="list-template__bottom">

src/app/views/hushijiandan/hushijiandan.component.less

@@ -1346,6 +1346,9 @@
             .nums {
               height: 57px;
               position: relative;
+              &.surgeryNums{
+                height: 88px;
+              }
               &.nurseNav{
                 display: flex;
                 align-items: center;

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

@@ -339,14 +339,19 @@ export class HushijiandanComponent implements OnInit {
 	// 新增申请单自选类型
 	applicationType:any;
 	addPathologyType(type){
-		this.surgeryDataId = this.surgeryWKOMsg.id
-		this.patientDataId = this.surgeryWKOMsg.patientDTO.id
+		if(this.openType=='btn'){
+			this.surgeryDataId = this.surgeryWKOMsg.id
+			this.patientDataId = this.surgeryWKOMsg.patientDTO.id
+		}else{
+			this.surgeryDataId = this.scheduleItem.id
+			this.patientDataId = this.scheduleItem.patientDTO.id
+		}
 		this.applicationType = type
 		let data = {
 			idx: 0,
 			sum: 9999,
-			surgeryId: this.surgeryWKOMsg.id || "",
-			patientId: this.surgeryWKOMsg.patientDTO.id || "",
+			surgeryId: this.surgeryDataId || "",
+			patientId: this.patientDataId || "",
 			hosId: this.currentHospital.id || "" ,
 			operationType: 'pathologyForm',
 			pathologyFormType: type
@@ -361,9 +366,13 @@ export class HushijiandanComponent implements OnInit {
 	}
 
 	// 手术排程-病理申请单
+	openType:any;
+	scheduleItem:any;
 	pathologyAddItem(e,item){
-		this.surgeryDataId = item.id
-		this.patientDataId = item.patientDTO.id
+		this.openType = 'schedule'
+		this.scheduleItem = item
+		// this.surgeryDataId = item.id
+		// this.patientDataId = item.patientDTO.id
 		let data = {
 			idx: 0,
 			sum: 9999,
@@ -422,6 +431,7 @@ export class HushijiandanComponent implements OnInit {
 	isSpinning:any = false;
 	viewData:any = [];
 	pathologyAdd(e){
+		this.openType = 'btn'
 		this.surgeryDataId = this.surgeryWKOMsg.id
 		this.patientDataId = this.surgeryWKOMsg.patientDTO.id
 		let data = {
@@ -449,7 +459,6 @@ export class HushijiandanComponent implements OnInit {
 					}
 				}
 			}
-			console.log(777,this.viewData)
 			this.multiDialog = true
 			return
 			if(data.list.length==1){
@@ -475,7 +484,6 @@ export class HushijiandanComponent implements OnInit {
 						}
 					}
 				}
-				console.log(777,this.viewData)
 				this.multiDialog = true
 			}else if(data.list.length==0){
 				this.message.error('无申请单')
@@ -660,7 +668,6 @@ export class HushijiandanComponent implements OnInit {
 			pagePermissionConfig: {
         hosId: this.currentHospital.id,
         active: 1,
-        taskTypeDeptId: this.loginUser.dept.id,
       },
 		};
 		this.mainService
@@ -4933,7 +4940,7 @@ export class HushijiandanComponent implements OnInit {
   }
   loadingQuick:boolean = false;
   confirmBuildQuickConfirm(options){
-    let { taskType, shortcutForm, buildMsg, workOrderRemark } = options;
+    let { taskType, shortcutForm, buildMsg, workOrderRemark, userAccount } = options;
     if(taskType.associationType.value === 'other' || taskType.associationType.value === 'ordinary'){
       // 其他临床服务|万能交接
       this.loadingQuick = this.loading5;
@@ -4941,6 +4948,7 @@ export class HushijiandanComponent implements OnInit {
       this.shortcutMsg = taskType;
       this.buildMsg = buildMsg;
       this.workOrderRemark = workOrderRemark;
+      this.userAccount = userAccount;
       this.confirmShortcut(shortcutForm, taskType.associationType.value);
     }else if(taskType.associationType.value === 'specimen'){
       // 标本配送