Merge branch 'develop' into lmm

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

@@ -4,14 +4,14 @@
       <div class="contentBody2">
         <div class="TaskTypeManagement">
           <div class="taskTypeInfo">
-<!--            <div class="top">
-              <div class="item" (click)="tabModal('characteristics')" [ngClass]="{'items':tabModalName=='characteristics'}">
-                特性配置
+           <div class="top">
+              <div class="item" [ngClass]="{'items':tabModalName=='characteristics'}">
+                {{hosName}}
               </div>
-              <div class="item" (click)="tabModal('automaticOrderCreation')" [ngClass]="{'items':tabModalName=='automaticOrderCreation'}">
+          <!--    <div class="item" (click)="tabModal('automaticOrderCreation')" [ngClass]="{'items':tabModalName=='automaticOrderCreation'}">
                 自动建单配置
-              </div>
-            </div> -->
+              </div> -->
+            </div>
             <div class="list" *ngIf="!loading">
               <!-- 动态数字密钥 -->
               <div>

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

@@ -263,7 +263,7 @@
 
         & > div {
           border-right: 1px solid #e5e9ed;
-          width: 30%;
+          width: 100%;
           text-align: center; // display: flex;
           // align-items: center;
           cursor: pointer;

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

@@ -15,7 +15,7 @@ export class ConfigurationKeyComponent implements OnInit {
   btnLoading:boolean = false; //提交按钮的loading
   tabModalName:string = 'characteristics'; //当前选中的tab
   hosId = this.tool.getCurrentHospital().id; //当前院区
-
+	hosName = this.tool.getCurrentHospital().hosName //当前院区名称
   // 数字密钥
   returnSpecimenWhetherHandover:any[] = [
     {label:'是否开启',value: 0}

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

@@ -1,8 +1,13 @@
-<div class="content specimen">
+<div class="content specimen" id="dictionary">
   <div class="contentInner">
+		<div class="address">
+		  <overlay-scrollbars #osComponentRef1 class="contentBody">
+		    <div class="contentItem" [title]="item.name" [ngClass]="{ active: item.key == activeDictionaryKey }" (click)="clickDictionaryKey(item)" *ngFor="let item of dictionaryKeyList">{{ item.name }}</div>
+		  </overlay-scrollbars>
+		</div>
     <div class="addressAssign">
       <div class="contentBody2">
-        <div class="TaskTypeManagement">
+        <div class="TaskTypeManagement" *ngIf="activeDictionaryKey=='examine'">
           <div class="taskTypeInfo">
             <div class="top">
               <div class="item" (click)="tabModal('characteristics')" [ngClass]="{'items':tabModalName=='characteristics'}">
@@ -99,6 +104,28 @@
             </div>
           </div>
         </div>
+				<div class="TaskTypeManagement" *ngIf="activeDictionaryKey=='pathology'">
+					<div class="taskTypeInfo">
+						<div class="list">
+							<!--是否支持根据手术新建申请单 -->
+							<div class="display_flex align-items_center mb8">
+								<nz-form-label class="label">是否支持根据手术新建申请单</nz-form-label>
+								<nz-checkbox-group [(ngModel)]="autoCreate"></nz-checkbox-group>
+							</div>
+							<div class="bottom">
+								<button class="login-form-button" nzType="primary" [nzLoading]="btnLoading" nz-button (click)="submitPathologyForm()">保存</button>
+							</div>
+							<div class="list" *ngIf="loading">
+							  <div class="loadingFull display_flex justify-content_flex-center align-items_center">
+							    <div class="loadingFullInner">
+							      <img src="../../../assets/images/loading.gif" alt="">
+							      <div>加载中...</div>
+							    </div>
+							  </div>
+							</div>
+						</div>
+					</div>
+				</div>
       </div>
     </div>
   </div>

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

@@ -15,6 +15,66 @@
     width: 100%!important;
     height: 100%!important;
   }
+  #dictionary{
+    margin: 24px 16px;
+    .addressAssign{
+      flex: 7;
+    }
+    .contentItem{
+      margin: 0 16px;
+      padding: 8px;
+      text-align: center;
+      &.active{
+        background-color: @primary-color;
+        color: #fff;
+        border-radius: 4px;
+      }
+    }
+    .contentBody{
+      padding: 16px;
+      min-height: 0;
+      display: flex;
+      flex-direction: column;
+    }
+    .contentBody2{
+      flex: 1;
+    }
+    ::ng-deep .ant-form-item{
+      margin-bottom: 0;
+    }
+    .dictionaryRow{
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      gap: 16px;
+      .orders{
+        flex: 1;
+        display: flex;
+        justify-content: flex-end;
+        align-items: center;
+      }
+      .name{
+        width: 100px;
+        display: flex;
+        justify-content: flex-end;
+        align-items: center;
+      }
+      .value{
+        flex: 3;
+        display: flex;
+        align-items: center;
+        .valueInput{
+          width: 600px;
+        }
+        .icon_transport{
+          font-size: 20px;
+          color: #8a8a8a;
+          cursor: pointer;
+        }
+      }
+
+    }
+  }
   .content{
     flex: 1;
     min-height: 0;
@@ -22,33 +82,12 @@
     flex-direction: column;
     justify-content: space-between;
     border: 1px solid #EEF3F9;
-    &.specimen{
-      margin: 24px 24px 0;
+    &.priority{
+      margin: 24px 118px 0;
       background-color: #fff;
       .contentInner{
-        padding: 40px 158px 72px;
+        padding: 48px 206px;
         border: 1px solid #E8EBEF;
-        .addressAssign{
-          width: 100%;
-          border: none;
-        }
-        .contentBody{
-          flex: 1;
-          display: flex;
-          flex-direction: column;
-          align-items: center;
-          padding: 0 16px;
-          gap: 32px;
-        }
-        .hospital{
-          width: 100%;
-          text-align: left;
-        }
-        .classList{
-          .select{
-            width: 313px;
-          }
-        }
       }
     }
     .contentItem{
@@ -66,10 +105,10 @@
     .contentInner{
       flex: 1;
       display: flex;
-      flex-direction: column;
+      justify-content: space-between;
       align-items: center;
       padding: 0 16px;
-      gap: 32px;
+      gap: 16px;
       .contentHead{
         height: 45px;
         display: flex;
@@ -90,13 +129,10 @@
         }
       }
       .contentBody{
-        padding: 0 8px 16px;
+        padding: 0 8px;
         margin: 4px 0;
         flex: 1;
       }
-      .contentBody2{
-        flex: 1;
-      }
       .address{
         flex: 1;
         height: 100%;
@@ -139,9 +175,8 @@
       align-items: center;
     }
   }
-
   .TaskTypeManagement {
-    height: calc(100vh - 224px);
+    height: calc(100vh - 136px);
     background: #f9fafb;
     overflow: hidden;
     padding: 16px 20px;

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

@@ -15,7 +15,22 @@ export class ConfigurationSpecimenComponent implements OnInit {
   btnLoading:boolean = false; //提交按钮的loading
   tabModalName:string = 'characteristics'; //当前选中的tab
   hosId = this.tool.getCurrentHospital().id; //当前院区
-
+	
+	// tab类型
+	dictionaryKeyList:any[] = [
+		{
+			name:'检查标本',key:'examine'
+		},
+		{
+			name:'病理标本',key:'pathology'
+		}
+	];
+	
+	// 扫描时指定科室不提醒勾选项
+	autoCreate:any[] = [
+	  {label:'是否开启',value: 0}
+	];
+	
   // 扫描时指定科室不提醒勾选项
   deptNotAlert:any[] = [
     {label:'是否开启',value: 0}
@@ -77,7 +92,19 @@ export class ConfigurationSpecimenComponent implements OnInit {
     this.getDeptList();
     this.getTaskType();
   }
-
+	
+	// 点击数据字典key
+	activeDictionaryKey:any = 'examine';
+	clickDictionaryKey(item){
+	  this.activeDictionaryKey = item.key;
+		if(item.key=='examine'){
+			this.getDeptList();
+			this.getTaskType();
+		}else{
+			this.getTaskTypesId()
+		}
+	}
+	
   // 扫描时指定科室不提醒勾选项
   changeDeptNotAlert(e){
     console.log(e);
@@ -135,7 +162,27 @@ export class ConfigurationSpecimenComponent implements OnInit {
   tabModal(tabModalName:string){
     this.tabModalName = tabModalName;
   }
-  // 保存
+	
+	//病理标本保存
+	submitPathologyForm(){
+		let postData:any = {
+		  id: this.configs.id,
+		  taskType: this.taskTypeData.id,
+		  hosId: this.hosId,
+		  autoCreate: this.autoCreate[0].checked ? 1 : 0,
+		};
+		this.btnLoading = true;
+		this.mainService
+		  .simplePost("addData", "taskTypeConfig", postData)
+		  .subscribe((result) => {
+		    this.btnLoading = false;
+		    if (result.status == 200) {
+		      this.getConfig();
+		    }
+		  });
+	}
+	
+  // 检查标本保存
   submitForm() {
     if(!this.tasktype.id){
       this.msg.create("warning", "请先配置患者陪检任务类型！");
@@ -170,7 +217,16 @@ export class ConfigurationSpecimenComponent implements OnInit {
         }
       });
   }
-
+	
+	// 获取任务类型（病理标本）
+	taskTypeData:any;
+	getTaskTypesId() {
+		this.mainService.getDictionary("list", "ordinary_field").subscribe((data) => {
+			this.taskTypeData = data.find(i=>i.value=='pathology')
+			this.getConfig();
+		});
+	}
+	
   //获取任务类型
   getTaskType() {
     this.loading = true;
@@ -202,24 +258,40 @@ export class ConfigurationSpecimenComponent implements OnInit {
   // 获取配置
   getConfig() {
     this.loading = true;
-    let postData = {
-      idx: 0,
-      sum: 10,
-      taskTypeConfig: {
-        taskTypeDTO: {
-          hosId: {
-            id: this.hosId
-          },
-          associationType: this.tasktype.associationType
-        }
-      }
-    };
+		let postData = null;
+		if(this.activeDictionaryKey=='examine'){
+			postData = {
+			  idx: 0,
+			  sum: 10,
+			  taskTypeConfig: {
+			    taskTypeDTO: {
+			      hosId: {
+			        id: this.hosId
+			      },
+			      associationType: this.tasktype.associationType
+			    }
+			  }
+			};
+		}else{
+			postData = {
+			  idx: 0,
+			  sum: 10,
+			  taskTypeConfig: {
+					hosId:this.hosId,
+					taskType:this.taskTypeData.id
+			  }
+			};
+		}
+    
     this.mainService
       .getFetchDataList("simple/data", "taskTypeConfig", postData)
       .subscribe((result) => {
         this.loading = false;
         if (result.status == 200) {
           this.configs = result.list[0] || {};
+					// 病理标本
+					this.autoCreate[0].checked = this.configs.autoCreate == 1;
+					// 检查标本
           this.deptNotAlert[0].checked = this.configs.deptNotAlert == 1;
           this.arriveScanCode[0].checked = this.configs.arriveScanCode == 1;
           this.arriveScanDynamicCode[0].checked = this.configs.arriveScanDynamicCode == 1;

src/app/services/main.service.ts

@@ -929,7 +929,21 @@ export class MainService {
 	     headers: this.headers,
 	   });
 	 }
-
+	
+	//病理申请单追加打印/全量打印
+	 pathologyCheckPrint(type,businessId) {
+	   return this.http.post(host.host + `/pathology/check/${type}/${businessId}`, {}, {
+	     headers: this.headers,
+	   });
+	 }
+	
+	// 病例申请单暂存
+	pathologyOperation(data,operation) {
+	  return this.http.post(host.host + `/pathology/${operation}`, data, {
+	    headers: this.headers,
+	  });
+	}
+	
 	// 病理查询标本条码
 	pathologyScanCode(data) {
 	  return this.http.post(host.host + `/pathology/scanCode`, data, {

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

@@ -6,20 +6,24 @@
 			<form nz-form [formGroup]="validateForm" class="addForm" (ngSubmit)="submitForm()">
 				<div class="content-item boder-right">
 					<nz-form-item class="form-title-box">
-						<div class="form-title">取标本位置：{{detailsData.surgeryDeptDTO.dept}}</div>
-						<div class="form-title">取材医生：{{detailsData.surgeryDoctorDTO?detailsData.surgeryDoctorDTO.name : '-'}}</div>
+						<div class="form-title" *ngIf="detailsData.pathologyFormType==null">申请单类型：无</div>
+						<div class="form-title" *ngIf="detailsData.pathologyFormType==1">申请单类型：术中快速病理检查申请单</div>
+						<div class="form-title" *ngIf="detailsData.pathologyFormType==0">申请单类型：病理检查申请单</div>
+						<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status?detailsData.status.name:'-'}}</div>
 					</nz-form-item>
 					<nz-form-item class="form-title-box">
-						<div class="form-title"><span class="font-weight-500">申请单编号：</span>{{detailsData.applyCode}}</div>
-						<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status.name}}</div>
+						<div class="form-title"><span class="font-weight-500">申请单号：</span>{{detailsData.applyCode}}</div>
+						<div class="form-title over-class"><span class="font-weight-500">申请科室：</span>{{detailsData.patientDTO.department.dept}}</div>
 					</nz-form-item>
 					<nz-form-item class="form-title-box">
-						<div class="form-title"><span class="font-weight-500">科室名称：</span>{{detailsData.patientDTO.department.dept}}</div>
-						<div class="form-title"><span class="font-weight-500">住院号：</span>{{detailsData.patientDTO.patientCode}}</div>
+						<div class="form-title">手术间：{{detailsData.surgeryDeptDTO.dept}}</div>
+						<div class="form-title">取材医生：{{detailsData.surgeryDoctorDTO?detailsData.surgeryDoctorDTO.name : '-'}}</div>
 					</nz-form-item>
 					<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?detailsData.patientDTO.gender.name:'-'}}</div>
+						<div class="form-title"><span class="font-weight-500">住院号：</span>{{detailsData.patientDTO.patientCode}}</div>
 					</nz-form-item>
 					<nz-form-item>
 						<div class="form-title width-100 font-weight-500">诊断：</div>
@@ -47,26 +51,26 @@
 				</div>
 				
 				<div class="content-item">
-<!-- 					<nz-form-item class="form-item">
-						<nz-form-label nzRequired nzFor="intraoperativeFindings" [nzSm]="6" [nzXs]="24">术中所见</nz-form-label>
-						<nz-form-control nzErrorTip="请输入术中所见" [nzSm]="24" [nzXs]="24">
-							<textarea rows="3" nz-input formControlName="intraoperativeFindings" placeholder="请输入术中所见"></textarea>
+					<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">
+								<label nz-radio [nzValue]="1">术中快速病理检查申请单</label>
+								<label nz-radio [nzValue]="0">病理检查申请单</label>
+							</nz-radio-group>
 						</nz-form-control>
-					</nz-form-item> -->
+					</nz-form-item>
 					<nz-form-item class="form-item">
-						<nz-form-label nzRequired nzFor="intraoperativeRapidity" [nzSm]="6" [nzXs]="24">是否术中快速</nz-form-label>
-						<nz-form-control nzErrorTip="请选择!" [nzSm]="18" [nzXs]="24">
-							<nz-radio-group formControlName="intraoperativeRapidity">
-								<label nz-radio [nzValue]="1">是</label>
-								<label nz-radio [nzValue]="0">否</label>
-							</nz-radio-group>
+						<nz-form-label nzFor="intraoperativeFindings" [nzSm]="4" [nzXs]="24">术中所见</nz-form-label>
+						<nz-form-control nzErrorTip="请输入术中所见" [nzSm]="20" [nzXs]="24">
+							<input nz-input formControlName="intraoperativeFindings" placeholder="请输入术中所见"/>
 						</nz-form-control>
 					</nz-form-item>
 					<nz-form-item class="form-item">
 						<nz-form-label nzRequired nzFor="project" [nzSm]="4" [nzXs]="24">检验项目</nz-form-label>
 						<nz-form-control nzErrorTip="请选择检验项目!" [nzSm]="20" [nzXs]="24">
 							<nz-input-group>
-								<nz-select nzSearch nzShowSearch nzMode="multiple" nzPlaceHolder="请选择检验项目" formControlName="project">
+								<nz-select nzSearch nzMode="multiple" nzShowSearch nzPlaceHolder="请选择检验项目" formControlName="project">
 									<ng-container *ngFor="let option of projectData">
 										<nz-option [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
 									</ng-container>
@@ -119,6 +123,7 @@
 						<div *ngFor="let item of specimenList;let index=index;" class="specimen-item">
 							<div class="specimen-name" (click)="specimenEdit($event,item,index)">
 							{{item.partSource?item.partSource.name:''}}{{item.organ?item.organ.name:''}}{{item.specimenName}}
+							({{item.specimenCode}})
 							</div>
 							<span class="icon_transport transport-lajitong specimen-icon" (click)="specimenDel($event,item,index)"></span>
 						</div>
@@ -129,8 +134,16 @@
 		<div class="mask-style" *ngIf="isSpinning">
 			<nz-spin nzSimple class="spin-style"></nz-spin>
 		</div>
-		<div class="display_flex justify-content_flex-center bottom-btn">
-		  <button class="btn btn-right" nz-button nzType="primary" (click)="submitForm()" [nzLoading]="btnLoading">打印标本</button>
+		<div class="display_flex justify-content_flex-center bottom-btn" *ngIf="statusValue==1">
+			<button class="btn btn-right" nz-button nzType="primary" (click)="temporary('temporary')" [nzLoading]="zcLoading">暂存</button>
+		  <button class="btn btn-right" nz-button nzType="primary" (click)="submitForm('print')" [nzLoading]="btnLoading">打印标本</button>
+			<button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
+		</div>
+		
+		<div class="display_flex justify-content_flex-center bottom-btn" *ngIf="statusValue==2 || statusValue==3 || statusValue==4">
+			<button class="btn btn-right" nz-button nzType="primary" (click)="temporary('submit')" [nzLoading]="zcLoading">保存</button>
+		  <button class="btn btn-right" nz-button nzType="primary" (click)="superaddition()" [nzLoading]="zjLoading">追加打印</button>
+			<button class="btn btn-right" nz-button nzType="primary" (click)="submitForm('all')" [nzLoading]="btnLoading">全量打印</button>
 			<button class="btn cancel" nz-button nzType="default" (click)="hideModal()">取消</button>
 		</div>
 	</div>
@@ -267,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="">
@@ -310,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.less

@@ -28,7 +28,7 @@
 	background: rgba(0, 0, 0, 0.4);
 	z-index: 99;
 	.pathology-content{
-		width: 80%;
+		width: 90%;
 		background: #fff;
 		border-radius: 5px;
 		padding: 10px 20px;
@@ -110,6 +110,12 @@
 							color: #333;
 							margin-right: 40px;
 						}
+						.over-class{
+							width: 310px;
+							overflow:hidden;
+							text-overflow:ellipsis;
+							white-space:nowrap;
+						}
 					}
 					.ant-form-item {
 					  margin-bottom: 14px;
@@ -142,6 +148,7 @@
 				}
 				.boder-right{
 					border-right: 1px solid #e5e9ed;
+					margin-top: 10px;
 				}
 				.specimen-item{
 					display: flex;

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

@@ -23,6 +23,7 @@ export class PathologyAddComponent implements OnInit {
 	@Output() pathologyCancel = new EventEmitter();
 	@Input() surgeryId: string;
 	@Input() patientId: string;
+	@Input() detailId: string;
 	
 	constructor(
 		private http: HttpClient,
@@ -71,9 +72,9 @@ export class PathologyAddComponent implements OnInit {
 	// 初始化新增form表单
 	initForm() {
 		this.validateForm = this.fb.group({
-		  intraoperativeRapidity: [null, [Validators.required]],
+		  pathologyFormType: [null, [Validators.required]],
 			specimenGenre: [null, [Validators.required]],
-			// intraoperativeFindings: [null, [Validators.required]],
+			intraoperativeFindings: [null, []],
 			project: [null, [Validators.required]],
 			// surgicalPlan: [null, [Validators.required]],
 			specimenNum: [null,[Validators.required]],
@@ -81,31 +82,36 @@ export class PathologyAddComponent implements OnInit {
 		});
 	}
 	
+	statusValue:any = 1;
 	fetchDataList(){
 		let data = {
 		  idx: 0,
 		  sum: 9999,
 		  pathologyForm: {
-		    surgeryId: this.surgeryId || "",
+				surgeryId: this.surgeryId || "",
 		    patientId: this.patientId || "",
 		    hosId: this.hosId || "" ,
 		  },
 		};
 		this.isSpinning = true;
-		this.mainService
-		  .getFetchDataList("data", "pathologyForm", data)
+		// this.mainService
+		//   .getFetchDataList("data", "pathologyForm", data)
+			this.mainService.getFetchData("data", "pathologyForm", this.detailId)
 		  .subscribe((data) => {
 		    this.isSpinning = false;
-		    this.detailsData = data.list[0];
-				// if(this.detailsData.surgicalPlan){
-				// 	this.validateForm.controls.surgicalPlan.setValue(this.detailsData.surgicalPlan);
-				// }
-				// if(this.detailsData.intraoperativeFindings){
-				// 	this.validateForm.controls.intraoperativeFindings.setValue(this.detailsData.intraoperativeFindings);
-				// }
+		    this.detailsData = data.data;
+				if(this.detailsData.status){
+					this.statusValue = this.detailsData.status.value
+				}
+				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);
+				}
 				this.getProDicData()
 				this.getDicData()
-				this.getSampleData()
+				this.getSampleData('load')
 				this.getSourceData()
 				this.getSysData()
 		  });
@@ -266,7 +272,7 @@ export class PathologyAddComponent implements OnInit {
 		  .subscribe((data) => {
 		    this.btnLoading = false;
 		    this.delModal = false;
-				this.getSampleData()
+				this.getSampleData('')
 		    if (data.status==200) {
 		      this.showSpecimenModal("删除", true, "");
 		    } else {
@@ -571,7 +577,7 @@ export class PathologyAddComponent implements OnInit {
 	}
 	
 	// 获取标本列表
-	getSampleData(){
+	getSampleData(type){
 		let data={
 			idx: 0,
 			sum: 9999,
@@ -583,21 +589,23 @@ export class PathologyAddComponent implements OnInit {
 		  .getFetchDataList("data", "pathologySpecimen", data)
 		  .subscribe((res) => {
 		    this.specimenList = res.list
-				let str = []
-				if(res.list.length>0){
-					for(let i of res.list){
-						str.push(i.system.name + '-' + i.organ.name)
+				if(type!='load'){
+					let str = []
+					if(res.list.length>0){
+						for(let i of res.list){
+							str.push(i.system.name + '-' + i.organ.name)
+						}
+						const newStr = new Set(str);
+						const newData = Array.from(newStr);
+						this.validateForm.controls.takePart.setValue(newData.join('、'));
 					}
-					const newStr = new Set(str);
-					const newData = Array.from(newStr);
-					this.validateForm.controls.takePart.setValue(newData.join('、'));
 				}
 				this.validateForm.controls.specimenNum.setValue(this.specimenList.length);
 		  });
 	}
 	
 	hideSpecimenModal(){
-		this.getSampleData()
+		this.getSampleData('')
 		this.specimenModal = false
 	}
 	
@@ -622,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 || "",
@@ -633,15 +641,22 @@ export class PathologyAddComponent implements OnInit {
 				specimenType:{
 					id:this.validateForm.value.specimenGenre
 				}
-			}
+			},
+			operation:'',
+			pathologySpecimenIds:'',
 		};
 		delete data.pathologyForm.patientDTO
 		delete data.pathologyForm.surgeryDeptDTO
 		delete data.pathologyForm.surgeryDoctorDTO
 		delete data.pathologyForm.specimenGenre
 		data.pathologyForm.specimenNum = this.specimenList.length
-		console.log(77,data.pathologyForm.specimenNum)
-
+		if(this.operation=='addPrint' || this.operation=='wholePrint'){
+			data.operation = this.operation
+			data.pathologySpecimenIds = this.pathologySpecimenIds
+		}else{
+			delete data.operation
+			delete data.pathologySpecimenIds
+		}
 		this.printLoading = true;
 		this.mainService
 		  .pathologyPrint(data)
@@ -704,8 +719,9 @@ export class PathologyAddComponent implements OnInit {
 		  });
 	}
 	
-	printData:any;
-	submitForm(): void{
+	// 暂存/保存
+	zcLoading:any = false;
+	temporary(type): void{
 		var that = this;
 		for (const i in that.validateForm.controls) {
 		  that.validateForm.controls[i].markAsDirty();
@@ -716,26 +732,14 @@ export class PathologyAddComponent implements OnInit {
 			this.message.error('标本不能为空')
 			return
 		}
-		if(this.detailsData.status.name=='未打印'){
-			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);
-			return
-		}
-
-		let data: any = {
+		let data = {
 			pathologyForm:{
-				...this.validateForm.value,
 				...this.detailsData,
+				...this.validateForm.value,
 				surgeryId: this.surgeryId || "",
 				patientId: this.patientId || "",
 				hosId: this.hosId || "" ,
+				pathologyInspectIds: this.validateForm.value.project.join(','),
 				specimenType:{
 					id:this.validateForm.value.specimenGenre
 				}
@@ -746,17 +750,154 @@ export class PathologyAddComponent implements OnInit {
 		delete data.pathologyForm.surgeryDeptDTO
 		delete data.pathologyForm.surgeryDoctorDTO 
 		delete data.pathologyForm.specimenGenre 
-		that.btnLoading = true;
-		that.mainService
+		that.zcLoading = true;
+		this.mainService.pathologyOperation(data,'storage').subscribe((res:any) => {
+			that.zcLoading = false;
+			if(res.status==200){
+				this.message.success('操作成功')
+				this.hideModal()
+			}else{
+				this.message.error(res.msg)
+			}
+		});
+	}
+	
+	// 追加打印
+	zjLoading:any = false;
+	operation:any;
+	pathologySpecimenIds:any;
+	superaddition(): void{
+		var that = this;
+		this.operation = 'addPrint'
+		for (const i in that.validateForm.controls) {
+		  that.validateForm.controls[i].markAsDirty();
+		  that.validateForm.controls[i].updateValueAndValidity();
+		}
+		if (that.validateForm.invalid) return;
+		if(this.specimenList.length==0){
+			this.message.error('标本不能为空')
+			return
+		}
+		that.mainService.pathologyCheckPrint('pathologyForm',this.detailsData.id).subscribe((res:any)=>{
+			if(res.ids){
+				this.notModal = true
+				this.pathologySpecimenIds = res.ids
+				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);
+			}else{
+				this.message.info('无新标本需要打印')
+			}
+		})
+	}
+	
+	// 打印标本/全量
+	printData:any;
+	submitForm(type): void{
+		var that = this;
+		this.operation = 'wholePrint'
+		for (const i in that.validateForm.controls) {
+		  that.validateForm.controls[i].markAsDirty();
+		  that.validateForm.controls[i].updateValueAndValidity();
+		}
+		if (that.validateForm.invalid) return;
+		if(this.specimenList.length==0){
+			this.message.error('标本不能为空')
+			return
+		}
+		if(type=='all'){
+			that.mainService.pathologyCheckPrint('pathologyForm',this.detailsData.id).subscribe((res:any)=>{
+				if(res.ids){
+					this.notModal = true
+					this.pathologySpecimenIds = res.ids
+					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);
+				}else{
+					let data: any = {
+						pathologyForm:{
+							...this.detailsData,
+							...this.validateForm.value,
+							surgeryId: this.surgeryId || "",
+							patientId: this.patientId || "",
+							hosId: this.hosId || "" ,
+							pathologyInspectIds: this.validateForm.value.project.join(','),
+							specimenType:{
+								id:this.validateForm.value.specimenGenre
+							}
+						},
+						operation:'',
+						pathologySpecimenIds:'',
+					};
+					data.pathologyForm.specimenNum = this.specimenList.length
+					if(this.operation=='addPrint' || this.operation=='wholePrint'){
+						data.operation = this.operation
+						data.pathologySpecimenIds = this.pathologySpecimenIds
+					}else{
+						delete data.operation
+						delete data.pathologySpecimenIds
+					}
+					delete data.pathologyForm.patientDTO
+					delete data.pathologyForm.surgeryDeptDTO
+					delete data.pathologyForm.surgeryDoctorDTO 
+					delete data.pathologyForm.specimenGenre 
+					that.btnLoading = true;
+					this.printFun(data)
+				}
+			})
+		}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);
+				return
+			}
+			let data: any = {
+				pathologyForm:{
+					...this.detailsData,
+					...this.validateForm.value,
+					surgeryId: this.surgeryId || "",
+					patientId: this.patientId || "",
+					hosId: this.hosId || "" ,
+					specimenType:{
+						id:this.validateForm.value.specimenGenre
+					}
+				}
+			};
+			data.pathologyForm.specimenNum = this.specimenList.length
+			delete data.pathologyForm.patientDTO
+			delete data.pathologyForm.surgeryDeptDTO
+			delete data.pathologyForm.surgeryDoctorDTO 
+			delete data.pathologyForm.specimenGenre 
+			this.btnLoading = true;
+			this.printFun(data)
+		}
+	}
+	
+	// 打印
+	printFun(data){
+		this.mainService
 		  .pathologyPrint(data)
 		  .subscribe((res:any) => {
 				if(res.status==200){
 					let arr = res.data;
-					// if(arr.specimenList.length==1){
-					// 	for(let i of arr.specimenList){
-					// 		i.applyCode = data.pathologyForm.applyCode
-					// 	}
-					// }
 					if(arr.applyBarCode){
 						arr.applyBarCode = this.sanitizer.bypassSecurityTrustResourceUrl(arr.applyBarCode)
 					}
@@ -764,8 +905,8 @@ export class PathologyAddComponent implements OnInit {
 						i.applyCode = arr.applyCode?arr.applyCode:data.pathologyForm.applyCode
 						i.barCode = this.sanitizer.bypassSecurityTrustResourceUrl(i.barCode)
 					}
-					that.btnLoading = false;
-					that.printData = arr;
+					this.btnLoading = false;
+					this.printData = arr;
 					setTimeout(() => {
 					  const printContent = document.getElementById("report");
 					  const WindowPrt = window.open("", "", "width=100,height=1000");
@@ -775,7 +916,7 @@ export class PathologyAddComponent implements OnInit {
 							WindowPrt.focus();
 							WindowPrt.print();
 							WindowPrt.close();
-							that.hideModal();
+							this.hideModal();
 						},500)
 					}, 500);
 				}else{
@@ -786,7 +927,7 @@ export class PathologyAddComponent implements OnInit {
 	
 	// 关闭标本
 	closeSpecimenModel(){
-		this.getSampleData()
+		this.getSampleData('')
 		this.hideSpecimenModal()
 	}
 	

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

@@ -4,17 +4,24 @@
 			<i class="icon_transport transport-guanbi" (click)="closeDetailMoadl()"></i></div>
 			<div class="content">
 				<div class="content-item boder-right">
-					<div class="form-title-box">
-						<div class="form-title"><span class="font-weight-500">是否术中快速：</span>{{detailsData.intraoperativeRapidity==1?'是':'否'}}</div>
-						<div class="form-title"><span class="font-weight-500">申请单编号：</span>{{detailsData.applyCode}}</div>
-						<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status.name}}</div>
-						<div class="form-title"><span class="font-weight-500">科室名称：</span>{{detailsData.patientDTO.department.dept}}</div>
-					</div>
-					<div class="form-title-box">
-						<div class="form-title"><span class="font-weight-500">住院号：</span>{{detailsData.patientDTO.patientCode}}</div>
+					<nz-form-item class="form-title-box">
+						<div class="form-title">申请单类型：{{detailsData.pathologyFormType==1?'术中快速病理检查申请单':'病理检查申请单'}}</div>
+						<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status?detailsData.status.name:'-'}}</div>
+					</nz-form-item>
+					<nz-form-item class="form-title-box">
+						<div class="form-title"><span class="font-weight-500">申请单号：</span>{{detailsData.applyCode}}</div>
+						<div class="form-title over-class"><span class="font-weight-500">申请科室：</span>{{detailsData.patientDTO.department.dept}}</div>
+					</nz-form-item>
+					<nz-form-item class="form-title-box">
+						<div class="form-title">手术间：{{detailsData.surgeryDeptDTO.dept}}</div>
+						<div class="form-title">取材医生：{{detailsData.surgeryDoctorDTO?detailsData.surgeryDoctorDTO.name : '-'}}</div>
+					</nz-form-item>
+					<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>
+						<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.patientCode}}</div>
+					</nz-form-item>
 					
 					<div class="form-title-box">
 						<div class="form-title"><span class="font-weight-500">检验项目：</span>{{project||'无'}}</div>
@@ -35,28 +42,28 @@
 						<div class="form-title font-weight-500">手术方案：</div>
 						<div class="indent">{{detailsData.surgicalPlan||'无'}}</div>
 					</div>
-<!-- 					<div class="form-list">
+					<div class="form-list">
 						<div class="form-title font-weight-500">术中所见：</div>
 						<div class="indent">{{detailsData.intraoperativeFindings||'无'}}</div>
-					</div> -->
+					</div>
 
 					<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">
 						<div class="form-title font-weight-500">标本：</div>
 						<div class="form-title-box">
-							<div class="form-title" *ngFor="let item of specimenList">
+							<div class="form-title cursor" *ngFor="let item of specimenList" (click)="specimenView(item)">
 								{{item.partSource?item.partSource.name:''}}{{item.organ?item.organ.name:''}}{{item.specimenName}}
+								({{item.specimenCode}})
 							</div>
 						</div>
 					</div>
@@ -83,6 +90,7 @@
 					</nz-steps>
 				</div>
 			</div>
+			
 			<div class="display_flex justify-content_flex-center bottom-btn">
 				<button class="btn btn-right" *ngIf="detailsData.status.value==6 || 
 				detailsData.status.value==7 || detailsData.status.value==8 || 
@@ -92,11 +100,6 @@
 				detailsData.status.value==3 || detailsData.status.value==4 || 
 				detailsData.status.value==5" nz-button nzType="primary" (click)="submitPrint()" [nzLoading]="btnLoading">补打</button>
 				
-				<!-- <button class="btn btn-right" *ngIf="detailsData.status.value==2 || 
-				detailsData.status.value==3 || detailsData.status.value==4 || 
-				detailsData.status.value==5" nz-button nzType="primary" 
-				(click)="immobilization()">标本固定</button> -->
-				
 				<button class="btn cancel" *ngIf="detailsData.status.value==2 || 
 				detailsData.status.value==3 || detailsData.status.value==4 || 
 				detailsData.status.value==5" nz-button nzType="default" (click)="closeDetailMoadl()">取消</button>
@@ -204,4 +207,44 @@
 				</div>
 			</div>
 		</div>
-  </div>
+  </div>
+	
+	<!-- 查看标本 -->
+	<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="specimenViewDialog">
+	  <div class="modalBody modalBody-ga">
+	    <div class="title">查看标本<i class="icon_transport transport-guanbi" (click)="hideSpecimenModal()"></i>
+	    </div>
+	    <overlay-scrollbars #osComponentRef1 class="content">
+	      <div class="list-template__bottom">
+	        <nz-table class="list-template__nzTable" [nzData]="viewData" nzSize="middle" [nzShowPagination]="false"
+	          [nzLoading]="loading1">
+	          <thead>
+	            <tr class="thead">
+								<th>标本名称</th>
+	              <th>编码</th>
+	              <th>备注</th>
+	              <th>离体时间</th>
+	              <th>离体操作人</th>
+	              <th>固定时间</th>
+	              <th>固定操作人</th>
+	            </tr>
+	          </thead>
+	          <tbody>
+	            <tr *ngFor="let data of viewData">
+								<td>{{ data.specimenName }}</td>
+	              <td>{{ data.specimenCode }}</td>
+	              <td>{{ data.remark ? data.remark : '无' }}</td>
+								<td>{{ data.inVitroTime ? (data.inVitroTime|date:'yyyy-MM-dd HH:mm:ss') : '-' }}</td>
+								<td>{{ data.inVitroOperator ? data.inVitroOperator.name : '-' }}</td>
+								<td>{{ data.fixationTime ? (data.fixationTime|date:'yyyy-MM-dd HH:mm:ss') : '-' }}</td>
+								<td>{{ data.fixationOperator ? data.fixationOperator.name : '-' }}</td>
+	            </tr>
+	          </tbody>
+	        </nz-table>
+	      </div>
+	    </overlay-scrollbars>
+	    <div class="display_flex justify-content_flex-center">
+	      <button class="btn" nz-button nzType="primary" (click)="hideSpecimenModal()">知道了</button>
+	    </div>
+	  </div>
+	</div>

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

@@ -1,3 +1,5 @@
+@import "../../../../src/theme.less";
+
 /* 修改垂直滚动条 */
 ::-webkit-scrollbar {
 	width: 4px; /* 修改宽度 */
@@ -101,6 +103,10 @@
 					}
 					.form-list{
 						margin-bottom: 10px;
+						.cursor{
+							text-decoration: underline;
+							cursor: pointer;
+						}
 						.indent{
 							text-indent: 2ch;
 							color: #333;
@@ -175,3 +181,224 @@
 	}
 	
 }
+
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 999;
+	.modalBody-ga{
+		width: 80% !important;
+		.list-template__searchBox{
+			margin-top: 10px;
+		}
+		.ant-select{
+			width: 20%;
+		}
+	}
+  .modalBody {
+    width: 350px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 100%;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 18px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 420px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px 0 14px;
+        max-height: 500px;
+        overflow-y: auto;
+				
+				.ant-select{
+					width: 100%;
+				}
+				.ant-calendar-picker{
+					width: 100% !important;
+				}
+				.list-template__bottom {
+				  background: #f9fafb;
+				  border: 1px solid #e5e9ed;
+				  border-radius: 8px;
+				  padding-bottom: 56px;
+				  position: relative;
+				  .list-template__nzTable {
+				    padding: 16px 16px 0;
+				
+				    .thead {
+				      background-image: linear-gradient(to right, @bg-start, @bg-end);
+				
+				      th {
+				        background: transparent;
+				        color: #fff;
+				        text-align: center;
+				      }
+				    }
+				
+				    .ant-table-body {
+				      border-bottom: 1px solid #e5e9ed;
+				    }
+				
+				    .ant-table-tbody {
+				      tr {
+				        text-align: center;
+				        color: #333;
+				
+				        td {
+				          border: none;
+				
+				          &.tab_hover:hover{
+				            text-decoration: underline;
+				            cursor: pointer;
+				          }
+				
+				          .coop {
+				            button{
+				              color: #333;
+				            }
+				            span,button {
+				              display: inline-block;
+				              padding: 0 8px;
+				              cursor: pointer;
+				              position: relative;
+				
+				              &::after {
+				                content: "|";
+				                position: absolute;
+				                top: 0;
+				                right: 0;
+				              }
+				
+				              &:hover,
+				              &:active {
+				                color: @primary-color;
+				              }
+				
+				              &:nth-last-child(1) {
+				                &::after {
+				                  content: "";
+				                }
+				              }
+				            }
+				          }
+				        }
+				      }
+				    }
+				  }
+				  .list-template__pagination {
+				    height: 56px;
+				    display: flex;
+				    align-items: center;
+				    position: absolute;
+				    right: 8px;
+				  }
+				}
+				
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+              text-align: left;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}

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

@@ -23,6 +23,7 @@ export class PathologyDetailComponent implements OnInit {
 	@Output() pathologyCancel = new EventEmitter();
 	@Input() surgeryId: string;
 	@Input() patientId: string;
+	@Input() detailId: string;
 	
 	constructor(
 		private http: HttpClient,
@@ -76,8 +77,7 @@ export class PathologyDetailComponent implements OnInit {
 	hosId:any;
 	pathologyLogs:any //日志
 	printLoading:boolean = false;
-	printData:any = [];
-	project:any = [];
+	project:any;
 	
   ngOnInit() {
 		this.hosId = this.tool.getCurrentHospital().id;
@@ -86,6 +86,7 @@ export class PathologyDetailComponent implements OnInit {
   }
 	
 	// 补打
+	printData:any;
 	submitPrint(){
 		let that = this
 		let data: any = {
@@ -106,11 +107,6 @@ export class PathologyDetailComponent implements OnInit {
 		  .subscribe((res:any) => {
 				if(res.status==200){
 					let arr = res.data;
-					// if(arr.specimenList.length==1){
-					// 	for(let i of arr.specimenList){
-					// 		i.applyCode = data.pathologyForm.applyCode
-					// 	}
-					// }
 					if(arr.applyBarCode){
 						arr.applyBarCode = this.sanitizer.bypassSecurityTrustResourceUrl(arr.applyBarCode)
 					}
@@ -143,354 +139,40 @@ export class PathologyDetailComponent implements OnInit {
 		this.pathologyCancel.emit()
 	}
 	
-	// 初始化新增form表单
-	// initForm() {
-	// 	this.validateForm = this.fb.group({
-	// 	  intraoperativeRapidity: [1, [Validators.required]],
-	// 		specimenGenre: [null, [Validators.required]],
-	// 		intraoperativeFindings: [null, [Validators.required]],
-	// 		surgicalPlan: [null, [Validators.required]],
-	// 		specimenNum: [null,[Validators.required]],
-	// 		takePart: [null, [Validators.required]]
-	// 	});
-	// }
-	
 	// 获取详情
+	statusValue:any;
 	fetchDataList(){
 		let data = {
 		  idx: 0,
 		  sum: 9999,
 		  pathologyForm: {
-		    surgeryId: this.surgeryId || "",
+				surgeryId: this.surgeryId || "",
 		    patientId: this.patientId || "",
 		    hosId: this.hosId || "" ,
 		  },
 		};
 		this.isSpinning = true;
-		this.mainService
-		  .getFetchDataList("data", "pathologyForm", data)
+		// this.mainService
+		//   .getFetchDataList("data", "pathologyForm", data)
+			this.mainService.getFetchData("data", "pathologyForm", this.detailId)
 		  .subscribe((data) => {
 		    this.isSpinning = false;
-		    this.detailsData = data.list[0];
-				this.pathologyLogs = data.list[0].formLogDTOS
+		    this.detailsData = data.data;
+				if(this.detailsData.status){
+					this.statusValue = this.detailsData.status.value
+				}
+				this.pathologyLogs = data.data.formLogDTOS
 				this.stepLength = this.pathologyLogs.length
 				if(this.detailsData.pathologyInspectDTOS){
-					for(let i of this.detailsData.pathologyInspectDTOS){
-						this.project.push(i.inspectProject.name)
-					}
+					this.project = this.detailsData.pathologyInspectDTOS.map(i=>{
+						return i.inspectProject.name
+					})
 					this.project = this.project.join('、')
 				}
-				// if(this.detailsData.surgicalPlan){
-				// 	this.validateForm.controls.surgicalPlan.setValue(this.detailsData.surgicalPlan);
-				// }
-				// if(this.detailsData.intraoperativeFindings){
-				// 	this.validateForm.controls.intraoperativeFindings.setValue(this.detailsData.intraoperativeFindings);
-				// }
 				this.getSampleData()
 		  });
 	}
 	
-	// // 获取标本类型
-	// getDicData(){
-	// 	this.mainService.getDictionary("list", "pathology_specimen_type").subscribe((res) => {
-	// 		this.specimenData = res
-	// 	});
-	// }
-	
-	// // 获取标本-位置来源
-	// getSourceData(){
-	// 	this.mainService.getDictionary("list", "pathology_position").subscribe((res) => {
-	// 		this.placeList = res
-	// 	});
-	// }
-	
-	// // 获取标本-系统
-	// getSysData(){
-	// 	let postData: any = {
-	// 	  idx: 0,
-	// 	  sum: 9999,
-	// 	  dictionaryTree: {
-	// 	    level: 1,
-	// 	    key: 'pathology_specimen',
-	// 	    deleted: 0,
-	// 	  },
-	// 	};
-	// 	this.mainService
-	// 	  .getFetchDataList("simple/data", "dictionaryTree", postData)
-	// 	  .subscribe((data) => {
-	// 	    this.systemList = data.list;
-	// 	  });
-
-	// }
-	
-	// // 获取标本-器官
-	// getApparatusData(id,item,type){
-	// 	let postData: any = {
-	// 	  idx: 0,
-	// 	  sum: 9999,
-	// 	  dictionaryTree: {
-	// 	    level: 2,
-	// 			parent:id,
-	// 	    key: 'pathology_specimen',
-	// 	    deleted: 0,
-	// 	  },
-	// 	};
-	// 	this.mainService
-	// 	  .getFetchDataList("simple/data", "dictionaryTree", postData)
-	// 	  .subscribe((data) => {
-	// 			if(data.list.length>0){
-	// 				this.apparatusList = data.list;
-	// 				if(type=='edit'){
-	// 					setTimeout(_=>{
-	// 						let index3 = this.apparatusList.findIndex(i=>i.id==item.organ.id)
-	// 						this.apparatusIndex = index3
-	// 						this.apparatusId = Number(item.organ.id);
-	// 					},100)
-	// 				}
-	// 			}else{
-	// 				this.message.info('暂无数据')
-	// 			}
-	// 	  });
-	// }
-	
-	// // 获取标本-标本名称
-	// getSpNameData(id,item,type){
-	// 	let postData: any = {
-	// 	  idx: 0,
-	// 	  sum: 9999,
-	// 	  dictionaryTree: {
-	// 	    level: 3,
-	// 			parent:id,
-	// 	    key: 'pathology_specimen',
-	// 	    deleted: 0,
-	// 	  },
-	// 	};
-	// 	this.mainService
-	// 	  .getFetchDataList("simple/data", "dictionaryTree", postData)
-	// 	  .subscribe((data) => {
-	// 	    this.specimenNameList = data.list;
-	// 			this.specimenNameList.push({
-	// 				name:'其他',
-	// 				id:'qita'
-	// 			})
-	// 			if(type=='edit'){
-	// 				if(item.sample){
-	// 					this.validateSpecimenForm = this.fb.group({
-	// 					  remark: [null, [Validators.required]]
-	// 					});
-	// 					setTimeout(_=>{
-	// 						let index4 = this.specimenNameList.findIndex(i=>i.id==item.sample.id)
-	// 						this.specimenNameIndex = index4
-	// 						this.specimenNameName = item.sample.name
-	// 						this.specimenNameId = Number(item.sample.id);
-	// 					},100)
-	// 				}else{
-	// 					this.validateSpecimenForm = this.fb.group({
-	// 					  remark: [null, [Validators.required]],
-	// 						specimenName: [null, [Validators.required]]
-	// 					});
-	// 					this.specimenNameIndex = this.specimenNameList.length-1
-	// 					this.specimenNameName = 'qita'
-	// 					this.validateSpecimenForm.controls.specimenName.setValue(item.specimenName);
-	// 				}
-	// 				setTimeout(_=>{
-	// 					this.validateSpecimenForm.controls.remark.setValue(item.remark);
-	// 					this.specimenModal = true
-	// 				},50)
-	// 			}
-	// 	  });
-	// }
-	
-	// // 删除标本
-	// delModal:boolean = false
-	// coopId:any;
-	// specimenDel(e,item,index){
-	// 	this.delModal = true
-	// 	this.coopId = item.id
-	// }
-	
-	// // 确定删除
-	// confirmDel(){
-	// 	this.mainService
-	// 	  .coopTypeConfig(
-	// 	    "rmvData",
-	// 	    "pathologySpecimen",
-	// 	     [this.coopId]
-	// 	  )
-	// 	  .subscribe((data) => {
-	// 	    this.btnLoading = false;
-	// 	    this.delModal = false;
-	// 			this.getSampleData()
-	// 	    if (data.status==200) {
-	// 	      this.showSpecimenModal("删除", true, "");
-	// 	    } else {
-	// 	      this.showSpecimenModal("删除", false, data.data[0].msg);
-	// 	    }
-	// 	  });
-	// }
-	// // 确定删除
-	// hideDelModal() {
-	//   this.delModal = false;
-	// }
-	
-	// // 编辑标本
-	// specimenDetailId:any = null;
-	// specimenEdit(e,item,index){
-	// 	this.specimenDetailId = item.id
-	// 	let index1 = this.placeList.findIndex(i=>i.id==item.partSource.id)
-	// 	this.placeIndex = index1
-	// 	this.placeId = Number(item.partSource.id)
-	// 	let index2 = this.systemList.findIndex(i=>i.id==item.system.id)
-	// 	this.systemIndex = index2
-	// 	this.systemId = Number(item.system.id)
-	// 	this.getApparatusData(item.system.id,item,'edit')
-	// 	this.getSpNameData(item.organ.id,item,'edit')
-	// }
-	
-	// // 选择标本
-	// openSpecimen(){
-	// 	this.validateSpecimenForm = this.fb.group({
-	// 	  remark: [null, [Validators.required]]
-	// 	});
-	// 	this.specimenDetailId = null;
-	// 	this.placeIndex = null;
-	// 	this.systemIndex = null;
-	// 	this.apparatusIndex = null;
-	// 	this.specimenNameIndex = null;
-	// 	this.placeId = null;
-	// 	this.systemId = null;
-	// 	this.apparatusId = null;
-	// 	this.specimenNameId = null;
-	// 	this.placeList=[]; //位置来源数据
-	// 	this.systemList=[]; //系统数据
-	// 	this.apparatusList=[]; //器官数据
-	// 	this.specimenNameList=[]; //标本名称数据
-	// 	this.getSourceData()
-	// 	this.getSysData()
-	// 	this.specimenModal = true
-	// }
-	
-	// // 选择位置来源
-	// placeId:any = null;
-	// placeClick(e,item,index){
-	// 	this.placeId = item.id
-	// 	this.placeIndex = index
-	// }
-	
-	// // 选择系统
-	// systemId:any = null;
-	// systemClick(e,item,index){
-	// 	this.systemId = Number(item.id)
-	// 	this.systemIndex = index
-	// 	this.apparatusList = [];
-	// 	this.apparatusId = null;
-	// 	this.apparatusIndex = null;
-	// 	this.getApparatusData(item.id,{},'select')
-	// }
-	
-	// // 选择器官
-	// apparatusId:any = null;
-	// apparatusClick(e,item,index){
-	// 	this.apparatusId = Number(item.id)
-	// 	this.apparatusIndex = index
-	// 	this.specimenNameList = [];
-	// 	this.specimenNameId = null;
-	// 	this.specimenNameIndex = null;
-	// 	this.getSpNameData(item.id,{},'select')
-	// }
-	
-	// // 选择标本名称
-	// specimenNameId:any = null;
-	// specimenNameName:any = null;
-	// specimenNameClick(e,item,index){
-	// 	this.specimenNameIndex = index
-	// 	let remark = this.validateSpecimenForm.value.remark
-	// 	if(item.id == 'qita'){
-	// 		this.validateSpecimenForm = this.fb.group({
-	// 		  remark: [remark?remark:null, [Validators.required]],
-	// 			specimenName: [null, [Validators.required]]
-	// 		});
-	// 		this.specimenNameId = 'null'
-	// 		this.specimenNameName = 'qita'
-	// 	}else{
-	// 		this.validateSpecimenForm = this.fb.group({
-	// 		  remark: [remark?remark:null, [Validators.required]],
-	// 		});
-	// 		this.specimenNameId = item.id
-	// 		this.specimenNameName = item.name
-	// 	}
-	// }
-	
-	// // 保存标本
-	// btnSpLoading:boolean = false;
-	// submitSpecimen(){
-	// 	if(this.placeIndex==null){
-	// 		this.message.error('请选择位置来源')
-	// 		return
-	// 	}
-	// 	if(this.systemIndex==null){
-	// 		this.message.error('请选择系统')
-	// 		return
-	// 	}
-	// 	if(this.apparatusIndex==null){
-	// 		this.message.error('请选择器官')
-	// 		return
-	// 	}
-	// 	if(this.specimenNameIndex==null){
-	// 		this.message.error('请选择标本名称')
-	// 		return
-	// 	}
-	// 	for (const i in this.validateSpecimenForm.controls) {
-	// 	  this.validateSpecimenForm.controls[i].markAsDirty();
-	// 	  this.validateSpecimenForm.controls[i].updateValueAndValidity();
-	// 	}
-	// 	if (this.validateSpecimenForm.invalid) return;
-	// 	let data = {
-	// 		pathologyFormId:this.detailsData.id,
-	// 		partSource:{
-	// 			id:this.placeId
-	// 		},
-	// 		system:{
-	// 			id:this.systemId
-	// 		},
-	// 		organ:{
-	// 			id:this.apparatusId
-	// 		},
-	// 		sample:{
-	// 			id:this.specimenNameId
-	// 		},
-	// 		hosId:this.hosId,
-	// 		specimenName:null,
-	// 		id:'',
-	// 		remark:this.validateSpecimenForm.value.remark
-	// 	};
-	// 	if(this.specimenNameName == 'qita'){
-	// 		delete data.sample
-	// 		data.specimenName = this.validateSpecimenForm.value.specimenName
-	// 	}else{
-	// 		data.specimenName = this.specimenNameName
-	// 	}
-	// 	let queryType = null
-	// 	if(this.specimenDetailId){
-	// 		queryType = 'updData'
-	// 		data.id = this.specimenDetailId
-	// 	}else{
-	// 		queryType = 'addData'
-	// 		delete data.id
-	// 	}
-	// 	this.btnSpLoading = true;
-	// 	this.mainService
-	// 	  .simplePost(queryType, "pathologySpecimen", data)
-	// 	  .subscribe((res) => {
-	// 	    this.btnSpLoading = false;
-	// 	    if (res.status == 200) {
-	// 	      this.showSpecimenModal("操作", true, "");
-	// 	    } else {
-	// 	      this.showSpecimenModal("操作", false, res.msg);
-	// 	    }
-	// 	  });
-	// }
-	
 	// 获取标本列表
 	getSampleData(){
 		let data={
@@ -507,152 +189,25 @@ export class PathologyDetailComponent implements OnInit {
 		  });
 	}
 	
-	hideSpecimenModal(){
-		this.specimenModal = false
-	}
-	
 	hideNotModal(){
 		this.notModal = false
 	}
 	
-	// 日期选择
-	// startDate: string; //时间开始
-	// formChangeDate(result?): void {
-	//   this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
-		
-	// }
-	
-	//未打印提交
-	// submitPrintForm(): void{
-	// 	for (const i in this.validatePrintForm.controls) {
-	// 	  this.validatePrintForm.controls[i].markAsDirty();
-	// 	  this.validatePrintForm.controls[i].updateValueAndValidity();
-	// 	}
-	// 	if (this.validatePrintForm.invalid) return;
-		
-	// 	let data: any = {
-	// 		pathologyForm:{
-	// 			...this.validateForm.value,
-	// 			...this.detailsData,
-	// 			inVitroTime:this.validatePrintForm.value.inVitroTime,
-	// 			surgeryId: this.surgeryId || "",
-	// 			patientId: this.patientId || "",
-	// 			hosId: this.hosId || "" ,
-	// 			handoverUserId:this.handoverUserId,
-	// 			specimenType:{
-	// 				id:this.validateForm.value.specimenGenre
-	// 			}
-	// 		}
-	// 	};
-	// 	delete data.pathologyForm.patientDTO
-	// 	delete data.pathologyForm.surgeryDeptDTO
-	// 	delete data.pathologyForm.surgeryDoctorDTO
-	// 	delete data.pathologyForm.specimenGenre
-	// 	this.printLoading = true;
-	// 	this.mainService
-	// 	  .pathologyPrint(data)
-	// 	  .subscribe((res:any) => {
-	// 			console.log(5555,res)
-	// 			this.hideModal()
-	// 	    this.printData = res.data;
-	// 			this.printLoading = false;
-	// 	    setTimeout(() => {
-	// 	      const printContent = document.getElementById("report");
-	// 	      const WindowPrt = window.open("", "", "width=100,height=1000");
-	// 	      WindowPrt.document.write(printContent.innerHTML);
-	// 	      WindowPrt.document.close();
-	// 	      WindowPrt.focus();
-	// 	      WindowPrt.print();
-	// 	      WindowPrt.close();
-	// 	    }, 500);
-	// 	  });
-	// }
-	
-	// // 监听工号数据
-	// handoverUserId:any = null;
-	// numberChange(e){
-	// 	if(e.length < 3) {
-	// 		this.validatePrintForm.controls.name.setValue('');
-	// 		return
-	// 	}
-	// 	let data = {
-	// 	  idx: 0,
-	// 	  sum: 9999,
-	// 	  user: {
-	// 	    account: e || "",
-	// 	    hospital: { id: this.hosId || "" }
-	// 	  },
-	// 	};
-	// 	this.mainService
-	// 	  .getFetchDataList("data", "user", data)
-	// 	  .subscribe((data) => {
-	// 			if(data.list.length>0){
-	// 				this.validatePrintForm.controls.name.setValue(data.list[0].name);
-	// 				this.handoverUserId = data.list[0].id
-	// 			}else{
-	// 				this.validatePrintForm.controls.name.setValue('');
-	// 				this.handoverUserId =null
-	// 			}
-	// 	  });
-	// }
+	// 关闭查看标本
+	hideSpecimenModal(){
+		this.specimenViewDialog = false
+	}
 	
-	// printData:any;
-	// submitForm(): void{
-	// 	var that = this;
-	// 	for (const i in that.validateForm.controls) {
-	// 	  that.validateForm.controls[i].markAsDirty();
-	// 	  that.validateForm.controls[i].updateValueAndValidity();
-	// 	}
-	// 	if (that.validateForm.invalid) return;
-	// 	if(this.detailsData.status.name=='未打印'){
-	// 		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);
-	// 		return
-	// 	}
-
-	// 	let data: any = {
-	// 		pathologyForm:{
-	// 			...this.validateForm.value,
-	// 			...this.detailsData,
-	// 			surgeryId: this.surgeryId || "",
-	// 			patientId: this.patientId || "",
-	// 			hosId: this.hosId || "" ,
-	// 			specimenType:{
-	// 				id:this.validateForm.value.specimenGenre
-	// 			}
-	// 		}
-	// 	};
-	// 	delete data.pathologyForm.patientDTO
-	// 	delete data.pathologyForm.surgeryDeptDTO
-	// 	delete data.pathologyForm.surgeryDoctorDTO 
-	// 	delete data.pathologyForm.specimenGenre 
-	// 	that.btnLoading = true;
-	// 	that.mainService
-	// 	  .pathologyPrint(data)
-	// 	  .subscribe((res:any) => {
-	// 			this.hideModal()
-	// 			let arr = res.data;
-	// 	    that.printData = arr;
-	// 			that.btnLoading = false;
-	// 	    setTimeout(() => {
-	// 	      const printContent = document.getElementById("report");
-	// 	      const WindowPrt = window.open("", "", "width=100,height=1000");
-	// 	      WindowPrt.document.write(printContent.innerHTML);
-	// 	      WindowPrt.document.close();
-	// 	      WindowPrt.focus();
-	// 	      WindowPrt.print();
-	// 	      WindowPrt.close();
-					
-	// 	    }, 500);
-	// 	  });
-	// }
+	// 查看标本
+	specimenViewDialog:any = false;
+	viewData:any = [];
+	specimenItem:any;
+	specimenView(item){
+		this.viewData = []
+		this.specimenViewDialog = true
+		this.specimenItem = item;
+		this.viewData.push(item)
+	}
 	
 	// 关闭标本
 	closeSpecimenModel(){

src/app/views/dispensing-batch/dispensing-batch.component.html

@@ -138,7 +138,7 @@
 	    <overlay-scrollbars #osComponentRef1 class="content">
 	      <div class="list-template__bottom">
 	        <nz-table class="list-template__nzTable" [nzData]="viewData" nzSize="middle" [nzShowPagination]="false"
-	          [nzLoading]="grossLoading">
+	          [nzLoading]="loading">
 	          <thead>
 	            <tr class="thead">
 	              <th>药品名称</th>

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

@@ -3772,7 +3772,55 @@
 <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" (pathologyCancel)="pathologyCancel($event)"></app-pathology-add>
+<app-pathology-add *ngIf="pathologyModal" [surgeryId]="surgeryDataId" [patientId]="patientDataId" [patientId]="patientDataId" [detailId]="detailId" (pathologyCancel)="pathologyCancel($event)"></app-pathology-add>
 
 <!-- 病理详情 -->
-<app-pathology-detail *ngIf="pathologyDetailModal" [surgeryId]="surgeryDataId" [patientId]="patientDataId" (pathologyCancel)="pathologyDetailCancel($event)"></app-pathology-detail>
+<app-pathology-detail *ngIf="pathologyDetailModal" [surgeryId]="surgeryDataId" [patientId]="patientDataId" [detailId]="detailId" (pathologyCancel)="pathologyDetailCancel($event)"></app-pathology-detail>
+
+<!-- 多个申请单 -->
+<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="multiDialog">
+	<div class="modalBody modalBody-ga">
+		<div class="title">多条申请单提示<i class="icon_transport transport-guanbi" (click)="hideModal()"></i>
+		</div>
+		<div class="content">
+			<div class="weight">
+				提示：查询到{{viewData[0].patientDTO.patientName}}（{{viewData[0].patientDTO.patientCode}}）患者有多条申请单，请选择对应申请单
+			</div>
+			<div class="list-template__bottom">
+				<nz-table class="list-template__nzTable" [nzData]="viewData" nzSize="middle" [nzShowPagination]="false"
+					[nzLoading]="grossLoading">
+					<thead>
+						<tr class="thead">
+							<th>申请单类型</th>
+							<th>申请单号</th>
+							<th nzWidth="15%">检验项目</th>
+							<th>标本类型</th>
+							<th>申请时间</th>
+							<th>申请科室</th>
+							<th>状态</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr *ngFor="let data of viewData">
+							<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>
+							<td>{{ data.createTime | date:'yyyy-MM-dd HH:mm'}}</td>
+							<td>{{ data.patientDTO.department? data.patientDTO.department.dept:'-'}}</td>
+							<td>{{ data.status?data.status.name:'-'}}</td>
+						</tr>
+					</tbody>
+				</nz-table>
+			</div>
+		</div>
+		<div class="display_flex justify-content_flex-center mar-20 btns">
+			<button class="btn" nz-button nzType="primary" (click)="hideModal()">知道了</button>
+		</div>
+	</div>
+</div>
+<div class="mask-style" *ngIf="isSpinning">
+	<nz-spin nzSimple class="spin-style"></nz-spin>
+</div>

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

@@ -216,6 +216,234 @@
   // }
 }
 
+
+.save {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 99;
+	.modalBody-ga{
+		width: 80% !important;
+		.list-template__searchBox{
+			margin-top: 10px;
+		}
+		.ant-select{
+			width: 20%;
+		}
+	}
+  .modalBody {
+    width: 350px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      width: 100%;
+      height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+			
+			.weight{
+				font-weight: 600;
+				position: relative;
+				top: -9px;
+			}
+			
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.icon {
+          margin-top: 17px;
+
+          i {
+            color: #34b349;
+            font-size: 30px !important;
+
+            &.transport-wenhao {
+              color: #f5a523;
+            }
+
+            &.transport-shibai {
+              color: #ff3a52;
+            }
+          }
+        }
+
+        &.defeat {
+          color: #333;
+          font-size: 18px;
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 420px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 19px 14px 0 14px;
+        max-height: 500px;
+        overflow-y: auto;
+				
+				.ant-select{
+					width: 100%;
+				}
+				.ant-calendar-picker{
+					width: 100% !important;
+				}
+				.list-template__bottom {
+				  background: #f9fafb;
+				  border: 1px solid #e5e9ed;
+				  border-radius: 8px;
+				  padding-bottom: 56px;
+				  position: relative;
+				  .list-template__nzTable {
+				    padding: 16px 16px 0;
+				
+				    .thead {
+				      background-image: linear-gradient(to right, @bg-start, @bg-end);
+				
+				      th {
+				        background: transparent;
+				        color: #fff;
+				        text-align: center;
+				      }
+				    }
+				
+				    .ant-table-body {
+				      border-bottom: 1px solid #e5e9ed;
+				    }
+				
+				    .ant-table-tbody {
+				      tr {
+				        text-align: center;
+				        color: #333;
+				
+				        td {
+				          border: none;
+				
+				          &.tab_hover:hover{
+				            text-decoration: underline;
+				            cursor: pointer;
+				          }
+				
+				          .coop {
+				            button{
+				              color: #333;
+				            }
+				            span,button {
+				              display: inline-block;
+				              padding: 0 8px;
+				              cursor: pointer;
+				              position: relative;
+				
+				              &::after {
+				                content: "|";
+				                position: absolute;
+				                top: 0;
+				                right: 0;
+				              }
+				
+				              &:hover,
+				              &:active {
+				                color: @primary-color;
+				              }
+				
+				              &:nth-last-child(1) {
+				                &::after {
+				                  content: "";
+				                }
+				              }
+				            }
+				          }
+				        }
+				      }
+				    }
+				  }
+				  .list-template__pagination {
+				    height: 56px;
+				    display: flex;
+				    align-items: center;
+				    position: absolute;
+				    right: 8px;
+				  }
+				}
+				
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 14px;
+              text-align: left;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 14px;
+
+            .ant-form-item-label {
+              line-height: 0;
+              text-align: left;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}
+
 // 查看标本详情 start
 .noData33 {
   height: 100%;
@@ -1687,7 +1915,6 @@
   height: 100%;
   background: rgba(0, 0, 0, 0.4);
   z-index: 99;
-
   .modalBody {
     width: 480px;
     min-height: 220px;
@@ -1990,7 +2217,6 @@
         font-size: 12px;
       }
     }
-
     button {
       margin-top: 10px;
 
@@ -2184,3 +2410,18 @@
   }
 }
 
+.mask-style{
+	width: 100%;
+	height: 100%;
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 999;
+	display: flex;
+	background: rgba(0,0,0,0.2);
+	align-items: center;
+	justify-content: center;
+}
+.spin-style{
+	z-index:9999;
+}

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

@@ -267,7 +267,7 @@ export class HushijiandanComponent implements OnInit {
   specimenWorkOrderMsg: any = {}; //急标普标数量&信息
   jpDrugsWKOMsg: any = {}; //药品静配提示信息
   surgeryWKOMsg: any = {}; //手术提示信息
-
+	detailId:any = null; //病理申请单详情id
 
   getCoopBtns(){
     let menu: any = JSON.parse(localStorage.getItem("menu")) || []; //菜单
@@ -314,20 +314,47 @@ export class HushijiandanComponent implements OnInit {
 				surgeryId: item.id || "",
 				patientId: item.patientDTO.id || "",
 				hosId: this.currentHospital.id || "" ,
+				operationType: 'pathologyForm',
+				order:'createTime desc',
 			},
 		};
+		this.isSpinning = true
 		this.mainService
 			.getFetchDataList("data", "pathologyForm", data)
 			.subscribe((data) => {
-				if(data.list[0].status.value==1){
-					this.pathologyModal = true
-				}else{
-					this.pathologyDetailModal = true
+				this.isSpinning = false
+				if(data.list.length==1){
+					this.detailId = data.list[0].id
+					if(!data.list[0].status){
+						this.pathologyModal = true
+						return
+					}
+					if(data.list[0].status && 
+					(data.list[0].status.value==1 || data.list[0].status.value==2 || 
+					data.list[0].status.value==3 || data.list[0].status.value==4)){
+						this.pathologyModal = true
+					}else{
+						this.pathologyDetailModal = true
+					}
+				}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('无申请单')
 				}
 			});
 	}
 
 	// 病理申请单
+	multiDialog:any = false;
+	isSpinning:any = false;
+	viewData:any = [];
 	pathologyAdd(e){
 		this.surgeryDataId = this.surgeryWKOMsg.id
 		this.patientDataId = this.surgeryWKOMsg.patientDTO.id
@@ -338,19 +365,68 @@ export class HushijiandanComponent implements OnInit {
 				surgeryId: this.surgeryWKOMsg.id || "",
 				patientId: this.surgeryWKOMsg.patientDTO.id || "",
 				hosId: this.currentHospital.id || "" ,
+				operationType: 'pathologyForm',
+				order:'createTime desc'
 			},
 		};
+		this.isSpinning = true
 		this.mainService
 		.getFetchDataList("data", "pathologyForm", data)
 		.subscribe((data) => {
-			if(data.list[0].status.value==1){
+			this.isSpinning = false
+			if(data.list.length==1){
+				this.detailId = data.list[0].id
+				if(!data.list[0].status){
+					this.pathologyModal = true
+					return
+				}
+				if(data.list[0].status && 
+				(data.list[0].status.value==1 || data.list[0].status.value==2 || 
+					data.list[0].status.value==3 || data.list[0].status.value==4)){
+					this.pathologyModal = true
+				}else{
+					this.pathologyDetailModal = true
+				}
+			}else if(data.list.length>1){
+				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
+			}else if(data.list.length==0){
+				this.message.error('无申请单')
+			}
+		});
+	}
+	
+	// 申请单号点击
+	itemClick(item){
+		this.detailId = item.id
+		this.multiDialog = false
+		setTimeout(_=>{
+			if(!item.status){
+				this.pathologyModal = true
+				return
+			}
+			if(item.status && (item.status.value==1 || item.status.value==2 || 
+				item.status.value==3 || item.status.value==4)){
 				this.pathologyModal = true
 			}else{
 				this.pathologyDetailModal = true
 			}
-		});
+		},200)
 	}
-
+	
+	hideModal(){
+		this.multiDialog = false
+	}
+	
 	pathologyDetailCancel(){
 		this.pathologyDetailModal = false
 	}

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-add/repository-manage-add.component.html

@@ -64,7 +64,7 @@
 				
 				<nz-form-item class="form-item" *ngIf="classItem==1">
 				  <nz-form-label nzRequired nzFor="malfunction" [nzSm]="6" [nzXs]="24">关联故障现象</nz-form-label>
-				  <nz-form-control nzErrorTip="请选择关联故障现象!" [nzSm]="16" [nzXs]="24">
+				  <nz-form-control nzErrorTip="请选择关联故障现象!" [nzSm]="16" [nzXs]="16">
 					<!-- 	<nz-cascader [nzOptions]="malfunctionData" 
 							formControlName="malfunction" 
 							nzPlaceHolder="请选择关联故障现象">

src/app/views/repository-manage-add/repository-manage-add.component.less

@@ -59,6 +59,7 @@ h3{
 	position: relative;
 	overflow-x: hidden;
 	.modalBody{
+		width: 100%;
 		height: 100%;
 		position: relative;
 	}
@@ -76,8 +77,8 @@ h3{
 	.addForm {
 		display: flex;
 		.left-form-box{
-			flex: 1.5;
-			margin-right: 30px;
+			flex: 1;
+			// margin-right: 30px;
 		}
 		.right-form-box{
 			flex: 1;

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,26 +456,29 @@
 
 <!-- 标本接收 -->
 <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">
 			<div class="content-item boder-right">
-				<div class="form-title-box">
-					<div class="form-title"><span class="font-weight-500">是否术中快速：</span>{{codeData.intraoperativeRapidity==1?'是':'否'}}</div>
-				</div>
-				<div class="form-title-box">
-					<div class="form-title"><span class="font-weight-500">申请单编号：</span>{{codeData.applyCode}}</div>
-					<div class="form-title"><span class="font-weight-500">状态：</span>{{codeData.status.name}}</div>
-				</div>
-				<div class="form-title-box">
-					<div class="form-title"><span class="font-weight-500">科室名称：</span>{{codeData.patientDTO.department.dept}}</div>
-					<div class="form-title"><span class="font-weight-500">住院号：</span>{{codeData.patientDTO.patientCode}}</div>
-				</div>
-				<div class="form-title-box">
-					<div class="form-title"><span class="font-weight-500">患者信息：</span>{{codeData.patientDTO.patientName}} ({{codeData.patientDTO.bedNum}}床)</div>
-					<div class="form-title"><span class="font-weight-500">年龄：</span>{{codeData.patientDTO.age||'-'}}岁</div>
-				</div>
+				<nz-form-item class="form-title-box">
+					<div class="form-title">申请单类型：{{codeData.pathologyFormType==1?'术中快速病理检查申请单':'病理检查申请单'}}</div>
+					<div class="form-title"><span class="font-weight-500">状态：</span>{{codeData.status?codeData.status.name:'-'}}</div>
+				</nz-form-item>
+				<nz-form-item class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">申请单号：</span>{{codeData.applyCode}}</div>
+					<div class="form-title over-class"><span class="font-weight-500">申请科室：</span>{{codeData.patientDTO.department.dept}}</div>
+				</nz-form-item>
+				<nz-form-item class="form-title-box">
+					<div class="form-title">手术间：{{codeData.surgeryDeptDTO.dept}}</div>
+					<div class="form-title">取材医生：{{codeData.surgeryDoctorDTO?codeData.surgeryDoctorDTO.name : '-'}}</div>
+				</nz-form-item>
+				<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?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">
 					<div class="form-title"><span class="font-weight-500">检验项目：</span>{{project||'无'}}</div>
 				</div>
@@ -494,24 +497,17 @@
 					<div class="form-title font-weight-500">手术方案：</div>
 					<div class="indent">{{codeData.surgicalPlan||'无'}}</div>
 				</div>
-	<!-- 			<div class="form-list">
+				<div class="form-list">
 					<div class="form-title font-weight-500">术中所见：</div>
 					<div class="indent">{{codeData.intraoperativeFindings||'无'}}</div>
-				</div> -->
+				</div>
 				<div class="form-title-box">
 					<div class="form-title"><span class="font-weight-500">标本类型：</span>{{codeData.specimenType?codeData.specimenType.name:'无'}}</div>
 					<div class="form-title"><span class="font-weight-500">标本数量：</span>{{codeData.specimenNum?codeData.specimenNum:'无'}}</div>
 				</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 class="form-list">
-					<div class="form-title font-weight-500">标本：</div>
-					<div>标本1</div>
-					<div>标本2</div>
-				</div> -->
 			</div>
 			
 			<div class="content-item">
@@ -549,7 +545,8 @@
 			</div>
 		</div>
 		<div class="display_flex justify-content_flex-center bottom-btn">
-			<button class="btn btn-right" [disabled]="codeData.specimenNum != codeData.pathologySpecimenDTOList.length" nz-button nzType="primary" (click)="submitFixationForm()" [nzLoading]="btnLoading">确定</button>
+			<!-- <button class="btn btn-right" [disabled]="codeData.specimenNum != codeData.pathologySpecimenDTOList.length" nz-button nzType="primary" (click)="submitFixationForm()" [nzLoading]="btnLoading">确定</button> -->
+			<button class="btn btn-right" nz-button nzType="primary" (click)="submitFixationForm()" [nzLoading]="btnLoading">确定</button>
 			<button class="btn cancel" nz-button nzType="default" (click)="hideSpecimenModal()">取消</button>
 		</div>
 	</div>
@@ -616,17 +613,24 @@
 		<i class="icon_transport transport-guanbi" (click)="closeDetailMoadl()"></i></div>
 		<div class="content">
 			<div class="content-item boder-right">
-				<div class="form-title-box">
-					<div class="form-title"><span class="font-weight-500">是否术中快速：</span>{{detailsData.intraoperativeRapidity==1?'是':'否'}}</div>
-					<div class="form-title"><span class="font-weight-500">申请单编号：</span>{{detailsData.applyCode}}</div>
-					<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status.name}}</div>
-					<div class="form-title"><span class="font-weight-500">科室名称：</span>{{detailsData.patientDTO.department.dept}}</div>
-				</div>
-				<div class="form-title-box">
-					<div class="form-title"><span class="font-weight-500">住院号：</span>{{detailsData.patientDTO.patientCode}}</div>
+				<nz-form-item class="form-title-box">
+					<div class="form-title">申请单类型：{{detailsData.pathologyFormType==1?'术中快速病理检查申请单':'病理检查申请单'}}</div>
+					<div class="form-title"><span class="font-weight-500">状态：</span>{{detailsData.status?detailsData.status.name:'-'}}</div>
+				</nz-form-item>
+				<nz-form-item class="form-title-box">
+					<div class="form-title"><span class="font-weight-500">申请单号：</span>{{detailsData.applyCode}}</div>
+					<div class="form-title over-class"><span class="font-weight-500">申请科室：</span>{{detailsData.patientDTO.department.dept}}</div>
+				</nz-form-item>
+				<nz-form-item class="form-title-box">
+					<div class="form-title">手术间：{{detailsData.surgeryDeptDTO.dept}}</div>
+					<div class="form-title">取材医生：{{detailsData.surgeryDoctorDTO?detailsData.surgeryDoctorDTO.name : '-'}}</div>
+				</nz-form-item>
+				<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>
+					<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?detailsData.patientDTO.gender.name:'-'}}</div>
+					<div class="form-title"><span class="font-weight-500">住院号：</span>{{detailsData.patientDTO.patientCode}}</div>
+				</nz-form-item>
 				
 				<div class="form-title-box">
 					<div class="form-title"><span class="font-weight-500">检验项目：</span>{{project||'无'}}</div>
@@ -647,28 +651,28 @@
 					<div class="form-title font-weight-500">手术方案：</div>
 					<div class="indent">{{detailsData.surgicalPlan||'无'}}</div>
 				</div>
-	<!-- 			<div class="form-list">
+				<div class="form-list">
 					<div class="form-title font-weight-500">术中所见：</div>
 					<div class="indent">{{detailsData.intraoperativeFindings||'无'}}</div>
-				</div> -->
+				</div>
 
 				<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">
 					<div class="form-title font-weight-500">标本：</div>
 					<div class="form-title specimen-list">
-						<div *ngFor="let item of specimenList" class="specimen-item-class">
+						<div *ngFor="let item of specimenList" class="specimen-item-class" (click)="specimenView(item)">
 							{{item.partSource?item.partSource.name:''}}{{item.organ?item.organ.name:''}}{{item.specimenName}}
+							({{item.specimenCode}})
 						</div>
 					</div>
 				</div>
@@ -704,6 +708,48 @@
 	</div>
 </div>
 
+<!-- 查看标本 -->
+<div class="look">
+	<div class="save add display_flex align-items_center justify-content_flex-center" *ngIf="specimenViewDialog">
+		<div class="modalBody modalBody-ga">
+			<div class="title">查看标本<i class="icon_transport transport-guanbi" (click)="closeSpecimenModal()"></i>
+			</div>
+			<overlay-scrollbars #osComponentRef1 class="content">
+				<div class="list-template__bottom">
+					<nz-table class="list-template__nzTable" [nzData]="viewData" nzSize="middle" [nzShowPagination]="false"
+						[nzLoading]="loading1">
+						<thead>
+							<tr class="thead">
+								<th>标本名称</th>
+								<th>编码</th>
+								<th>备注</th>
+								<th>离体时间</th>
+								<th>离体操作人</th>
+								<th>固定时间</th>
+								<th>固定操作人</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr *ngFor="let data of viewData">
+								<td>{{ data.specimenName }}</td>
+								<td>{{ data.specimenCode }}</td>
+								<td>{{ data.remark ? data.remark : '无' }}</td>
+								<td>{{ data.inVitroTime ? (data.inVitroTime|date:'yyyy-MM-dd HH:mm:ss') : '-' }}</td>
+								<td>{{ data.inVitroOperator ? data.inVitroOperator.name : '-' }}</td>
+								<td>{{ data.fixationTime ? (data.fixationTime|date:'yyyy-MM-dd HH:mm:ss') : '-' }}</td>
+								<td>{{ data.fixationOperator ? data.fixationOperator.name : '-' }}</td>
+							</tr>
+						</tbody>
+					</nz-table>
+				</div>
+			</overlay-scrollbars>
+			<div class="display_flex justify-content_flex-center">
+				<button class="btn" nz-button nzType="primary" (click)="closeSpecimenModal()">知道了</button>
+			</div>
+		</div>
+	</div>
+</div>
+
 <div class="mask-style" *ngIf="isSpinning">
 	<nz-spin nzSimple class="spin-style"></nz-spin>
 </div>

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

@@ -657,6 +657,9 @@
 	height: 100%;
 	background: rgba(0, 0, 0, 0.4);
 	z-index: 99;
+	.width-80{
+		width: 80% !important;
+	}
 	.pathology-content{
 		width: 80%;
 		background: #fff;
@@ -708,6 +711,9 @@
 							color: #333;
 							margin-right: 40px;
 						}
+						.mar-ri-20{
+							margin-right: 20px !important;
+						}
 						.width-150{
 							width: 150px;
 						}
@@ -740,6 +746,8 @@
 							display: flex;
 							flex-wrap: wrap;
 							.specimen-item-class{
+								text-decoration: underline;
+								cursor: pointer;
 								margin-right: 40px;
 								color:#333;
 							}
@@ -831,4 +839,227 @@
 }
 .spin-style{
 	z-index:9999;
-}
+}
+
+.look{
+	.save {
+	  position: fixed;
+	  left: 0;
+	  top: 0;
+	  width: 100%;
+	  height: 100%;
+	  background: rgba(0, 0, 0, 0.4);
+	  z-index: 999;
+		.modalBody-ga{
+			width: 80% !important;
+			.list-template__searchBox{
+				margin-top: 10px;
+			}
+			.ant-select{
+				width: 20%;
+			}
+		}
+	  .modalBody {
+	    width: 350px;
+	    background: #fff;
+	    border-radius: 5px;
+	    padding: 10px 20px;
+	    color: #333;
+	
+	    .title {
+	      width: 100%;
+	      text-align: center;
+	      font-size: 18px;
+	      position: relative;
+	
+	      i {
+	        position: absolute;
+	        right: 0;
+	        top: 0;
+	        font-size: 20px;
+	        color: #666;
+	        cursor: pointer;
+	        padding: 0 5px;
+	      }
+	    }
+	
+	    .content {
+	      width: 100%;
+	      height: 117px;
+	      background: #f9fafb;
+	      border: 1px solid #e5e9ed;
+	      border-radius: 5px;
+	      overflow: hidden;
+	      margin-top: 12px;
+	
+	      div {
+	        text-align: center;
+	        margin: 0;
+	
+	        &.icon {
+	          margin-top: 17px;
+	
+	          i {
+	            color: #34b349;
+	            font-size: 30px !important;
+	
+	            &.transport-wenhao {
+	              color: #f5a523;
+	            }
+	
+	            &.transport-shibai {
+	              color: #ff3a52;
+	            }
+	          }
+	        }
+	
+	        &.defeat {
+	          color: #333;
+	          font-size: 18px;
+	        }
+	
+	        &:nth-child(3) {
+	          font-size: 14px;
+	          color: #666;
+	        }
+	      }
+	    }
+	
+	    button {
+	      margin-top: 10px;
+	
+	      &.btn {
+	        margin-left: 8px;
+	      }
+	    }
+	  }
+	
+	  // 新增
+	  &.add {
+	    .modalBody {
+	      width: 420px;
+	      height: auto;
+	
+	      .content {
+	        width: 100%;
+	        height: auto;
+	        padding: 19px 14px 0 14px;
+	        max-height: 500px;
+	        overflow-y: auto;
+					
+					.ant-select{
+						width: 100%;
+					}
+					.ant-calendar-picker{
+						width: 100% !important;
+					}
+					.list-template__bottom {
+					  background: #f9fafb;
+					  border: 1px solid #e5e9ed;
+					  border-radius: 8px;
+					  padding-bottom: 56px;
+					  position: relative;
+					  .list-template__nzTable {
+					    padding: 16px 16px 0;
+					
+					    .thead {
+					      background-image: linear-gradient(to right, @bg-start, @bg-end);
+					
+					      th {
+					        background: transparent;
+					        color: #fff;
+					        text-align: center;
+					      }
+					    }
+					
+					    .ant-table-body {
+					      border-bottom: 1px solid #e5e9ed;
+					    }
+					
+					    .ant-table-tbody {
+					      tr {
+					        text-align: center;
+					        color: #333;
+					
+					        td {
+					          border: none;
+					
+					          &.tab_hover:hover{
+					            text-decoration: underline;
+					            cursor: pointer;
+					          }
+					
+					          .coop {
+					            button{
+					              color: #333;
+					            }
+					            span,button {
+					              display: inline-block;
+					              padding: 0 8px;
+					              cursor: pointer;
+					              position: relative;
+					
+					              &::after {
+					                content: "|";
+					                position: absolute;
+					                top: 0;
+					                right: 0;
+					              }
+					
+					              &:hover,
+					              &:active {
+					                color: @primary-color;
+					              }
+					
+					              &:nth-last-child(1) {
+					                &::after {
+					                  content: "";
+					                }
+					              }
+					            }
+					          }
+					        }
+					      }
+					    }
+					  }
+					  .list-template__pagination {
+					    height: 56px;
+					    display: flex;
+					    align-items: center;
+					    position: absolute;
+					    right: 8px;
+					  }
+					}
+					
+	        .addForm {
+	          .ant-form-item {
+	            margin-bottom: 14px;
+	
+	            .ant-form-item-label {
+	              line-height: 14px;
+	              text-align: left;
+	            }
+	          }
+	        }
+	
+	        .editForm {
+	          .ant-form-item {
+	            margin-bottom: 14px;
+	
+	            .ant-form-item-label {
+	              line-height: 0;
+	              text-align: left;
+	            }
+	          }
+	        }
+	      }
+	
+	      button {
+	        &:nth-child(1) {
+	          margin-right: 20px;
+	        }
+	      }
+	    }
+	  }
+	}
+}

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

@@ -180,22 +180,40 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 			this.isSpinning = false
 			if(res.status==200){
 				this.codeData = res.data[0]
-				if(this.codeData.pathologyInspectDTOS){
-					this.project = this.codeData.pathologyInspectDTOS.map(i=>{
-						return i.inspectProject.name
-					})
-					this.project = this.project.join('、')
+				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){
+								this.project = this.codeData.pathologyInspectDTOS.map(i=>{
+									return i.inspectProject.name
+								})
+								this.project = this.project.join('、')
+							}
+							this.fixationModal = true
+							setTimeout(_=>{
+								document.getElementById('specimen').focus();
+							},200)
+						}else{
+							this.viewDetail(this.codeData,'4')
+						}
+					this.fixationError = null
+					this.searchMsg = null
+				}else if(item.fixationTime && this.codeData.pathologyFormType==0){
+					this.viewDetail(this.codeData,'4')
+					this.barCode = null
+					this.fixationError = null
+					this.searchMsg = null
+				}else{
+					this.barCode = null
+					this.fixationError = null
+					this.searchMsg = '该申请单类型不是病理检查申请单'
 				}
-				this.fixationError = null
-				this.fixationModal = true
-				setTimeout(_=>{
-					document.getElementById('specimen').focus();
-				},200)
-				this.searchMsg = null
+				
 			}else{
 				this.barCode = null
 				this.searchMsg = res.msg
-				// this.message.error(res.msg)
 			}
 		})
 	}
@@ -228,6 +246,7 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 	// 关闭接受固定标本
 	hideSpecimenModal(){
 		this.autoUpdate()
+		this.cancelSpecimenModal()
 		this.barCode = null;
 		this.specimenCode = null;
 		this.fixationError = null
@@ -236,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){
@@ -256,7 +288,23 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		  this.detailMoadl = true
 		});
 	}
-
+	
+	// 关闭查看标本
+	closeSpecimenModal(){
+		this.specimenViewDialog = false
+	}
+	
+	// 查看标本
+	specimenViewDialog:any = false;
+	viewData:any = [];
+	specimenItem:any;
+	specimenView(item){
+		this.viewData = []
+		this.specimenViewDialog = true
+		this.specimenItem = item;
+		this.viewData.push(item)
+	}
+	
 	// 获取科室
 	getDept(){
 		this.setSpecimen()
@@ -443,13 +491,16 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		  this.validateVerificationForm.controls[i].updateValueAndValidity();
 		}
 		if (this.validateVerificationForm.invalid) return;
-
+		let str = this.codeData.pathologySpecimenDTOList.map(i=>{
+			return i.specimenCode
+		})
 		let data: any = {
 			id:this.codeData.id,
 			specimenDeptId:this.validateForm.value.specimen,
 			specimenFixingLiquid:{
 				id:this.validateVerificationForm.value.fixative
 			},
+			specimenCodes:str.join(','),
 			fixationTime:this.startDate,
 			hosId: this.hosId || "" ,
 			handoverUserId:this.handoverUserId
@@ -521,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
 			}
@@ -538,13 +595,6 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		this.isSpinning = true
 		this.getSampleData(item)
 		clearInterval(this.logTimer);
-		if(type==1){
-
-		}else if(type==2){
-
-		}else{
-
-		}
 	}
 
 	closeDetailMoadl(){
@@ -555,71 +605,6 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 		this.autoUpdate(false);
 	}
 
-  // 统计
-  // total() {
-  //   let launch = JSON.parse(localStorage.getItem("user")).user.dept.id;
-  //   let startTime = format(startOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
-  //   let endTime = format(endOfDay(new Date()), "yyyy-MM-dd HH:mm:ss");
-  //   let postData = {
-  //     startTime,
-  //     endTime,
-  //     launch,
-  //   };
-
-  //   this.mainService.getDrugsBagStateCount(postData).subscribe((res: any) => {
-  //     if (res.status == 200) {
-  //       this.todayTotal = res.countMap.todayTotal;
-  //       this.todayComplete = res.countMap.todayComplete;
-  //     }
-  //   });
-  // }
-  // // 查看工单详情
-  // goToOrderDetail(item){
-  //   console.log(item);
-  //   this.router.navigateByUrl(`specimenView2/detailSample/${item.id}`);
-  // }
-
-  // // 查看流程信息弹窗
-  // logPromptModalShow = false; //弹窗开关
-  // scode = ""; //查看记录携带
-  // showLogs(data) {
-  //   clearInterval(this.logTimer);
-  //   this.scode = data.scode;
-  //   this.logPromptModalShow = true;
-  // }
-  // // 关闭流程信息弹窗
-  // closeModelLog(e) {
-  //   this.logPromptModalShow = JSON.parse(e).show;
-  //   this.autoUpdate(false);
-  // }
-  // // 查看标本列表弹窗
-  // spePromptModalShow = false; //弹窗开关
-  // checkDeptId = ""; //检查科室id
-  // printDate = ""; //采集日期
-  // showSpeList(data) {
-  //   clearInterval(this.logTimer);
-  //   this.checkDeptId = data.check_dept_id;
-  //   this.printDate = data.startTime;
-  //   this.spePromptModalShow = true;
-  // }
-  // 关闭标本列表弹窗
-  // closeModelSpe(e) {
-  //   this.spePromptModalShow = JSON.parse(e).show;
-  //   this.autoUpdate(false);
-  // }
-  //  // 查看工单列表弹窗
-  //  orderPromptModalShow = false; //弹窗开关
-  //  workId = ""; //配送人员ID
-  //  showOrderList(data) {
-  //    clearInterval(this.logTimer);
-  //    this.workId = data.workerid;
-  //    this.orderPromptModalShow = true;
-  //  }
-  //  // 关闭工单列表弹窗
-  //  closeModelOrder(e) {
-  //    this.orderPromptModalShow = JSON.parse(e).show;
-  //    this.autoUpdate(false);
-  //  }
   // 自动刷新倒计时
   autoUpdate(flag = true) {
     if (flag) {

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,