拉取代码

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

@@ -922,6 +922,7 @@ export class PathologyAddComponent implements OnInit {
 			},
 			operation:'',
 			pathologySpecimenIds:'',
+			deptType:'surgery'
 		};
 		delete data.pathologyForm.patientDTO
 		delete data.pathologyForm.surgeryDeptDTO
@@ -1178,6 +1179,7 @@ export class PathologyAddComponent implements OnInit {
 								id:this.validateForm.value.specimenGenre
 							}
 						},
+						deptType:'surgery',
 						operation:'',
 						pathologySpecimenIds:'',
 					};
@@ -1249,8 +1251,9 @@ export class PathologyAddComponent implements OnInit {
 					pathologyInspectIds:this.validateForm.value.project.join(','),
 					specimenType:{
 						id:this.validateForm.value.specimenGenre
-					}
-				}
+					},
+				},
+				deptType:'surgery'
 			};
 			data.pathologyForm.specimenNum = this.specimenList.length
 			delete data.pathologyForm.patientDTO

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

@@ -312,6 +312,8 @@
 	          <thead>
 	            <tr class="thead">
 								<th>标本名称</th>
+								<th>系统</th>
+								<th>部位</th>
 	              <th>编码</th>
 	              <th>备注</th>
 	              <th>离体时间</th>
@@ -323,6 +325,8 @@
 	          <tbody>
 	            <tr *ngFor="let data of viewData">
 								<td>{{ data.specimenName }}</td>
+								<td>{{ data.system ? data.system.name : '-' }}</td>
+								<td>{{ data.organ ? data.organ.name : '-' }}</td>
 	              <td>{{ data.specimenCode }}</td>
 	              <td>{{ data.remark ? data.remark : '无' }}</td>
 								<td>{{ data.inVitroTime ? (data.inVitroTime|date:'yyyy-MM-dd HH:mm:ss') : '-' }}</td>

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

@@ -95,8 +95,9 @@ export class PathologyDetailComponent implements OnInit {
 				...this.detailsData,
 				surgeryId: this.surgeryId || "",
 				patientId: this.patientId || "",
-				hosId: this.hosId || "" 
-			}
+				hosId: this.hosId || "" ,
+			},
+			deptType:'surgery'
 		};
 		delete data.pathologyForm.patientDTO
 		delete data.pathologyForm.surgeryDeptDTO

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

@@ -217,29 +217,33 @@
 			<overlay-scrollbars #osComponentRef1 class="content">
 				<div class="list-template__bottom">
 					<nz-table class="list-template__nzTable" [nzData]="specimenData" nzSize="middle" [nzShowPagination]="false"
-						[nzLoading]="loading1">
-						<thead>
-							<tr class="thead">
+					  [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 specimenData">
+								<th>系统</th>
+								<th>部位</th>
+					      <th>编码</th>
+					      <th>备注</th>
+					      <th>离体时间</th>
+					      <th>离体操作人</th>
+					      <th>固定时间</th>
+					      <th>固定操作人</th>
+					    </tr>
+					  </thead>
+					  <tbody>
+					    <tr *ngFor="let data of specimenData">
 								<td>{{ data.specimenName }}</td>
-								<td>{{ data.specimenCode }}</td>
-								<td>{{ data.remark ? data.remark : '无' }}</td>
+								<td>{{ data.system ? data.system.name : '-' }}</td>
+								<td>{{ data.organ ? data.organ.name : '-' }}</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>
+					    </tr>
+					  </tbody>
 					</nz-table>
 				</div>
 			</overlay-scrollbars>

src/app/views/pathology-communication-book/pathology-communication-book.component.html

@@ -380,29 +380,33 @@
 			<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">
+					  [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">
+								<th>系统</th>
+								<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.system ? data.system.name : '-' }}</td>
+								<td>{{ data.organ ? data.organ.name : '-' }}</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>
+					    </tr>
+					  </tbody>
 					</nz-table>
 				</div>
 			</overlay-scrollbars>

src/app/views/pathology-sample/pathology-sample.component.html

@@ -173,8 +173,8 @@
 				</div>
 				<div class="display_flex justify-content_flex-center bottom-btn">
 					<button *ngIf="statusValue==1" class="btn btn-right" nz-button nzType="primary" (click)="submitForm('print')" [nzLoading]="btnLoading">标本打印</button>
-					<button *ngIf="statusValue==2 || statusValue==3" class="btn btn-right" nz-button nzType="primary" (click)="superaddition()" [nzLoading]="zjLoading">追加打印</button>
-					<button *ngIf="statusValue==2 || statusValue==3" class="btn" nz-button nzType="primary" nzGhost (click)="submitForm('all')" [nzLoading]="btnLoading">全量打印</button>
+					<button *ngIf="statusValue==2 || statusValue==3 || statusValue==4" class="btn btn-right" nz-button nzType="primary" (click)="superaddition()" [nzLoading]="zjLoading">追加打印</button>
+					<button *ngIf="statusValue==2 || statusValue==3 || statusValue==4" class="btn" nz-button nzType="primary" nzGhost (click)="submitForm('all')" [nzLoading]="btnLoading">全量打印</button>
 				</div>
 			</div>
 			
@@ -247,7 +247,7 @@
 		<div class="content-item-right" *ngIf="adviceList && adviceList.pathologyFormDTOS.length>0 && pathologyLogs.length && (viewType=='view' || viewType=='edit')">
 			<div class="tabs">
 				<div class="tabs-item">
-					<div class="tabs-item-item" *ngIf="adviceItem.status.value < 7" [ngClass]="{'activeClass': activeIndex == 0}" (click)="tabClick(0)">快捷标本填写</div>
+					<div class="tabs-item-item" *ngIf="adviceItem.status.value < 5" [ngClass]="{'activeClass': activeIndex == 0}" (click)="tabClick(0)">快捷标本填写</div>
 					<div class="tabs-item-item" [ngClass]="{'activeClass': activeIndex == 1}" (click)="tabClick(1)">病理闭环</div>
 				</div>
 			</div>
@@ -454,29 +454,33 @@
 			<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">
+					  [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">
+								<th>系统</th>
+								<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.system ? data.system.name : '-' }}</td>
+								<td>{{ data.organ ? data.organ.name : '-' }}</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>
+					    </tr>
+					  </tbody>
 					</nz-table>
 				</div>
 			</overlay-scrollbars>
@@ -508,7 +512,7 @@
 						</nz-input-group>
 				  </nz-form-control>
 				</nz-form-item>
-				<nz-form-item *ngIf="ifImmobilization && detailsData.pathologyFormType==0">
+				<nz-form-item *ngIf="ifImmobilization && detailsData && detailsData.pathologyFormType==0">
 				  <nz-form-label nzRequired [nzSpan]="6" nzFor="fixationTime">固定时间</nz-form-label>
 				  <nz-form-control style="display: flex;align-items: center;" [nzSpan]="18" nzErrorTip="请选择固定时间!">
 				    <nz-input-group style="display: flex;gap: 10px">
@@ -521,7 +525,7 @@
 						</nz-input-group>
 				  </nz-form-control>
 				</nz-form-item>
-				<nz-form-item *ngIf="ifImmobilization">
+				<nz-form-item *ngIf="ifImmobilization && detailsData && detailsData.pathologyFormType==0">
 				  <nz-form-label nzRequired [nzSpan]="8" nzFor="fixative">固定液类型</nz-form-label>
 				  <nz-form-control [nzSpan]="16" nzErrorTip="请选择固定液类型!">
 				    <nz-input-group>

src/app/views/pathology-sample/pathology-sample.component.ts

@@ -389,7 +389,7 @@ export class PathologySampleComponent implements OnInit {
 	listClick(item,index){
 		this.leftIndex = index
 		this.adviceItem = item
-		if(item.status.value > 6){
+		if(item.status.value > 4){
 			this.activeIndex = 1
 		}
 		if(item.id){
@@ -587,6 +587,7 @@ export class PathologySampleComponent implements OnInit {
 			},
 			operation:'',
 			pathologySpecimenIds:'',
+			deptType:'outpatient'
 		};
 		delete data.pathologyForm.patientDTO
 		delete data.pathologyForm.surgeryDeptDTO
@@ -1369,6 +1370,7 @@ export class PathologySampleComponent implements OnInit {
 						},
 						operation:'',
 						pathologySpecimenIds:'',
+						deptType:'outpatient'
 					};
 					data.pathologyForm.specimenNum = this.specimenList.length
 					if(this.operation=='addPrint' || this.operation=='wholePrint'){
@@ -1443,8 +1445,9 @@ export class PathologySampleComponent implements OnInit {
 					pathologyInspectIds:this.validateForm.value.project,
 					specimenType:{
 						id:this.validateForm.value.specimenGenre
-					}
-				}
+					},
+				},
+				deptType:'outpatient'
 			};
 			data.pathologyForm.specimenNum = this.specimenList.length
 			delete data.pathologyForm.patientDTO

src/app/views/pathology/pathology.component.html

@@ -424,29 +424,33 @@
 			<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">
+					  [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">
+								<th>系统</th>
+								<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.system ? data.system.name : '-' }}</td>
+								<td>{{ data.organ ? data.organ.name : '-' }}</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>
+					    </tr>
+					  </tbody>
 					</nz-table>
 				</div>
 			</overlay-scrollbars>

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

@@ -773,29 +773,33 @@
 			<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">
+					  [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">
+								<th>系统</th>
+								<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.system ? data.system.name : '-' }}</td>
+								<td>{{ data.organ ? data.organ.name : '-' }}</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>
+					    </tr>
+					  </tbody>
 					</nz-table>
 				</div>
 			</overlay-scrollbars>