拉取代码

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

@@ -283,13 +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;align-items: center;flex-wrap: nowrap;height: 80px;">
+				 <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: 95%;height: 80%;" [src]="printData.applyBarCode" alt="">
+						 <img style="max-width: 90%;height: 80%;" [src]="printData.applyBarCode" alt="">
 						 <div>{{printData.applyCode}}</div>
 					 </div>
-					 <div style="width: 40%;text-align: center;">
-						 <img style="max-width: 100%;height: 100%;" [src]="tool.logoUrl" alt="">
+					 <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,16 +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;align-items: center;flex-wrap: nowrap;height: 80px;">
+				 <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: 95%;height: 80%;" [src]="printData.applyBarCode" alt="">
+						 <img style="max-width: 90%;height: 80%;" [src]="printData.applyBarCode" alt="">
 						 <div>{{printData.applyCode}}</div>
 					 </div>
-					 <div style="width: 40%;text-align: center;">
-						 <img style="max-width: 100%;height: 100%;" [src]="tool.logoUrl" alt="">
+					 <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>
@@ -369,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;align-items: center;flex-wrap: nowrap;height: 80px;">
-						<div style="width: 60%;height: 70px;text-align: center;">
-							<img style="max-width: 95%;height: 80%;" [src]="data.barCode" alt="">
-						  <div>{{data.specimenCode}}</div>
-						</div>
-						<div style="width: 40%;text-align: center;">
-							<img style="max-width: 100%;height: 100%;" [src]="tool.logoUrl" 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.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,
@@ -102,7 +103,7 @@ export class PathologyAddComponent implements OnInit {
 		  idx: 0,
 		  sum: 9999,
 		  pathologyForm: {
-				surgeryId: this.surgeryId || "",
+				surgeryId: "",
 		    patientId: this.patientId || "",
 		    hosId: this.hosId || "" ,
 		  },
@@ -120,6 +121,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);
 				}
@@ -897,8 +899,8 @@ export class PathologyAddComponent implements OnInit {
 					let date = new Date();
 					this.startDate = format(date, "yyyy-MM-dd HH:mm:ss")
 					this.validatePrintForm.controls.inVitroTime.setValue(this.startDate);
-					return
 				})
+				return
 			}
 			let data: any = {
 				pathologyForm:{
@@ -907,6 +909,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

@@ -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;align-items: center;flex-wrap: nowrap;height: 80px;">
+				 <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: 95%;height: 80%;" [src]="printData.applyBarCode" alt="">
+						 <img style="max-width: 90%;height: 80%;" [src]="printData.applyBarCode" alt="">
 						 <div>{{printData.applyCode}}</div>
 					 </div>
-					 <div style="width: 40%;text-align: center;">
-						 <img style="max-width: 100%;height: 100%;" [src]="tool.logoUrl" alt="">
+					 <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;align-items: center;flex-wrap: nowrap;height: 80px;">
-						<div style="width: 60%;height: 70px;text-align: center;">
-							<img style="max-width: 95%;height: 80%;" [src]="data.barCode" alt="">
-							<div>{{data.specimenCode}}</div>
-						</div>
-						<div style="width: 40%;text-align: center;">
-							<img style="max-width: 100%;height: 100%;" [src]="tool.logoUrl" 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

@@ -3772,7 +3772,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>
@@ -3817,7 +3817,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

@@ -209,7 +209,7 @@ export class HushijiandanComponent implements OnInit {
     this.refreshSpecimenWorkOrderMsg();
     this.initRole();
     this.getWebsocket();
-
+		this.getTaskTypesId();
     // 综合日志倒计时 start
     this.logTime = this.logTimeConst;
     clearInterval(this.logTimer);
@@ -302,7 +302,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
@@ -311,7 +365,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',
@@ -323,6 +377,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){
@@ -362,7 +425,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',
@@ -374,6 +437,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

@@ -14,7 +14,7 @@
 				    </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

@@ -87,6 +87,8 @@ export class IncidentManagementComponent implements OnInit {
 			}
 			
 		}
+		this.getDeparts();
+		this.getUsers('', 'handle');
     this.loading1 = true;
     this.debounceSubject.next(true);
   }
@@ -107,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();
@@ -140,6 +139,9 @@ export class IncidentManagementComponent implements OnInit {
 		if(itemDept){
 			this.searchDTO.maintainDepartment = itemDept.id
 		}
+		this.getDeparts();
+		this.getUsers('', 'handle');
+		this.getUsers('', 'acceptUser');
 	}
 	
 	// 选择维修科室
@@ -151,6 +153,9 @@ export class IncidentManagementComponent implements OnInit {
 		}else{
 			this.maintainGroup = this.tool.getUserInfoPermission().dutyGroupList
 		}
+		this.searchDTO.maintainDepartment = e
+		this.getDeparts();
+		this.getUsers('', 'handle');
 	}
 	
   // 搜索
@@ -197,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,
       },
@@ -359,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;
@@ -440,8 +444,7 @@ export class IncidentManagementComponent implements OnInit {
         }else{
           delete incident.candidateGroups;
         }
-				
-				if(incident.queryTask!='todo' && incident.queryTask!='owns' && incident.queryTask!='storage'){
+				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;
@@ -462,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,