病理标本优化

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

@@ -1,14 +1,25 @@
 <div class="content priority">
   <div class="contentInner">
+		<div class="hos-title">{{currentHospital.hosName}}</div>
     <div class="addressAssign">
       <overlay-scrollbars #osComponentRef2 class="contentBody2">
         <div class="contentBody">
           <div class="classList" *ngFor="let item of hospitalList">
             <span>{{ item.desc }}：</span>
-            <nz-radio-group [(ngModel)]="item.value">
+            <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>
+						
+						<!-- <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>

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

@@ -28,6 +28,10 @@
       .contentInner{
         padding: 90px 158px 72px;
         border: 1px solid #E8EBEF;
+				.hos-title{
+					font-weight: 600;
+					font-size: 16px;
+				}
         .addressAssign{
           width: 100%;
           border: none;

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

@@ -24,7 +24,36 @@ export class ConfigurationHospitalComponent implements OnInit {
     this.currentHospital = this.tool.getCurrentHospital();
     this.getList();
   }
-
+	
+	radioChange(data){
+		console.log(123,data)
+		return
+		let index = this.hospitalList.findIndex(i=>i.id == data.id)
+		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)
+		}
+	}
+	
+	changeSelect(data){
+		
+	}
+	
   // 新增/编辑表单提交
   btnLoading: boolean = false; //提交按钮loading状态
   submitMessageForm(): void {

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

@@ -5,7 +5,7 @@
         <div class="TaskTypeManagement">
           <div class="taskTypeInfo">
            <div class="top">
-              <div class="item" (click)="tabModal('characteristics')" [ngClass]="{'items':tabModalName=='characteristics'}">
+              <div class="item" [ngClass]="{'items':tabModalName=='characteristics'}">
                 {{hosName}}
               </div>
           <!--    <div class="item" (click)="tabModal('automaticOrderCreation')" [ngClass]="{'items':tabModalName=='automaticOrderCreation'}">

src/app/services/tool.service.ts

@@ -41,6 +41,10 @@ export class ToolService {
       JSON.parse(localStorage.getItem("user")).infoPermission.hospitals || []
     );
   }
+	// 获取权限中的信息
+	getUserInfoPermission() {
+	  return JSON.parse(localStorage.getItem("user")).infoPermission || [];
+	}
   // 获取权限中的分组
   getGroupList() {
     return JSON.parse(localStorage.getItem("user")).infoPermission.groups || [];
@@ -282,6 +286,9 @@ export class ToolService {
         case "reject":
           coopBtns.reject = true; //不受理
           break;
+				case "strideLook":
+				  coopBtns.strideLook = true; //跨科查看
+				  break;
       }
     });
     console.log(coopBtns);

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

@@ -51,9 +51,9 @@
 				</div>
 				
 				<div class="content-item">
-					<nz-form-item class="form-item" *ngIf="statusValue==1">
+					<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-form-control nzErrorTip="请选择申请单类型!" [nzSm]="18" [nzXs]="24">
 							<nz-radio-group formControlName="pathologyFormType">
 								<label nz-radio [nzValue]="1">术中快速病理检查申请单</label>
 								<label nz-radio [nzValue]="0">病理检查申请单</label>
@@ -280,7 +280,7 @@
   <!-- 打印 -->
   <div id="report" style="display: none;">
 		<div class="monad">
-			<div *ngIf="printData && printData.specimenList && printData.specimenList.length>1" style="border: 1px solid #AAAAAA;
+			<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="">
@@ -323,8 +323,53 @@
 					<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">日期</div>
 					<div style="width:80%;box-sizing: border-box;padding:1px;border-right: 1px solid #fff;">{{printData.specimenList[0].inVitroTime|date:'yyyy-MM-dd'}}</div>
 				</div>
+			</div>
+			
+			<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>
+				 </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>
+					<div style="width:14%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">性别</div>
+					<div style="width:16%;padding:1px;border-top: 1px solid #aaa;">{{printData.specimenList[0].patientGender}}</div>
+				</div>
+				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					<div style="width:20%;border-right: 1px solid #AAAAAA;padding:1px;">住院号</div>
+					<div style="width:50%;border-right: 1px solid #AAAAAA;padding:1px;">{{printData.residenceNo}}</div>
+					<div style="width:14%;border-right: 1px solid #AAAAAA;padding:1px;">年龄</div>
+					<div style="width:16%;padding:1px;"> {{printData.patientAge}}岁</div>
+				</div>
+				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					<div style="width:20%;border-right: 1px solid #AAAAAA;padding:1px;">科室 </div>
+					<div style="width:50%;border-right: 1px solid #AAAAAA;
+					padding:1px;overflow: hidden;white-space: nowrap">{{printData.patientDept}}</div>
+					<div style="width:14%;border-right: 1px solid #AAAAAA;padding:1px;">床号</div>
+					<div style="width:16%;padding:1px;">{{printData.patientBedNum}}床</div>
+				</div>
+				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
+					<div style="width:20%;border-right: 1px solid #AAAAAA;padding:1px;">部位 </div>
+					<div style="width:50%;border-right: 1px solid #AAAAAA;
+					padding:1px;overflow: hidden;white-space: nowrap">{{printData.takePart}}</div>
+					<div style="width:14%;border-right: 1px solid #AAAAAA;padding:1px;">标本数</div>
+					<div style="width:16%;padding:1px;">{{printData.specimenNum}}</div>
+				</div>
+				<div style="display: flex;">
+					<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">日期</div>
+					<div style="width:80%;box-sizing: border-box;padding:1px;border-right: 1px solid #fff;">{{printData.specimenList[0].inVitroTime|date:'yyyy-MM-dd'}}</div>
+				</div>
 			</div>
+			
 			<div style="height: 20px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></div>
 			<div style="font-size: 12px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>0">
 				<div *ngFor="let data of printData.specimenList; let index=index;">

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

@@ -630,8 +630,8 @@ export class PathologyAddComponent implements OnInit {
 		let ids = this.validateForm.value.project.join(',')
 		let data: any = {
 			pathologyForm:{
-				...this.validateForm.value,
 				...this.detailsData,
+				...this.validateForm.value,
 				inVitroTime:this.startDate,
 				surgeryId: this.surgeryId || "",
 				patientId: this.patientId || "",
@@ -752,13 +752,14 @@ export class PathologyAddComponent implements OnInit {
 		delete data.pathologyForm.specimenGenre 
 		that.zcLoading = true;
 		this.mainService.pathologyOperation(data,'storage').subscribe((res:any) => {
-				that.zcLoading = false;
-				if(res.status==200){
-					this.message.success('操作成功')
-				}else{
-					this.message.error(res.msg)
-				}
-		  });
+			that.zcLoading = false;
+			if(res.status==200){
+				this.message.success('操作成功')
+				this.hideModal()
+			}else{
+				this.message.error(res.msg)
+			}
+		});
 	}
 	
 	// 追加打印
@@ -830,6 +831,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
 							}
@@ -869,8 +871,8 @@ export class PathologyAddComponent implements OnInit {
 			}
 			let data: any = {
 				pathologyForm:{
-					...this.validateForm.value,
 					...this.detailsData,
+					...this.validateForm.value,
 					surgeryId: this.surgeryId || "",
 					patientId: this.patientId || "",
 					hosId: this.hosId || "" ,

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

@@ -50,13 +50,12 @@
 					<div class="form-title-box">
 						<div class="form-title"><span class="font-weight-500">标本类型：</span>{{detailsData.specimenType.name||'无'}}</div>
 						<div class="form-title"><span class="font-weight-500">标本数量：</span>{{detailsData.specimenNum||'无'}}</div>
-						<div class="form-title"><span class="font-weight-500">部位：</span>{{detailsData.takePart||'无'}}</div>
 					</div>
 					
 					<div class="form-title-box">
-						<div class="form-title"><span class="font-weight-500">送检医生：</span>{{detailsData.surgeryDoctorDTO?detailsData.surgeryDoctorDTO.name : '-'}}</div>
-						<div class="form-title"><span class="font-weight-500">离体时间：</span>{{detailsData.inVitroTime?(detailsData.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</div>
-						<div class="form-title"><span class="font-weight-500">固定时间：</span>{{detailsData.fixationTime?(detailsData.fixationTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</div>
+						<div class="form-title"><span class="font-weight-500">部位：</span>{{detailsData.takePart||'无'}}</div>
+						<!-- <div class="form-title"><span class="font-weight-500">离体时间：</span>{{detailsData.inVitroTime?(detailsData.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</div> -->
+						<!-- <div class="form-title"><span class="font-weight-500">固定时间：</span>{{detailsData.fixationTime?(detailsData.fixationTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</div> -->
 					</div>
 					
 					<div class="form-list">

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

@@ -104,6 +104,7 @@
 					.form-list{
 						margin-bottom: 10px;
 						.cursor{
+							text-decoration: underline;
 							cursor: pointer;
 						}
 						.indent{

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

@@ -3793,7 +3793,7 @@
 						<tr class="thead">
 							<th>申请单类型</th>
 							<th>申请单号</th>
-							<th>检验项目</th>
+							<th nzWidth="15%">检验项目</th>
 							<th>标本类型</th>
 							<th>申请时间</th>
 							<th>申请科室</th>
@@ -3802,7 +3802,9 @@
 					</thead>
 					<tbody>
 						<tr *ngFor="let data of viewData">
-							<td>{{ data.pathologyFormType && data.pathologyFormType==1?'术中快速病理检查申请单':'病理检查申请单'}}</td>
+							<td *ngIf="data.pathologyFormType==1">术中快速病理检查申请单</td>
+							<td *ngIf="data.pathologyFormType==0">病理检查申请单</td>
+							<td *ngIf="data.pathologyFormType==null">无</td>
 							<td style="text-decoration: underline;cursor: pointer;" (click)="itemClick(data)">{{ data.applyCode}}</td>
 							<td>{{ data.arr ? data.arr.join('、') : '无' }}</td>
 							<td>{{ data.specimenType?data.specimenType.name:'无'}}</td>

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

@@ -324,6 +324,7 @@ export class HushijiandanComponent implements OnInit {
 			.subscribe((data) => {
 				this.isSpinning = false
 				if(data.list.length==1){
+					this.detailId = data.list[0].id
 					if(!data.list[0].status){
 						this.pathologyModal = true
 						return
@@ -335,9 +336,17 @@ export class HushijiandanComponent implements OnInit {
 					}else{
 						this.pathologyDetailModal = true
 					}
-				}else{
+				}else if(data.list.length>1){
 					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
+				}else if(data.list.length==0){
+					this.message.error('无申请单')
 				}
 			});
 	}
@@ -378,16 +387,20 @@ export class HushijiandanComponent implements OnInit {
 				}else{
 					this.pathologyDetailModal = true
 				}
-			}else{
+			}else if(data.list.length>1){
 				this.viewData = data.list
-				// let arr = []
-				if(this.viewData.pathologyInspectDTOS){
-					for(let i of this.viewData.pathologyInspectDTOS){
+				for(let i of this.viewData){
+					if(i.pathologyInspectDTOS){
 						i.arr = []
-						i.arr.push(i.inspectProject.name)
+						for(let x of i.pathologyInspectDTOS){
+							i.arr.push(x.inspectProject.name)
+						}
 					}
 				}
+				console.log(777,this.viewData)
 				this.multiDialog = true
+			}else if(data.list.length==0){
+				this.message.error('无申请单')
 			}
 		});
 	}

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

@@ -5,6 +5,24 @@
     </div>
     <div class="list-template__top" nz-row>
       <div nz-col nzXl='18' class="list-template__searchBox">
+				<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">
+				    <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'">
+				  <span class="label">维修组</span>：
+				  <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch
+				     nzAllowClear nzPlaceHolder="请选择维修组" [(ngModel)]="searchDTO.maintainGroup">
+				    <ng-container *ngFor="let option of maintainGroup">
+				      <nz-option [nzLabel]="option.groupName" [nzValue]="option.id"></nz-option>
+				    </ng-container>
+				  </nz-select>
+				</div>
         <div class="list-template__searchItem">
           <span class="label">登记时间</span>：
           <nz-range-picker style="width: 373px;" nzShowTime [(ngModel)]="searchDTO.dateRange" (nzOnCalendarChange)="onCalendarChangeDate($event)"></nz-range-picker>
@@ -68,7 +86,7 @@
           </tr>
         </thead>
         <tbody>
-          <tr *ngFor="let data of listOfData;let index=index;">
+          <tr *ngFor="let data of listOfData;let index=index;" (click)="detail($event,data)">
             <td>{{index+(pageIndex-1) * pageSize + 1}}</td>
             <td class="text_align_left">
               <span [ngClass]="priorityColor(data.priorityId)">{{ data.priorityDTO?.name }}</span>

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

@@ -63,19 +63,31 @@ export class IncidentManagementComponent implements OnInit {
 
   searchTimerSubject = new Subject();
   debounceSubject = new Subject(); //防抖
-
+	maintainDept:any = []; //维修科室
+	maintainGroup:any = []; //维修组
+	hosIds:any; //当前院区
   // 初始化增删改按钮
   coopBtns: any = {};
-
   // 选择tab
   queryTask:string = 'todo';//默认待我接单
   changeTab(key){
     this.queryTask = key;
+		let itemDept = this.maintainDept.find(i=>i.id == this.hosIds)
+		if(itemDept){
+			this.searchDTO.maintainDepartment = itemDept.id
+		}
     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
+		}
     this.initSearchForm();
     this.searchTimerSubject.pipe(debounceTime(500)).subscribe((v) => {
       let fun = v[0];
@@ -292,6 +304,7 @@ export class IncidentManagementComponent implements OnInit {
         acceptUser: this.validateSearchForm.value.acceptUser ? { id: this.validateSearchForm.value.acceptUser } : undefined,
         selectType: this.validateSearchForm.value.selectType || undefined,
         deleteFlag: this.validateSearchForm.value.deleteFlag,
+				candidateGroupId: null,
       },
     };
 
@@ -308,7 +321,21 @@ export class IncidentManagementComponent implements OnInit {
         delete postData.incident.duty;
         delete postData.incident.hosId;
     }
-
+		
+		if(this.queryTask!='todo' && this.queryTask!='doing' && this.queryTask!='storage'){
+			if(this.searchDTO.maintainDepartment){
+				let itemDept = this.maintainDept.find(i=>i.id == this.searchDTO.maintainDepartment)
+				postData.incident.duty = itemDept;
+				delete postData.incident.hosId;
+			}
+		}
+		
+		if(this.queryTask!='todo' && this.queryTask!='owns' && this.queryTask!='storage'){
+			postData.incident.candidateGroupId = this.searchDTO.maintainGroup
+		}else{
+			delete postData.incident.candidateGroupId;
+		}
+		
     postData.incident.queryTask = this.queryTask;
 
     if(this.queryTask === 'todo' || this.queryTask === 'owns'){
@@ -595,6 +622,7 @@ export class IncidentManagementComponent implements OnInit {
         acceptUser: this.validateSearchForm.value.acceptUser ? { id: this.validateSearchForm.value.acceptUser } : undefined,
         selectType: this.validateSearchForm.value.selectType || undefined,
         deleteFlag: this.validateSearchForm.value.deleteFlag,
+				candidateGroupId: null
       },
     };
 
@@ -611,7 +639,21 @@ export class IncidentManagementComponent implements OnInit {
         delete postData.incident.duty;
         delete postData.incident.hosId;
     }
-
+		
+		if(this.queryTask!='todo' && this.queryTask!='doing' && this.queryTask!='storage'){
+			if(this.searchDTO.maintainDepartment){
+				let itemDept = this.maintainDept.find(i=>i.id == this.searchDTO.maintainDepartment)
+				postData.incident.duty = itemDept;
+				delete postData.incident.hosId;
+			}
+		}
+		
+		if(this.queryTask!='todo' && this.queryTask!='owns' && this.queryTask!='storage'){
+			postData.incident.candidateGroupId = this.searchDTO.maintainGroup
+		}else{
+			delete postData.incident.candidateGroupId;
+		}
+		
     postData.incident.queryTask = this.queryTask;
 
     if(this.queryTask === 'todo' || this.queryTask === 'owns'){

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

@@ -315,7 +315,7 @@ export class OfficeManagementComponent implements OnInit {
       hid = this.hospital - 0;
     }
     let data = {
-      hosId: this.add ? this.tool.getCurrentHospital().id : hid,
+      cascadeHosId: this.add ? this.tool.getCurrentHospital().id : hid,
     };
     this.maskFlag = this.message.loading("正在加载中..", {
       nzDuration: 0,

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

@@ -2,6 +2,16 @@
   <div class="list-template__content">
     <div class="list-template__top" nz-row>
       <div nz-col nzLg='18' class="list-template__searchBox">
+				<div class="list-template__searchItem" *ngIf="coopBtns.strideLook">
+				  <span class="label">维修科室</span>：
+				  <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch
+				     nzAllowClear nzPlaceHolder="请选择维修科室" [(ngModel)]="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">
           <span class="label">标题：</span>
           <input nz-input class="formItem" [(ngModel)]="title" placeholder="请输入标题" nzSize="default" />

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

@@ -40,6 +40,11 @@ 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) => {
 
     });
@@ -47,6 +52,9 @@ export class RepositoryManageComponent implements OnInit {
     this.coopBtns = this.tool.initCoopBtns(this.route);
 		this.getList();
   }
+	maintainDept:any = []; //维修科室
+	maintainDepartment:any;
+	hosIds:any; //当前院区
 	richText:any;
   listOfData: any[] = []; //表格数据
   promptContent: string; //操作提示框提示信息
@@ -167,10 +175,12 @@ export class RepositoryManageComponent implements OnInit {
       solution: {
     		title:this.title,
 				solutionNumber:this.solutionNumber,
-    		hosId: this.hosId
+    		hosId: this.hosId,
       },
     };
-
+		if(this.maintainDepartment){
+			data.solution.hosId = this.maintainDepartment;
+		}
     this.loading1 = true;
     that.mainService
       .getFetchDataList("data", "solution", data)

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

@@ -456,7 +456,7 @@
 
 <!-- 标本接收 -->
 <div class="pathology-box display_flex align-items_center justify-content_flex-center" *ngIf="fixationModal">
-	<div class="pathology-content">
+	<div class="pathology-content width-80">
 		<div class="title">标本接收固定
 		<i class="icon_transport transport-guanbi" (click)="hideSpecimenModal()"></i></div>
 		<div class="content">
@@ -476,7 +476,7 @@
 				<nz-form-item class="form-title-box">
 					<div class="form-title mar-ri-20"><span class="font-weight-500">患者信息：</span>{{codeData.patientDTO.patientName}} ({{codeData.patientDTO.bedNum}}床)</div>
 					<div class="form-title mar-ri-20"><span class="font-weight-500">年龄：</span>{{codeData.patientDTO.age||'-'}}</div>
-					<div class="form-title mar-ri-20"><span class="font-weight-500">性别：</span>{{codeData.patientDTO.gender.name||'-'}}</div>
+					<div class="form-title mar-ri-20"><span class="font-weight-500">性别：</span>{{codeData.patientDTO.gender?codeData.patientDTO.gender.name:'-'}}</div>
 					<div class="form-title mar-ri-20"><span class="font-weight-500">住院号：</span>{{codeData.patientDTO.patientCode}}</div>
 				</nz-form-item>
 				<div class="form-title-box">
@@ -507,8 +507,6 @@
 				</div>
 				<div class="form-title-box">
 					<div class="form-title"><span class="font-weight-500">部位：</span>{{codeData.takePart||'无'}}</div>
-					<div class="form-title"><span class="font-weight-500">取标本位置：</span>{{codeData.surgeryDeptDTO?codeData.surgeryDeptDTO.dept:''}}</div>
-					<div class="form-title"><span class="font-weight-500">取材医生：</span>{{codeData.surgeryDoctorDTO?codeData.surgeryDoctorDTO.name : '-'}}</div>
 				</div>
 			</div>
 			
@@ -661,13 +659,12 @@
 				<div class="form-title-box">
 					<div class="form-title"><span class="font-weight-500">标本类型：</span>{{detailsData.specimenType.name||'无'}}</div>
 					<div class="form-title"><span class="font-weight-500">标本数量：</span>{{detailsData.specimenNum||'无'}}</div>
-					<div class="form-title"><span class="font-weight-500">部位：</span>{{detailsData.takePart||'无'}}</div>
 				</div>
 				
 				<div class="form-title-box">
-					<div class="form-title"><span class="font-weight-500">送检医生：</span>{{detailsData.surgeryDoctorDTO?detailsData.surgeryDoctorDTO.name : '-'}}</div>
-					<div class="form-title"><span class="font-weight-500">离体时间：</span>{{detailsData.inVitroTime?(detailsData.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</div>
-					<div class="form-title"><span class="font-weight-500">固定时间：</span>{{detailsData.fixationTime?(detailsData.fixationTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</div>
+					<div class="form-title"><span class="font-weight-500">部位：</span>{{detailsData.takePart||'无'}}</div>
+					<!-- <div class="form-title"><span class="font-weight-500">离体时间：</span>{{detailsData.inVitroTime?(detailsData.inVitroTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</div> -->
+					<!-- <div class="form-title"><span class="font-weight-500">固定时间：</span>{{detailsData.fixationTime?(detailsData.fixationTime|date:'yyyy-MM-dd HH:mm:ss'):'无'}}</div> -->
 				</div>
 				
 				<div class="form-list">

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

@@ -657,8 +657,11 @@
 	height: 100%;
 	background: rgba(0, 0, 0, 0.4);
 	z-index: 99;
+	.width-80{
+		width: 80% !important;
+	}
 	.pathology-content{
-		width: 90%;
+		width: 80%;
 		background: #fff;
 		border-radius: 5px;
 		padding: 10px 20px;
@@ -743,6 +746,8 @@
 							display: flex;
 							flex-wrap: wrap;
 							.specimen-item-class{
+								text-decoration: underline;
+								cursor: pointer;
 								margin-right: 40px;
 								color:#333;
 							}

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

@@ -180,7 +180,9 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			this.isSpinning = false
 			if(res.status==200){
 				this.codeData = res.data[0]
-				if(!this.codeData.pathologySpecimenDTOList[0].fixationTime && this.codeData.pathologyFormType==0){
+				let item = this.codeData.pathologySpecimenDTOList.find(i=>i.specimenCode == e)
+				console.log(7,item)
+				if(!item.fixationTime && this.codeData.pathologyFormType==0){
 					if(this.codeData.status.value==2 || this.codeData.status.value==3 ||
 						this.codeData.status.value==4){
 							if(this.codeData.pathologyInspectDTOS){
@@ -198,20 +200,20 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 						}
 					this.fixationError = null
 					this.searchMsg = null
-				}else if(this.codeData.pathologySpecimenDTOList[0].fixationTime && this.codeData.pathologyFormType==0){
+				}else if(item.fixationTime && this.codeData.pathologyFormType==0){
 					this.viewDetail(this.codeData,'4')
+					this.barCode = null
 					this.fixationError = null
 					this.searchMsg = null
 				}else{
-					this.message.error('该申请单类型不是病理检查申请单')
+					this.barCode = null
 					this.fixationError = null
-					this.searchMsg = null
+					this.searchMsg = '该申请单类型不是病理检查申请单'
 				}
 				
 			}else{
 				this.barCode = null
 				this.searchMsg = res.msg
-				// this.message.error(res.msg)
 			}
 		})
 	}
@@ -244,6 +246,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 	// 关闭接受固定标本
 	hideSpecimenModal(){
 		this.autoUpdate()
+		this.cancelSpecimenModal()
 		this.barCode = null;
 		this.specimenCode = null;
 		this.fixationError = null
@@ -252,7 +255,20 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			document.getElementById('Binput').focus();
 		},200)
 	}
-
+	
+	cancelSpecimenModal(){
+		let ids = []
+		for(let i of this.codeData.pathologySpecimenDTOList){
+			ids.push(i.id)
+		}
+		let data = {
+			pathologySpecimenIds:ids.join(',')
+		}
+		this.mainService.pathologyOperation(data,'cancel').subscribe((res) =>{
+			
+		})
+	}
+	
 	// 获取标本详情
 	project:any = [];
 	getSampleData(item){
@@ -556,8 +572,14 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			this.tableLoading = false
 			this.specimenCode = null
 			if(res.status==200){
-				this.codeData = res.data[0]
-				this.fixationError = null
+				let item = res.data[0].pathologySpecimenDTOList.find(i=>i.specimenCode == e)
+				console.log(8,item)
+				if(item.fixationTime){
+					this.fixationError = '该标本已经固定过'
+				}else{
+					this.codeData = res.data[0]
+					this.fixationError = null
+				}
 			}else{
 				this.fixationError = res.msg
 			}

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

@@ -249,7 +249,8 @@ export class UsersManagementComponent implements OnInit {
     let hid = this.hosId - 0;
     let data = {
       department: {
-        hospital: { id: hid },
+        // hospital: { id: hid },
+				cascadeHosId: hid
       },
       idx: 0,
       sum: 20,
@@ -295,7 +296,8 @@ export class UsersManagementComponent implements OnInit {
     this.userGroup1 = null;
     let departmentData = {
       department: {
-        hospital: { id },
+        // hospital: { id },
+				cascadeHosId: id
       },
       idx: 0,
       sum: 20,
@@ -462,7 +464,8 @@ export class UsersManagementComponent implements OnInit {
     var hid = data.hospital.id;
     let departmentData = {
       department: {
-        hospital: { id: hid },
+        // hospital: { id: hid },
+				cascadeHosId: hid
       },
       idx: 0,
       sum: 20,
@@ -696,9 +699,10 @@ export class UsersManagementComponent implements OnInit {
     let data = {
       department: {
         dept,
-        hospital: {
-          id: hosId,
-        },
+        // hospital: {
+        //   id: hosId,
+        // },
+				cascadeHosId: hosId
       },
       idx: 0,
       sum: 20,