Merge branch 'master' into develop

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

@@ -194,9 +194,11 @@ export class ConfigurationDeptUserComponent implements OnInit {
 			deptArr.push(i.id)
 		}
     this.validatePriorityForm.controls.department.setValue(deptArr);
-    this.validatePriorityForm.controls.handleGroup.setValue(data.handleGroupDTO.id);
+		if(data.handleGroupDTO){
+			this.validatePriorityForm.controls.handleGroup.setValue(data.handleGroupDTO.id);
+			this.getUser(data.handleGroupDTO.id)
+		}
 		this.validatePriorityForm.controls.binding.setValue(data.handleUserDTO?'1':'0')
-		this.getUser(data.handleGroupDTO.id)
 		if(data.handleUserDTO){
 			this.validatePriorityForm.controls.handleUser.setValue(data.handleUserDTO.id);
 		}

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

@@ -2,30 +2,44 @@
   <div class="contentInner">
 		<div class="hos-title">{{currentHospital.hosName}}</div>
     <div class="addressAssign">
-      <overlay-scrollbars #osComponentRef2 class="contentBody2">
+      <div class="contentBody2">
         <div class="contentBody">
           <div class="classList" *ngFor="let item of hospitalList">
-            <span>{{ item.desc }}：</span>
-            <nz-radio-group [(ngModel)]="item.value" (ngModelChange)="radioChange(item)" *ngIf="item.type==null">
-              <label nz-radio nzValue="1">是</label>
-              <label nz-radio nzValue="0">否</label>
-            </nz-radio-group>
+						<div class="mar-10" *ngIf="item.key!='itsmWorkHourQuoteDept' && item.key!='itsmConsumableQuoteDept' && !item.show">
+							<span>{{ item.desc }}：</span>
+							<nz-radio-group [(ngModel)]="item.value" (ngModelChange)="radioChange(item)">
+							  <label nz-radio nzValue="1">是</label>
+							  <label nz-radio nzValue="0">否</label>
+							</nz-radio-group>
+						</div>
+            
+						<div class="mar-10" *ngIf="item.key=='itsmWorkHourQuoteDept' && itsmQuoteOtherDeptWorkHourType">
+							<span class="w100px">{{ item.desc }}：</span>
+							<nz-select class="w220px" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear
+								[nzPlaceHolder]="'请选择'+item.desc" [(ngModel)]="item.value">
+							  <ng-container *ngFor="let option of maintainDept">
+							    <nz-option [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
+							  </ng-container>
+							</nz-select>
+						</div>
+						
+						<div class="mar-10" *ngIf="item.key=='itsmConsumableQuoteDept' && itsmQuoteOtherDeptConsumableType">
+							<span class="w100px">{{ item.desc }}：</span>
+							<nz-select class="w220px" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear
+								[nzPlaceHolder]="'请选择'+item.desc" [(ngModel)]="item.value">
+							  <ng-container *ngFor="let option of maintainDept">
+							    <nz-option [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
+							  </ng-container>
+							</nz-select>
+						</div>
 						
-						<!-- <nz-select class="w320px" *ngIf="item.type" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch nzAllowClear
-						  (nzOnSearch)="changeSelect($event)" [nzPlaceHolder]="'请选择'+item.desc" [(ngModel)]="item.value">
-						  <ng-container *ngFor="let option of item.data">
-						    <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> -->
           </div>
         </div>
-      </overlay-scrollbars>
-      <div class="contentBtns">
-        <button nz-button nzType="primary" (click)="submitMessageForm()">确定</button>
+				<div class="contentBtns">
+				  <button nz-button nzType="primary" [nzLoading]="btnLoading" (click)="submitMessageForm()">确定</button>
+				</div>
       </div>
+      
     </div>
   </div>
 </div>

src/app/components/configurationCenter/configuration-hospital/configuration-hospital.component.less

@@ -5,6 +5,12 @@
   flex-direction: column;
   justify-content: space-between;
   background-color: #F0F2F5;
+	.w220px{
+		width: 220px;
+	}
+	.w100px{
+			width: 100px !important;
+		}
   .list-template__nzTable,
   .list-template__bottom{
     padding: 0!important;
@@ -23,11 +29,11 @@
     justify-content: space-between;
     border: 1px solid #EEF3F9;
     &.priority{
-      margin: 24px 275px 0;
+      margin: 24px 275px;
       background-color: #fff;
       .contentInner{
-        padding: 90px 158px 72px;
-        border: 1px solid #E8EBEF;
+        // padding: 90px 158px 72px;
+        // border: 1px solid #E8EBEF;
 				.hos-title{
 					font-weight: 600;
 					font-size: 16px;
@@ -40,15 +46,19 @@
           flex: 1;
           display: flex;
           flex-direction: column;
-          align-items: center;
+          // align-items: center;
           padding: 0 16px;
-          gap: 32px;
+          // gap: 32px;
         }
         .hospital{
           width: 100%;
           text-align: left;
         }
         .classList{
+					// padding: 5px 0;
+					.mar-10{
+						margin: 8px 0;
+					}
           .select{
             width: 313px;
           }
@@ -118,7 +128,7 @@
       .addressAssign{
         flex: 3;
         height: 100%;
-        background: #FFFFFF;
+        // background: #FFFFFF;
         border: 1px solid #E8EBEF;
         display: flex;
         flex-direction: column;
@@ -142,10 +152,8 @@
       }
     }
     .contentBtns{
-      margin-bottom: 16px;
-      display: flex;
-      justify-content: center;
-      align-items: center;
+      margin-top: 20px;
+      text-align: center;
     }
   }
 }

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

@@ -19,34 +19,45 @@ export class ConfigurationHospitalComponent implements OnInit {
 
   coopData: any = {}; //当前操作列
   currentHospital; //当前院区
-
+	maintainDept:any=[];
+	
   ngOnInit() {
+		this.maintainDept = this.tool.getUserInfoPermission().dutyList
     this.currentHospital = this.tool.getCurrentHospital();
     this.getList();
   }
 	
+	itsmQuoteOtherDeptWorkHourType:any;
+	itsmQuoteOtherDeptConsumableType:any;
 	radioChange(data){
 		console.log(123,data)
-		return
-		let index = this.hospitalList.findIndex(i=>i.id == data.id)
+		if(data.key=='itsmParentConsumable' && data.value==1){
+			let item = this.hospitalList.find(i=>i.key == 'itsmQuoteOtherDeptConsumable')
+			item.show = true
+			item.value = '0'
+			this.itsmQuoteOtherDeptConsumableType = false
+			let item2 = this.hospitalList.find(i=>i.key == 'itsmConsumableQuoteDept')
+			item2.value = null
+			
+		}else if(data.key=='itsmParentConsumable' && data.value==0){
+			let item = this.hospitalList.find(i=>i.key == 'itsmQuoteOtherDeptConsumable')
+			item.show = false
+		}
+		
 		if(data.key=='itsmQuoteOtherDeptWorkHour' && data.value==1){
-			let item = {
-				desc:'引用科室',
-				key:'hour',
-				type:'select',
-				data:[],
-				value:''
-			}
-			this.hospitalList.splice(index, 0, item)
-		}else if(data.key=='itsmQuoteOtherDeptConsumable' && data.value==1){
-			let item = {
-				desc:'引用科室',
-				key:'consumable',
-				type:'select',
-				data:[],
-				value:''
-			}
-			this.hospitalList.splice(index, 0, item)
+			this.itsmQuoteOtherDeptWorkHourType = true
+		}else if(data.key=='itsmQuoteOtherDeptWorkHour' && data.value==0){
+			this.itsmQuoteOtherDeptWorkHourType = false
+			let item = this.hospitalList.find(i=>i.key == 'itsmWorkHourQuoteDept')
+			item.value = null
+		}
+		
+		if(data.key=='itsmQuoteOtherDeptConsumable' && data.value==1){
+			this.itsmQuoteOtherDeptConsumableType = true
+		}else if(data.key=='itsmQuoteOtherDeptConsumable' && data.value==0){
+			this.itsmQuoteOtherDeptConsumableType = false
+			let item = this.hospitalList.find(i=>i.key == 'itsmConsumableQuoteDept')
+			item.value = null
 		}
 	}
 	
@@ -89,7 +100,41 @@ export class ConfigurationHospitalComponent implements OnInit {
       .subscribe((data) => {
         this.loading1 = false;
         if (data.status == 200) {
-          this.hospitalList = data.list || [];
+					data.list.forEach(i =>{
+					  i.show = false
+					})
+					let newData = data.list
+					for(let i of newData){
+						if(i.key=='itsmParentConsumable' && i.value==1){
+							let item = newData.find(i=>i.key == 'itsmQuoteOtherDeptConsumable')
+							item.show = true
+							item.value = '0'
+							this.itsmQuoteOtherDeptConsumableType = false
+							let item2 = newData.find(i=>i.key == 'itsmConsumableQuoteDept')
+							item2.value = null
+						}else if(i.key=='itsmParentConsumable' && i.value==0){
+							let item = newData.find(i=>i.key == 'itsmQuoteOtherDeptConsumable')
+							item.show = false
+						}
+						
+						if(i.key=='itsmQuoteOtherDeptWorkHour' && i.value==1){
+							this.itsmQuoteOtherDeptWorkHourType = true
+							let item = newData.find(i=>i.key == 'itsmWorkHourQuoteDept')
+							item.value = Number(item.value)
+						}else if(i.key=='itsmQuoteOtherDeptWorkHour' && i.value==0){
+							this.itsmQuoteOtherDeptWorkHourType = false
+						}
+						
+						if(i.key=='itsmQuoteOtherDeptConsumable' && i.value==1){
+							this.itsmQuoteOtherDeptConsumableType = true
+							let item = newData.find(i=>i.key == 'itsmConsumableQuoteDept')
+							item.value = Number(item.value)
+						}else if(i.key=='itsmQuoteOtherDeptConsumable' && i.value==0){
+							this.itsmQuoteOtherDeptConsumableType = false
+						}
+					}
+
+          this.hospitalList = newData || [];
         }else{
           this.message.error(data.msg || "请求数据失败");
         }

src/app/services/main.service.ts

@@ -931,8 +931,8 @@ export class MainService {
 	 }
 	
 	//病理申请单追加打印/全量打印
-	 pathologyCheckPrint(type,businessId) {
-	   return this.http.post(host.host + `/pathology/check/${type}/${businessId}`, {}, {
+	 pathologyCheckPrint(type,businessId,data) {
+	   return this.http.post(host.host + `/pathology/check/${type}/${businessId}`, data, {
 	     headers: this.headers,
 	   });
 	 }

src/app/share/pathology-add/pathology-add.component.html

@@ -54,7 +54,7 @@
 					<nz-form-item class="form-item" *ngIf="detailsData.pathologyFormType==null">
 						<nz-form-label nzRequired nzFor="pathologyFormType" [nzSm]="6" [nzXs]="24">申请单类型</nz-form-label>
 						<nz-form-control nzErrorTip="请选择申请单类型!" [nzSm]="18" [nzXs]="24">
-							<nz-radio-group formControlName="pathologyFormType">
+							<nz-radio-group formControlName="pathologyFormType" (ngModelChange)="radioChange($event)">
 								<label nz-radio [nzValue]="1">术中快速病理检查申请单</label>
 								<label nz-radio [nzValue]="0">病理检查申请单</label>
 							</nz-radio-group>
@@ -244,6 +244,7 @@
 		<div class="title">未打印<i class="icon_transport transport-guanbi" (click)="hideNotModal()"></i>
 		</div>
 		<div class="content">
+			<div class="content-title">本次需要记录离体标本<span class="reds">{{specimenNum}}</span>份，本申请单共<span class="reds">{{totalNum}}</span>份标本</div>
 			<form nz-form [formGroup]="validatePrintForm" class="addForm" (ngSubmit)="submitPrintForm()">
 				<nz-form-item>
 				  <nz-form-label nzRequired [nzSpan]="8" nzFor="inVitroTime">标本离体时间</nz-form-label>
@@ -282,14 +283,13 @@
 		<div class="monad">
 			<div *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && operation != 'addPrint'" style="border: 1px solid #AAAAAA;
 				border-radius: 5px;font-size: 12px;">
-				 <div style="display: flex;">
-					 <img style="width: 50%;height: 70px;border-radius: 5px;" [src]="printData.applyBarCode" alt="">
-					 <div style="width: 50%;">
-						 
-						 <img style="width: 100%; border-radius: 5px;
-						 	position: relative;top: 15px;right: 7px;" [src]="tool.logoUrl" alt="">
-					 	<!-- <img style="width: 100%; border-radius: 5px;
-					 		position: relative;top: 15px;right: 7px;" src="../../../assets/images/yc_logo.png" alt=""> -->
+				 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;padding: 0 1px;">
+					 <div style="width: 60%;height: 70px;text-align: center;">
+						 <img style="max-width: 90%;height: 80%;" [src]="printData.applyBarCode" alt="">
+						 <div>{{printData.applyCode}}</div>
+					 </div>
+					 <div style="width: 40%;height: 100%;text-align: center;display: flex;align-items: center;">
+						 <img style="max-width: 100%;max-height: 100%;" [src]="tool.logoUrl" alt="">
 					 </div>
 				 </div>
 				
@@ -327,17 +327,15 @@
 			
 			<div *ngIf="printData && printData.specimenList && printData.specimenList.length>0 && operation == 'addPrint'" style="border: 1px solid #AAAAAA;
 				border-radius: 5px;font-size: 12px;">
-				 <div style="display: flex;">
-					 <img style="width: 50%;height: 70px;border-radius: 5px;" [src]="printData.applyBarCode" alt="">
-					 <div style="width: 50%;">
-						 
-						 <img style="width: 100%; border-radius: 5px;
-						 	position: relative;top: 15px;right: 7px;" [src]="tool.logoUrl" alt="">
-					 	<!-- <img style="width: 100%; border-radius: 5px;
-					 		position: relative;top: 15px;right: 7px;" src="../../../assets/images/yc_logo.png" alt=""> -->
+				 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;padding: 0 1px;">
+					 <div style="width: 60%;height: 70px;text-align: center;">
+						 <img style="max-width: 90%;height: 80%;" [src]="printData.applyBarCode" alt="">
+						 <div>{{printData.applyCode}}</div>
+					 </div>
+					 <div style="width: 40%;height: 100%;text-align: center;display: flex;align-items: center;">
+						 <img style="max-width: 100%;max-height: 100%;" [src]="tool.logoUrl" alt="">
 					 </div>
 				 </div>
-				
 				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
 					<div style="width:20%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">患者姓名</div>
 					<div style="width:50%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">{{printData.patientName}}</div>
@@ -370,19 +368,20 @@
 				</div>
 			</div>
 			
-			<div style="height: 20px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></div>
+			<div style="height: 70px;" *ngIf="printData && printData.specimenList && printData.specimenList.length==1 && operation == 'addPrint'"></div>
+			<div style="height: 20px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && operation != 'addPrint'"></div>
 			<div style="font-size: 12px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>0">
 				<div *ngFor="let data of printData.specimenList; let index=index;">
 				 <div style="height: 50px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></div>
 				 <div style="border: 1px solid #AAAAAA;border-radius: 5px;">
-					 <div style="display: flex;">
-					 	<img style="width: 50%;height: 70px;border-radius: 5px;" [src]="data.barCode" alt="">
-						<div style="width: 50%;">
-							<img style="width: 100%; border-radius: 5px;
-								position: relative;top: 15px;right: 7px;" [src]="tool.logoUrl" alt="">
-							<!-- <img style="width: 100%;border-radius: 5px;
-								position: relative;top: 15px;right: 7px;" src="../../../assets/images/yc_logo.png" alt=""> -->
-						</div>
+					 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;padding: 0 1px;">
+						 <div style="width: 60%;height: 70px;text-align: center;">
+							 <img style="max-width: 90%;height: 80%;" [src]="data.barCode" alt="">
+							 <div>{{data.specimenCode}}</div>
+						 </div>
+						 <div style="width: 40%;height: 100%;text-align: center;display: flex;align-items: center;">
+							 <img style="max-width: 100%;max-height: 100%;" [src]="tool.logoUrl" alt="">
+						 </div>
 					 </div>
 					 <div style="display: flex;border-bottom: 1px solid #AAAAAA;">
 					 	<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">患者姓名</div>

src/app/share/pathology-add/pathology-add.component.less

@@ -228,6 +228,14 @@
 	      padding: 19px 14px 0 14px;
 	      max-height: 500px;
 	      overflow-y: auto;
+				.content-title{
+					text-align: center;
+					margin-bottom: 10px;
+					font-weight: 600;
+					.reds{
+						color: red;
+					}
+				}
 				.ant-form-item {
 				  margin-bottom: 14px;
 					display: flex;

src/app/share/pathology-add/pathology-add.component.ts

@@ -24,6 +24,7 @@ export class PathologyAddComponent implements OnInit {
 	@Input() surgeryId: string;
 	@Input() patientId: string;
 	@Input() detailId: string;
+	@Input() applicationType: string;
 	
 	constructor(
 		private http: HttpClient,
@@ -69,6 +70,21 @@ export class PathologyAddComponent implements OnInit {
 		this.fetchDataList()
   }
 	
+	radioChange(data){
+		let arr = [];
+		let item = null
+		// if(!this.validateForm.value.project){
+			if(data==1){
+				item = this.projectData.find(i=>i.value=='2241') //冰冻切片检查
+			}else{
+				item = this.projectData.find(i=>i.value=='1810') //病理小标本
+			}
+			console.log(5555,item)
+			arr.push(item.id)
+			this.validateForm.controls.project.setValue(arr);
+		// }
+	}
+	
 	// 初始化新增form表单
 	initForm() {
 		this.validateForm = this.fb.group({
@@ -88,7 +104,7 @@ export class PathologyAddComponent implements OnInit {
 		  idx: 0,
 		  sum: 9999,
 		  pathologyForm: {
-				surgeryId: this.surgeryId || "",
+				surgeryId: "",
 		    patientId: this.patientId || "",
 		    hosId: this.hosId || "" ,
 		  },
@@ -106,6 +122,7 @@ export class PathologyAddComponent implements OnInit {
 				if(this.detailsData.pathologyFormType!=null){
 					this.validateForm.controls.pathologyFormType.setValue(this.detailsData.pathologyFormType);
 				}
+
 				if(this.detailsData.intraoperativeFindings){
 					this.validateForm.controls.intraoperativeFindings.setValue(this.detailsData.intraoperativeFindings);
 				}
@@ -123,6 +140,9 @@ export class PathologyAddComponent implements OnInit {
 			this.specimenData = res.filter(i=>i.extra1 == 'pathologySpecimen')
 			if(this.detailsData.specimenType){
 				this.validateForm.controls.specimenGenre.setValue(this.detailsData.specimenType.id);
+			}else{
+				let item = this.specimenData.find(i=>i.value==10)
+				this.validateForm.controls.specimenGenre.setValue(item.id);
 			}
 			if(this.detailsData.specimenNum){
 				this.validateForm.controls.specimenNum.setValue(this.detailsData.specimenNum);
@@ -766,6 +786,8 @@ export class PathologyAddComponent implements OnInit {
 	zjLoading:any = false;
 	operation:any;
 	pathologySpecimenIds:any;
+	totalNum:any;
+	specimenNum:any;
 	superaddition(): void{
 		var that = this;
 		this.operation = 'addPrint'
@@ -778,9 +800,12 @@ export class PathologyAddComponent implements OnInit {
 			this.message.error('标本不能为空')
 			return
 		}
-		that.mainService.pathologyCheckPrint('pathologyForm',this.detailsData.id).subscribe((res:any)=>{
+		that.mainService.pathologyCheckPrint('pathologyForm',this.detailsData.id,{}).subscribe((res:any)=>{
+			this.separationMsg = res.msg
 			if(res.ids){
 				this.notModal = true
+				this.totalNum = res.totalNum
+				this.specimenNum = res.specimenNum
 				this.pathologySpecimenIds = res.ids
 				this.validatePrintForm = this.fb.group({
 				  inVitroTime: [null, [Validators.required]],
@@ -798,6 +823,7 @@ export class PathologyAddComponent implements OnInit {
 	
 	// 打印标本/全量
 	printData:any;
+	separationMsg:any = '本次需要记录离体标本6份，本申请单共6份标本';
 	submitForm(type): void{
 		var that = this;
 		this.operation = 'wholePrint'
@@ -811,9 +837,12 @@ export class PathologyAddComponent implements OnInit {
 			return
 		}
 		if(type=='all'){
-			that.mainService.pathologyCheckPrint('pathologyForm',this.detailsData.id).subscribe((res:any)=>{
+			that.mainService.pathologyCheckPrint('pathologyForm',this.detailsData.id,{}).subscribe((res:any)=>{
+				this.separationMsg = res.msg
 				if(res.ids){
 					this.notModal = true
+					this.totalNum = res.totalNum
+					this.specimenNum = res.specimenNum
 					this.pathologySpecimenIds = res.ids
 					this.validatePrintForm = this.fb.group({
 					  inVitroTime: [null, [Validators.required]],
@@ -858,15 +887,20 @@ export class PathologyAddComponent implements OnInit {
 		}else{
 			this.operation = 'null'
 			if(this.statusValue==1){
-				this.notModal = true
-				this.validatePrintForm = this.fb.group({
-					inVitroTime: [null, [Validators.required]],
-					jobNumber: [null, [Validators.required]],
-					name:[null, [Validators.required]],
-				});
-				let date = new Date();
-				this.startDate = format(date, "yyyy-MM-dd HH:mm:ss")
-				this.validatePrintForm.controls.inVitroTime.setValue(this.startDate);
+				this.mainService.pathologyCheckPrint('pathologyForm',this.detailsData.id,{}).subscribe((res:any)=>{
+					this.separationMsg = res.msg
+					this.notModal = true
+					this.totalNum = res.totalNum
+					this.specimenNum = res.specimenNum
+					this.validatePrintForm = this.fb.group({
+						inVitroTime: [null, [Validators.required]],
+						jobNumber: [null, [Validators.required]],
+						name:[null, [Validators.required]],
+					});
+					let date = new Date();
+					this.startDate = format(date, "yyyy-MM-dd HH:mm:ss")
+					this.validatePrintForm.controls.inVitroTime.setValue(this.startDate);
+				})
 				return
 			}
 			let data: any = {
@@ -876,6 +910,7 @@ export class PathologyAddComponent implements OnInit {
 					surgeryId: this.surgeryId || "",
 					patientId: this.patientId || "",
 					hosId: this.hosId || "" ,
+					pathologyInspectIds:this.validateForm.value.project.join(','),
 					specimenType:{
 						id:this.validateForm.value.specimenGenre
 					}

src/app/share/pathology-detail/pathology-detail.component.html

@@ -19,7 +19,7 @@
 					<nz-form-item class="form-title-box">
 						<div class="form-title"><span class="font-weight-500">患者信息：</span>{{detailsData.patientDTO.patientName}} ({{detailsData.patientDTO.bedNum}}床)</div>
 						<div class="form-title"><span class="font-weight-500">年龄：</span>{{detailsData.patientDTO.age||'-'}}</div>
-						<div class="form-title"><span class="font-weight-500">性别：</span>{{detailsData.patientDTO.gender.name||'-'}}</div>
+						<div class="form-title"><span class="font-weight-500">性别：</span>{{detailsData.patientDTO.gender ? detailsData.patientDTO.gender.name : '-'}}</div>
 						<div class="form-title"><span class="font-weight-500">住院号：</span>{{detailsData.patientDTO.patientCode}}</div>
 					</nz-form-item>
 					
@@ -115,16 +115,15 @@
 		<div class="monad">
 			<div *ngIf="printData && printData.specimenList && printData.specimenList.length>1" style="border: 1px solid #AAAAAA;
 				border-radius: 5px;font-size: 12px;">
-				 <div style="display: flex;">
-					 <img style="width: 50%;height: 70px;border-radius: 5px;" [src]="printData.applyBarCode" alt="">
-					 <div style="width: 50%;">
-						 <img style="width: 100%; border-radius: 5px;
-						 	position: relative;top: 15px;right: 7px;" [src]="tool.logoUrl" alt="">
-<!-- 					 	<img style="width: 100%; border-radius: 5px;
-					 		position: relative;top: 15px;right: 7px;" src="../../../assets/images/yc_logo.png" alt=""> -->
+				 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;padding: 0 1px;">
+					 <div style="width: 60%;height: 70px;text-align: center;">
+						 <img style="max-width: 90%;height: 80%;" [src]="printData.applyBarCode" alt="">
+						 <div>{{printData.applyCode}}</div>
+					 </div>
+					 <div style="width: 40%;height: 100%;text-align: center;display: flex;align-items: center;">
+						 <img style="max-width: 100%;max-height: 100%;" [src]="tool.logoUrl" alt="">
 					 </div>
 				 </div>
-				
 				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
 					<div style="width:20%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">患者姓名</div>
 					<div style="width:50%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">{{printData.patientName}}</div>
@@ -162,14 +161,14 @@
 				<div *ngFor="let data of printData.specimenList; let index=index;">
 				 <div style="height: 50px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></div>
 				 <div style="border: 1px solid #AAAAAA;border-radius: 5px;">
-					 <div style="display: flex;">
-					 	<img style="width: 50%;height: 70px;border-radius: 5px;" [src]="data.barCode" alt="">
-						<div style="width: 50%;">
-							<img style="width: 100%; border-radius: 5px;
-								position: relative;top: 15px;right: 7px;" [src]="tool.logoUrl" alt="">
-							<!-- <img style="width: 100%;border-radius: 5px;
-								position: relative;top: 15px;right: 7px;" src="../../../assets/images/yc_logo.png" alt=""> -->
-						</div>
+					 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;padding: 0 1px;">
+						 <div style="width: 60%;height: 70px;text-align: center;">
+							 <img style="max-width: 90%;height: 80%;" [src]="data.barCode" alt="">
+							 <div>{{data.specimenCode}}</div>
+						 </div>
+						 <div style="width: 40%;height: 100%;text-align: center;display: flex;align-items: center;">
+							 <img style="max-width: 100%;max-height: 100%;" [src]="tool.logoUrl" alt="">
+						 </div>
 					 </div>
 					 <div style="display: flex;border-bottom: 1px solid #AAAAAA;">
 					 	<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">患者姓名</div>

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

@@ -2977,7 +2977,7 @@
 <button ngxPrint printSectionId="print-section" #printBtn hidden [printStyle]="{ '@page': { margin: '0 !important' }, 'body': { margin: '0 !important' } }">打印</button>
 
 <!-- 病理申请单 -->
-<app-pathology-add *ngIf="pathologyModal" [surgeryId]="surgeryDataId" [patientId]="patientDataId" [patientId]="patientDataId" [detailId]="detailId" (pathologyCancel)="pathologyCancel($event)"></app-pathology-add>
+<app-pathology-add *ngIf="pathologyModal" [surgeryId]="surgeryDataId" [patientId]="patientDataId" [patientId]="patientDataId" [detailId]="detailId" [applicationType]="applicationType" (pathologyCancel)="pathologyCancel($event)"></app-pathology-add>
 
 <!-- 病理详情 -->
 <app-pathology-detail *ngIf="pathologyDetailModal" [surgeryId]="surgeryDataId" [patientId]="patientDataId" [detailId]="detailId" (pathologyCancel)="pathologyDetailCancel($event)"></app-pathology-detail>
@@ -3022,7 +3022,9 @@
 			</div>
 		</div>
 		<div class="display_flex justify-content_flex-center mar-20 btns">
-			<button class="btn" nz-button nzType="primary" (click)="hideModal()">知道了</button>
+			<button class="btn" style="margin-right: 0;" *ngIf="autoCreate==1" nz-button nzType="primary" (click)="addPathologyType(0)">新增普通病理</button>
+			<button class="btn" *ngIf="autoCreate==1" nz-button nzType="primary" (click)="addPathologyType(1)">新增术中快速病理</button>
+			<button class="btn cancel" nz-button nzType="default" (click)="hideModal()">知道了</button>
 		</div>
 	</div>
 </div>

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

@@ -212,7 +212,7 @@ export class HushijiandanComponent implements OnInit {
     this.refreshSpecimenWorkOrderMsg();
     this.initRole();
     this.getWebsocket();
-
+		this.getTaskTypesId();
     // 综合日志倒计时 start
     this.logTime = this.logTimeConst;
     clearInterval(this.logTimer);
@@ -305,7 +305,61 @@ export class HushijiandanComponent implements OnInit {
     this.coopBtns = coopBtns;
     console.log(this.coopBtns);
   }
-
+	
+	// 获取任务类型（病理标本）
+	taskTypeData:any;
+	getTaskTypesId() {
+		this.mainService.getDictionary("list", "ordinary_field").subscribe((data) => {
+			this.taskTypeData = data.find(i=>i.value=='pathology')
+			this.getPathologySys();
+		});
+	}
+	
+	// 获取标本配置
+	autoCreate:any;
+	getPathologySys(){
+		let postData = {
+			  idx: 0,
+			  sum: 10,
+			  taskTypeConfig: {
+					hosId:this.currentHospital.id,
+					taskType:this.taskTypeData.id
+			  }
+		}
+		
+		this.mainService
+		  .getFetchDataList("simple/data", "taskTypeConfig", postData)
+		  .subscribe((result) => {
+		    if (result.status == 200) {
+					this.autoCreate = result.list[0].autoCreate;
+		    }
+		  });
+	}
+	
+	// 新增申请单自选类型
+	applicationType:any;
+	addPathologyType(type){
+		this.surgeryDataId = this.surgeryWKOMsg.id
+		this.patientDataId = this.surgeryWKOMsg.patientDTO.id
+		this.applicationType = type
+		let data = {
+			idx: 0,
+			sum: 9999,
+			surgeryId: this.surgeryWKOMsg.id || "",
+			patientId: this.surgeryWKOMsg.patientDTO.id || "",
+			hosId: this.currentHospital.id || "" ,
+			operationType: 'pathologyForm',
+			pathologyFormType: type
+		};
+		this.mainService
+		.simplePost("addData", "pathologyForm", data)
+		.subscribe((data) => {
+			this.detailId = data.data.id
+			this.multiDialog = false
+			this.pathologyModal = true
+		});
+	}
+	
 	// 手术排程-病理申请单
 	pathologyAddItem(e,item){
 		this.surgeryDataId = item.id
@@ -314,7 +368,7 @@ export class HushijiandanComponent implements OnInit {
 			idx: 0,
 			sum: 9999,
 			pathologyForm: {
-				surgeryId: item.id || "",
+				// surgeryId: item.id || "",
 				patientId: item.patientDTO.id || "",
 				hosId: this.currentHospital.id || "" ,
 				operationType: 'pathologyForm',
@@ -326,6 +380,15 @@ export class HushijiandanComponent implements OnInit {
 			.getFetchDataList("data", "pathologyForm", data)
 			.subscribe((data) => {
 				this.isSpinning = false
+				this.viewData = data.list
+				if(this.viewData.pathologyInspectDTOS){
+					for(let i of this.viewData.pathologyInspectDTOS){
+						i.arr = []
+						i.arr.push(i.inspectProject.name)
+					}
+				}
+				this.multiDialog = true
+				return
 				if(data.list.length==1){
 					this.detailId = data.list[0].id
 					if(!data.list[0].status){
@@ -365,7 +428,7 @@ export class HushijiandanComponent implements OnInit {
 			idx: 0,
 			sum: 9999,
 			pathologyForm: {
-				surgeryId: this.surgeryWKOMsg.id || "",
+				// surgeryId: this.surgeryWKOMsg.id || "",
 				patientId: this.surgeryWKOMsg.patientDTO.id || "",
 				hosId: this.currentHospital.id || "" ,
 				operationType: 'pathologyForm',
@@ -377,6 +440,18 @@ export class HushijiandanComponent implements OnInit {
 		.getFetchDataList("data", "pathologyForm", data)
 		.subscribe((data) => {
 			this.isSpinning = false
+			this.viewData = data.list
+			for(let i of this.viewData){
+				if(i.pathologyInspectDTOS){
+					i.arr = []
+					for(let x of i.pathologyInspectDTOS){
+						i.arr.push(x.inspectProject.name)
+					}
+				}
+			}
+			console.log(777,this.viewData)
+			this.multiDialog = true
+			return
 			if(data.list.length==1){
 				this.detailId = data.list[0].id
 				if(!data.list[0].status){

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

@@ -8,13 +8,13 @@
 				<div class="list-template__searchItem" *ngIf="coopBtns.strideLook && queryTask!='todo' && queryTask!='doing' && queryTask!='storage'">
 				  <span class="label">维修科室</span>：
 				  <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch
-				     nzAllowClear nzPlaceHolder="请选择维修科室" [(ngModel)]="searchDTO.maintainDepartment">
+				     (ngModelChange)="deptChange($event)" nzAllowClear nzPlaceHolder="请选择维修科室" [(ngModel)]="searchDTO.maintainDepartment">
 				    <ng-container *ngFor="let option of maintainDept">
 				      <nz-option [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
 				    </ng-container>
 				  </nz-select>
 				</div>
-				<div class="list-template__searchItem" *ngIf="queryTask!='todo' && queryTask!='owns' && queryTask!='storage'">
+				<div class="list-template__searchItem" *ngIf="queryTask!='todo' && queryTask!='owns' && queryTask!='storage' && queryTask!='doing' && queryTask!='reassign'">
 				  <span class="label">维修组</span>：
 				  <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch
 				     nzAllowClear nzPlaceHolder="请选择维修组" [(ngModel)]="searchDTO.maintainGroup">

src/app/views/incident-management/incident-management.component.ts

@@ -75,18 +75,29 @@ export class IncidentManagementComponent implements OnInit {
 		let itemDept = this.maintainDept.find(i=>i.id == this.hosIds)
 		if(itemDept){
 			this.searchDTO.maintainDepartment = itemDept.id
+			if(this.queryTask!='todo' && this.queryTask!='doing' && this.queryTask!='storage'){
+				let arr = this.tool.getUserInfoPermission().dutyGroupList.filter(i=>i.hospital.id == itemDept.id)
+				if(arr){
+					this.maintainGroup = arr
+				}else{
+					this.maintainGroup = this.tool.getUserInfoPermission().dutyGroupList
+				}
+			}else{
+				this.maintainGroup = this.tool.getUserInfoPermission().dutyGroupList
+			}
+			
 		}
+		this.getDeparts();
+		this.getUsers('', 'handle');
     this.loading1 = true;
     this.debounceSubject.next(true);
   }
 
   ngOnInit() {
 		this.maintainDept = this.tool.getUserInfoPermission().dutyList
-		this.maintainGroup = this.tool.getUserInfoPermission().dutyGroupList
 		this.hosIds = this.tool.getCurrentHospital().id
-		let itemDept = this.maintainDept.find(i=>i.id == this.hosIds)
-		if(itemDept){
-			this.searchDTO.maintainDepartment = itemDept.id
+		if(this.coopBtns.strideLook){
+			this.defaDept()
 		}
     this.initSearchForm();
     this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
@@ -98,9 +109,6 @@ export class IncidentManagementComponent implements OnInit {
     });
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.initTabs();
-    this.getDeparts();
-    this.getUsers('', 'handle');
-    this.getUsers('', 'acceptUser');
     this.getGdStates();
     this.getOverdueStates();
     this.getIncidentCategoryList();
@@ -125,7 +133,31 @@ export class IncidentManagementComponent implements OnInit {
     //     this.tabs.push({key: 'badEvaluate', value: '异常评价', num: 0, isRed: false});
     // }
   }
-
+	
+	defaDept(){
+		let itemDept = this.maintainDept.find(i=>i.id == this.hosIds)
+		if(itemDept){
+			this.searchDTO.maintainDepartment = itemDept.id
+		}
+		this.getDeparts();
+		this.getUsers('', 'handle');
+		this.getUsers('', 'acceptUser');
+	}
+	
+	// 选择维修科室
+	deptChange(e){
+		this.searchDTO.maintainGroup = null
+		let arr  = this.tool.getUserInfoPermission().dutyGroupList.filter(i=>i.hospital.id == e)
+		if(arr){
+			this.maintainGroup = arr
+		}else{
+			this.maintainGroup = this.tool.getUserInfoPermission().dutyGroupList
+		}
+		this.searchDTO.maintainDepartment = e
+		this.getDeparts();
+		this.getUsers('', 'handle');
+	}
+	
   // 搜索
   search() {
     this.loading1 = true;
@@ -134,6 +166,9 @@ export class IncidentManagementComponent implements OnInit {
   // 重置
   reset() {
     this.searchDTO = {};
+		if(this.coopBtns.strideLook){
+			this.defaDept()
+		}
     this.initSearchForm();
     this.loading1 = true;
     this.debounceSubject.next(true);
@@ -167,7 +202,7 @@ export class IncidentManagementComponent implements OnInit {
     let postData = {
       user: {
         name: e || "",
-        hospital: { id: that.tool.getCurrentHospital().id },
+        hospital: { id: this.searchDTO.maintainDepartment?this.searchDTO.maintainDepartment:that.tool.getCurrentHospital().id },
         engineer: 1,
         simpleQuery: true,
       },
@@ -329,8 +364,7 @@ export class IncidentManagementComponent implements OnInit {
 				delete postData.incident.hosId;
 			}
 		}
-		
-		if(this.queryTask!='todo' && this.queryTask!='owns' && this.queryTask!='storage'){
+		if(this.queryTask!='todo' && this.queryTask!='owns' && this.queryTask!='storage' && this.queryTask!='doing' && this.queryTask!='reassign'){
 			postData.incident.candidateGroupId = this.searchDTO.maintainGroup
 		}else{
 			delete postData.incident.candidateGroupId;
@@ -394,7 +428,15 @@ export class IncidentManagementComponent implements OnInit {
             delete incident.duty;
             delete incident.hosId;
         }
-
+				
+				if(incident.queryTask!='todo' && incident.queryTask!='doing' && incident.queryTask!='storage'){
+					if(this.searchDTO.maintainDepartment){
+						let itemDept = this.maintainDept.find(i=>i.id == this.searchDTO.maintainDepartment)
+						incident.duty = itemDept;
+						delete incident.hosId;
+					}
+				}
+				
         incident.assignee = this.tool.getCurrentUserId();
 
         if(incident.queryTask === 'todo' || incident.queryTask === 'owns'){
@@ -402,6 +444,11 @@ export class IncidentManagementComponent implements OnInit {
         }else{
           delete incident.candidateGroups;
         }
+				if(incident.queryTask!='todo' && incident.queryTask!='owns' && incident.queryTask!='storage' && incident.queryTask!='doing' && incident.queryTask!='reassign'){
+					incident.candidateGroupId = this.searchDTO.maintainGroup
+				}else{
+					delete incident.candidateGroupId;
+				}
     })
     this.mainService
       .getCount(postData)
@@ -418,7 +465,7 @@ export class IncidentManagementComponent implements OnInit {
     let data = {
       department: {
         searchType: 1,// 简单查询
-        cascadeHosId: this.tool.getCurrentHospital().id,
+        cascadeHosId: this.searchDTO.maintainDepartment?this.searchDTO.maintainDepartment:this.tool.getCurrentHospital().id,
         dept: dept,
       },
       idx: 0,

src/app/views/repository-manage/repository-manage.component.ts

@@ -40,16 +40,15 @@ export class RepositoryManageComponent implements OnInit {
 		private sanitizer: DomSanitizer
   ) {}
   ngOnInit() {
-		this.maintainDept = this.tool.getUserInfoPermission().dutyList
-		let itemDept = this.maintainDept.find(i=>i.id == this.hosId)
-		if(itemDept){
-			this.maintainDepartment = itemDept.id
-		}
     this.searchParentDeptSubject.pipe(debounceTime(500)).subscribe((e) => {
 
     });
 		this.hosId = this.tool.getCurrentHospital().id;
     this.coopBtns = this.tool.initCoopBtns(this.route);
+		this.maintainDept = this.tool.getUserInfoPermission().dutyList
+		if(this.coopBtns.strideLook){
+			this.defaDept()
+		}
 		this.getList();
   }
 	maintainDept:any = []; //维修科室
@@ -116,7 +115,15 @@ export class RepositoryManageComponent implements OnInit {
     this.coopData = data;
     this.showDelModal1();
   }
-
+	
+	// 默认科室
+	defaDept(){
+		let itemDept = this.maintainDept.find(i=>i.id == this.hosId)
+		if(itemDept){
+			this.maintainDepartment = itemDept.id
+		}
+	}
+	
   showDelModal1() {
     this.editModal = true;
   }
@@ -163,6 +170,9 @@ export class RepositoryManageComponent implements OnInit {
     this.pageIndex = 1;
 		this.solutionNumber = null;
 		this.title = null;
+		if(this.coopBtns.strideLook){
+			this.defaDept()
+		}
     this.getList();
   }
   // 表格数据

src/app/views/specimen-room-view/specimen-room-view.component.html

@@ -511,7 +511,7 @@
 			</div>
 			
 			<div class="content-item">
-				<div class="center">提示：申请单含<span class="red">{{codeData.specimenNum}}</span>只标本，已扫<span class="red">{{codeData.pathologySpecimenDTOList.length}}</span>只<span *ngIf="codeData.pathologySpecimenDTOList.length < codeData.specimenNum">，请继续扫描标本。</span></div>
+				<div class="center">提示：本申请单内共有<span class="red">{{totalNum}}</span>只标本固定，已固定<span class="red">{{fixationNum}}</span>份还需固定<span class="red">{{specimenNum}}</span>份</div>
 				<div class="disp-fl">
 					<div class="width-120">标本条码：</div>
 					<input nz-input id="specimen" [(ngModel)]="specimenCode" (ngModelChange)="codeChange($event)"/>

src/app/views/specimen-room-view/specimen-room-view.component.ts

@@ -191,10 +191,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 								})
 								this.project = this.project.join('、')
 							}
-							this.fixationModal = true
-							setTimeout(_=>{
-								document.getElementById('specimen').focus();
-							},200)
+							this.getFixationNum(this.codeData.id)
 						}else{
 							this.viewDetail(this.codeData,'4')
 						}
@@ -217,7 +214,25 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			}
 		})
 	}
-
+	
+	// 获取申请单扫标本信息
+	fixationNum:any;
+	specimenNum:any;
+	totalNum:any
+	getFixationNum(id){
+		this.mainService.pathologyCheckPrint('pathologyForm',id,{
+			operationType:'fixation'
+		}).subscribe((res:any)=>{
+			this.fixationModal = true
+			this.fixationNum = res.fixationNum
+			this.specimenNum = res.specimenNum
+			this.totalNum = res.totalNum
+			setTimeout(_=>{
+				document.getElementById('specimen').focus();
+			},200)
+		})
+	}
+	
 	// 选择固定时间
 	formChangeDate(result){
 	  this.startDate = format(result, 'yyyy-MM-dd HH:mm:ss');
@@ -553,7 +568,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 	codeChange(e){
 		this.changeInpSubject.next([e]);
 	}
-
+	
 	fixationError:any;
 	searchSpecimenData(e){
 		if(!e){
@@ -573,10 +588,10 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			this.specimenCode = null
 			if(res.status==200){
 				let item = res.data[0].pathologySpecimenDTOList.find(i=>i.specimenCode == e)
-				console.log(8,item)
 				if(item.fixationTime){
 					this.fixationError = '该标本已经固定过'
 				}else{
+					this.getFixationNum(res.data[0].id)
 					this.codeData = res.data[0]
 					this.fixationError = null
 				}

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

@@ -208,6 +208,12 @@
 						</nz-radio-group>
 				  </nz-form-control>
 				</nz-form-item>
+				<nz-form-item class="formItem">
+				  <nz-form-label [nzSpan]="24" nzFor="supportAppVersion" class="label">支助APP版本号</nz-form-label>
+				  <nz-form-control [nzSpan]="24" nzErrorTip="请输入支助APP版本号!">
+				    <input nz-input formControlName="supportAppVersion" id="supportAppVersion" placeholder="请输入支助APP版本号">
+				  </nz-form-control>
+				</nz-form-item>
       </div>
     </form>
   </overlay-scrollbars>

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

@@ -74,6 +74,7 @@ export class SysConfigComponent implements OnInit {
       busiViewDeptId: [null, [Validators.required]],
 			repairs: [null, [Validators.required]],
 			cmdbRepair: [null, [Validators.required]],
+			supportAppVersion: [null, [Validators.required]],
     });
     this.getDeptType();
     this.coopBtns = this.tool.initCoopBtns(this.route);
@@ -152,7 +153,8 @@ export class SysConfigComponent implements OnInit {
         item.keyconfig === "busiViewDeptId" ||
 				item.keyconfig === "deptRepair" ||
 				item.keyconfig === "publicRepair" ||
-				item.keyconfig === "cmdbRepair" 
+				item.keyconfig === "cmdbRepair" ||
+				item.keyconfig === "supportAppVersion"
     );
 		console.log(7777,this.validateForm.controls.repairs.value)
     filterData.forEach((item) => {
@@ -206,6 +208,8 @@ export class SysConfigComponent implements OnInit {
 			  item.valueconfig = value;
 			}else if (item.keyconfig === "cmdbRepair") {
         item.valueconfig = this.validateForm.controls.cmdbRepair.value;
+      }else if (item.keyconfig === "supportAppVersion") {
+        item.valueconfig = this.validateForm.controls.supportAppVersion.value;
       }
     });
     const postData = filterData;
@@ -334,6 +338,9 @@ export class SysConfigComponent implements OnInit {
 								case "cmdbRepair":
 								  this.validateForm.controls.cmdbRepair.setValue(c[1] + "");
 								  break;
+								case "supportAppVersion":
+								  this.validateForm.controls.supportAppVersion.setValue(c[1]);
+								  break;
               }
             });
           } else {