From 1d5a67a6394e94a02a1ea3b051bb8b9018c6616d Mon Sep 17 00:00:00 2001
From: nicky <wqzl2735@gmail.com>
Date: Thu, 27 Feb 2025 23:14:42 +0800
Subject: [PATCH] 20250227

---
 src/assets/less/common.less                   |    9 +-
 src/config/code.js                            |   40 +-
 src/layouts/BasicLayout.less                  |    8 +-
 src/views/document/index.vue                  |   15 +-
 src/views/statistics/index.vue                |   72 +-
 .../components/throm-report - 副本.vue        | 1049 +++++++++++++++++
 .../thrombolysis/components/throm-report.vue  |  102 +-
 .../components/throm-result-baseInfo.vue      |   41 +-
 .../components/throm-result-firstInfo.vue     |   25 +-
 9 files changed, 1214 insertions(+), 147 deletions(-)
 create mode 100644 src/views/thrombolysis/components/throm-report - 副本.vue

diff --git a/src/assets/less/common.less b/src/assets/less/common.less
index 5277da3..f7e7d17 100644
--- a/src/assets/less/common.less
+++ b/src/assets/less/common.less
@@ -102,7 +102,7 @@
 	font-size: 30px;
 }
 .fz24{
-	font-size: 24px;
+	font-size: 20px;
 }
 .border-bottom{
 	border-bottom: 1px solid #dfe6ec;
@@ -585,6 +585,7 @@
  }
  .container-left-header {
  	display: flex;
+	margin-top: 10px;
  	span {
  		width: 8px;
  		height: 28px;
@@ -598,8 +599,8 @@
  
  	p {
  		line-height: 32px;
- 		font-size: 1.2rem;
- 		font-weight: 600;
+ 		font-size: 20px;
+ 		font-weight: bold;
  		margin: 0;
  	}
  }
@@ -660,7 +661,7 @@
  
  		.ant-form-item-label {
  			display: flex;
-			width: 160px !important;
+			// width: 160px !important;
  		}
  
  		.ant-radio-wrapper {
diff --git a/src/config/code.js b/src/config/code.js
index 5e6cd8f..bd80444 100644
--- a/src/config/code.js
+++ b/src/config/code.js
@@ -1212,26 +1212,6 @@ export const JMRS_CODE = {
 };
 // 血管内治疗
 export const XGZL_CODE = {
-	'XGZL-Y': {
-		text: '是否给予血管内治疗',
-		type: 'radio',
-		default: '',
-		range: {
-			是: '是',
-			否: '否',
-		},
-	},
-	'XGZL-WZLYY': {
-		text: '未给予血管内治疗的原因',
-		type: 'checkbox',
-		default: [''],
-		range: ['非大血管病变', '超时间窗', '禁忌症', '患者/家属拒绝', '其他'],
-		showType: {
-			type: 'value',
-			code: 'XGZL-Y',
-			value: '否',
-		},
-	},
 	'XGZL-WZLYY-ELSE': {
 		text: '',
 		type: 'input',
@@ -1304,6 +1284,26 @@ export const XGZL_CODE = {
 		},
 		default: '',
 	},
+	'XGZL-Y': {
+		text: '是否给予血管内治疗',
+		type: 'radio',
+		default: '',
+		range: {
+			是: '是',
+			否: '否',
+		},
+	},
+	'XGZL-WZLYY': {
+		text: '未给予血管内治疗的原因',
+		type: 'checkbox',
+		default: [''],
+		range: ['非大血管病变', '超时间窗', '禁忌症', '患者/家属拒绝', '其他'],
+		showType: {
+			type: 'value',
+			code: 'XGZL-Y',
+			value: '否',
+		},
+	},
 	'XGZL-XGKT': {
 		text: '血管内开通方法',
 		type: 'checkbox',
diff --git a/src/layouts/BasicLayout.less b/src/layouts/BasicLayout.less
index d31cae8..76c3c3a 100644
--- a/src/layouts/BasicLayout.less
+++ b/src/layouts/BasicLayout.less
@@ -5,10 +5,10 @@
 		height: 100vh;
 		
 		.ant-layout-sider{
-			flex: 0 0 120px !important;
-			max-width: 120px !important;
-			min-width: 120px !important;
-			width: 120px !important;
+			flex: 0 0 138px !important;
+			max-width: 138px !important;
+			min-width: 138px !important;
+			width: 138px !important;
 			background-color: #fff;
 			.layout-sider-header-row{
 				display: flex;
diff --git a/src/views/document/index.vue b/src/views/document/index.vue
index 4787c7b..be382b1 100644
--- a/src/views/document/index.vue
+++ b/src/views/document/index.vue
@@ -14,7 +14,7 @@
 			</div>
 			<div class="doc-list-table">
 				<a-table :columns="columns" :data-source="dataSource" bordered :scroll="{ y: 780, x: 1500 }"
-					:locale="{ emptyText: '暂无数据'}" rowKey="firstAidId" size="small"  :pagination="pagination">
+					:locale="{ emptyText: '暂无数据'}" rowKey="firstAidId" :pagination="pagination">
 					<template slot="action" slot-scope="text, row">
 						<a-button type="link" @click="editReport(row, 'patientDetail')">详情</a-button>
 						<a-button type="link" @click="checkReport(row, 'docReport')">报告单</a-button>
@@ -420,6 +420,19 @@
 			.ant-btn-link {
 				padding: 0 4px;
 			}
+			
+			
+			// .ant-table-scroll,
+			// .ant-table-fixed-left,
+			// .ant-table-fixed-right {
+			// 	tr {
+			// 		height: 32px !important;
+			// 		// line-height: 32px !important;
+			// 	}
+			// 	.ant-table-thead tr{
+			// 		height: 65px !important;
+			// 	}
+			// }
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/src/views/statistics/index.vue b/src/views/statistics/index.vue
index c2812f8..d5e401b 100644
--- a/src/views/statistics/index.vue
+++ b/src/views/statistics/index.vue
@@ -14,7 +14,7 @@
 							<!-- <a-radio-button value="2">季</a-radio-button> -->
 							<a-radio-button value="3">年</a-radio-button>
 						</a-radio-group>
-						<a-range-picker format="YYYY-MM-DD" style="width: 280px;" :placeholder="['开始日期','结束日期']"
+						<a-range-picker v-model="queryParams1.Range" format="YYYY-MM-DD" style="width: 320px;" :placeholder="['开始日期','结束日期']"
 							separator="至" @change="dateChange($event, 'queryParams1')" />
 					</div>
 				</div>
@@ -43,7 +43,7 @@
 							<!-- <a-radio-button value="2">季</a-radio-button> -->
 							<a-radio-button value="3">年</a-radio-button>
 						</a-radio-group>
-						<a-range-picker format="YYYY-MM-DD" style="width: 280px;" :placeholder="['开始日期','结束日期']"
+						<a-range-picker v-model="queryParams4.Range" format="YYYY-MM-DD" style="width: 320px;" :placeholder="['开始日期','结束日期']"
 							separator="至" @change="dateChange($event, 'queryParams4')" />
 					</div>
 				</div>
@@ -80,7 +80,7 @@
 							<!-- <a-radio-button value="2">季</a-radio-button> -->
 							<a-radio-button value="3">年</a-radio-button>
 						</a-radio-group>
-						<a-range-picker format="YYYY-MM-DD" style="width: 280px;" :placeholder="['开始日期','结束日期']"
+						<a-range-picker v-model="queryParams2.Range" format="YYYY-MM-DD" style="width: 320px;" :placeholder="['开始日期','结束日期']"
 							separator="至" @change="dateChange($event, 'queryParams2')" />
 					</div>
 				</div>
@@ -114,7 +114,7 @@
 							<!-- <a-radio-button value="2">季</a-radio-button> -->
 							<a-radio-button value="3">年</a-radio-button>
 						</a-radio-group>
-						<a-range-picker format="YYYY-MM-DD" style="width: 280px;" :placeholder="['开始日期','结束日期']"
+						<a-range-picker v-model="queryParams3.Range" format="YYYY-MM-DD" style="width: 320px;" :placeholder="['开始日期','结束日期']"
 							separator="至" @change="dateChange($event, 'queryParams3')" />
 					</div>
 				</div>
@@ -165,22 +165,26 @@
 				queryParams1: {
 					"timeType": "1", //统计方式 0:周 1:月 2:季 3:年
 					"startTime": "2024-10-01 00:00:00", //开始时间
-					"endTime": "2025-01-01 00:00:00" //结束时间
+					"endTime": "2025-01-01 00:00:00", //结束时间
+					"Range": []
 				},
 				queryParams2: {
 					"timeType": "1", //统计方式 0:周 1:月 2:季 3:年
-					"startTime": "2024-10-01 00:00:00", //开始时间
-					"endTime": "2025-01-01 00:00:00" //结束时间
+					"startTime": "", //开始时间
+					"endTime": "" ,//结束时间
+					"Range": [],
 				},
 				queryParams3: {
 					"timeType": "1", //统计方式 0:周 1:月 2:季 3:年
-					"startTime": "2024-10-01 00:00:00", //开始时间
-					"endTime": "2025-01-01 00:00:00" //结束时间
+					"startTime": "", //开始时间
+					"endTime": "", //结束时间
+					"Range": []
 				},
 				queryParams4: {
 					"timeType": "1", //统计方式 0:周 1:月 2:季 3:年
-					"startTime": "2024-10-01 00:00:00", //开始时间
-					"endTime": "2025-01-01 00:00:00" //结束时间
+					"startTime": "", //开始时间
+					"endTime": "", //结束时间
+					"Range": []
 				}
 			}
 		},
@@ -220,6 +224,23 @@
 						this.getData15()
 						break;
 					default:
+						const startTime = dayjs().add(-1, 'month').format('YYYY-MM-DD 00:00:00')
+						const endTime = dayjs().format('YYYY-MM-DD 00:00:00')
+						this['queryParams1']['startTime'] = startTime
+						this['queryParams1']['endTime'] = endTime
+						this['queryParams1']['Range'] = [startTime, endTime]
+						
+						this['queryParams2']['startTime'] = startTime
+						this['queryParams2']['endTime'] = endTime
+						this['queryParams2']['Range'] = [startTime, endTime]
+						
+						this['queryParams3']['startTime'] = startTime
+						this['queryParams3']['endTime'] = endTime
+						this['queryParams3']['Range'] = [startTime, endTime]
+						
+						this['queryParams4']['startTime'] = startTime
+						this['queryParams4']['endTime'] = endTime
+						this['queryParams4']['Range'] = [startTime, endTime]
 						this.getData1()
 						this.getData2()
 						this.getData3()
@@ -238,16 +259,30 @@
 						break;
 				}
 
-
-
 			},
 			typeChange(e, filed) {
 				this[filed]['timeType'] = e.target.value
+				let startTime = "";
+				let endTime = "";
+				if(e.target.value == 0){
+					startTime = dayjs().add(-1, 'week').format('YYYY-MM-DD 00:00:00')
+					endTime = dayjs().format('YYYY-MM-DD 00:00:00')
+				}else if(e.target.value == 1){
+					startTime = dayjs().add(-1, 'month').format('YYYY-MM-DD 00:00:00')
+					endTime = dayjs().format('YYYY-MM-DD 00:00:00')
+				}else if(e.target.value == 3){
+					startTime = dayjs().add(-1, 'year').format('YYYY-MM-DD 00:00:00')
+					endTime = dayjs().format('YYYY-MM-DD 00:00:00')
+				}
+				
+				this[filed]['startTime'] = startTime
+				this[filed]['endTime'] = endTime
+				this[filed]['Range'] = [startTime, endTime]
 				this.init(filed)
 			},
 			dateChange(dates, filed) {
-				const startTime = dates[0].format('YYYY-MM-DD HH:mm:ss')
-				const endTime = dates[1].format('YYYY-MM-DD HH:mm:ss')
+				const startTime = dates[0].format('YYYY-MM-DD 00:00:00')
+				const endTime = dates[1].format('YYYY-MM-DD 00:00:00')
 				this[filed]['startTime'] = startTime
 				this[filed]['endTime'] = endTime
 				this.init(filed)
@@ -1395,10 +1430,13 @@
 						margin-right: 10px;
 						overflow: hidden;
 						box-sizing: border-box;
-						border-left: 1px solid #d9d9d9;
+						border: 1px solid #d9d9d9;
 
 						&.ant-radio-button-wrapper-checked {
-							border-left: 1px solid #0062d9;
+							border: 1px solid #0062d9;
+							&:before{
+								background-color: #d9d9d9;
+							}
 						}
 					}
 				}
diff --git a/src/views/thrombolysis/components/throm-report - 副本.vue b/src/views/thrombolysis/components/throm-report - 副本.vue
new file mode 100644
index 0000000..98439f3
--- /dev/null
+++ b/src/views/thrombolysis/components/throm-report - 副本.vue	
@@ -0,0 +1,1049 @@
+<template>
+	<div class="throm-report">
+		<div class="report-container">
+			<a-row >
+				<a-col :span="24">
+					<a-card class="report-card baseInfo" title="患者信息">
+						<a-col :span='8'>
+							<a-row><div class="leftTitle">姓名</div><div class="rightValue">{{patient.patientName}}</div></a-row>
+							<a-row><div class="leftTitle">民族</div><div class="rightValue">{{patient.patientNation || '-'}}</div></a-row>
+							<a-row><div class="leftTitle">诊断</div><div class="rightValue">{{patient.firstAidZlTypeString || '-'}}</div></a-row>
+						</a-col>
+						<a-col :span='8' class="midItem">
+							<a-row><div class="leftTitle">性别</div><div class="rightValue">{{patient.patientGenderString || '-'}}</div></a-row>
+							<a-row><div class="leftTitle">身份证号</div><div class="rightValue">{{patient.patientIdCardNo ? utils.maskIDCard(patient.patientIdCardNo || '') : '-'}}</div></a-row>
+							<a-row><div class="leftTitle">发病时间</div><div class="rightValue">{{queryItemInfo('XGZL-CCWC-TIME').toString() ||'-'}}</div></a-row>
+						</a-col>
+						<a-col :span='8'>
+							<a-row><div class="leftTitle">年龄</div><div class="rightValue">{{patient.patientAge || '-'}}岁</div></a-row>
+							<a-row><div class="leftTitle">联系方式</div><div class="rightValue">{{patient.patientContract || '-'}}</div></a-row>
+						
+						</a-col>
+					</a-card>
+
+				</a-col>
+				<a-col :span="24">
+					<a-card class="report-card baseInfo" title="病情评估">
+						<a-col :span='8'>
+							<a-row><div class="leftTitle">入院mRS评分</div><div class="rightValue">{{ getFirstInfo['RYPG-MRS'] || '暂无' }}</div></a-row>
+							<a-row><div class="leftTitle">入院NIHSS评分</div><div class="rightValue">{{ getFirstInfo['RYPG-NIHSS'] || '暂无' }}</div></a-row>
+							<a-row><div class="leftTitle">舒张压/收缩压</div><div class="rightValue">
+								<span>{{getFirstInfo['RYPG-DIASTOLIC-PRESSURE'] ? (getFirstInfo['RYPG-DIASTOLIC-PRESSURE'] + 'mmHg') : '暂无'}}</span>
+									<span> / </span>
+									<span>{{getFirstInfo['RYPG-SYSTOLIC-PRESSURE'] ? (getFirstInfo['RYPG-SYSTOLIC-PRESSURE'] + 'mmHg') : '暂无'}}</span>
+							</div></a-row>
+							<a-row><div class="leftTitle">选用平车</div><div class="rightValue">{{patient.carNo || '-'}}</div></a-row>
+							<a-row><div class="leftTitle">绿道状态</div><div class="rightValue"><span class="report-treat-rowtext"><a-switch checked></a-switch></span></div></a-row>
+						</a-col>
+						<a-col :span='8' class="midItem">
+							<a-row><div class="leftTitle">身高</div><div class="rightValue">{{ getFirstInfo['RYPG-HEIGHT'] ? getFirstInfo['RYPG-HEIGHT'] + 'CM' : '暂无' }}</div></a-row>
+							<a-row><div class="leftTitle">体重</div><div class="rightValue">{{ getFirstInfo['RYPG-WEIGHT'] ? getFirstInfo['RYPG-WEIGHT'] + 'KG' : '暂无' }}</div></a-row>
+							<a-row><div class="leftTitle">BMI</div><div class="rightValue">{{ getFirstInfo['RYPG-BMI'] || '暂无' }}</div></a-row>
+							<a-row><div class="leftTitle">血糖</div><div class="rightValue">{{ getFirstInfo['RYPG-PULSE'] ? getFirstInfo['RYPG-PULSE'] + '次/分' : '暂无' }}</div></a-row>
+						</a-col>
+						<a-col :span='8'>
+							<a-row><div class="leftTitle">选用平车</div><div class="rightValue">{{patient.carNo || '-'}}</div></a-row>
+							<a-row><div class="leftTitle">溶栓药物</div><div class="rightValue">: {{getFirstInfo['JMRS-RSYW'] || '暂无'}}</div></a-row>
+							<a-row><div class="leftTitle">静滴剂量</div><div class="rightValue">:  {{getFirstInfo['JMRS-JDJL'] || '暂无'}}</div></a-row>
+							<a-row><div class="leftTitle">团注剂量</div><div class="rightValue">: {{getFirstInfo['JMRS-TZJL'] || '暂无'}}</div></a-row>						
+						</a-col>
+					</a-card>
+				</a-col>
+				<a-col :span="24">
+					<a-card class="report-card" title="溶栓状态">
+						<div class="report-timeline">
+							<a-steps progress-dot :current="currentIndex" direction="vertical">
+								<template v-for="(item, index) in getNodeList">
+									<a-step
+										:status="processNodeIndex == index ? 'process' : processNodeIndex > index && item.record ? 'finish' : 'wait' ">
+										<div slot="title"
+											style="display: flex;justify-content: space-between;width: 100%">
+											<div>{{item.nodeName}}</div>
+											<div>
+												{{processNodeIndex == index ? '进行中' : processNodeIndex > index && item.record ? '已完成' : ''}}
+											</div>
+										</div>
+										<div slot="description">{{item.record ? item.record.answer[0] : ''}}</div>
+									</a-step>
+								</template>
+							</a-steps>
+						</div>
+					</a-card>
+				</a-col>
+				<a-col :span="24">
+					<a-card class="report-card" title="急诊溶栓记录">
+						<a slot="extra" id="exportFirst" href="JavaScript:;" @click="handleExportRsPdf">导出</a>
+						<div class="report-card-content" style="min-height: 300px;">
+							<div class="record-content" v-html="recordData"></div>
+							<div class="emtpy" v-if="!recordData">
+								<a-empty :image="emptyImage" description="暂无溶栓记录" />
+							</div>
+						</div>
+					</a-card>
+				</a-col>
+				<a-col :span="24">
+					<a-card class="report-card" title="溶栓观察表">
+						<a slot="extra" href="javascript:;" @click="handleExportRsgcbPdf">导出</a>
+						<div class="doc-ct-content">
+							<div>
+								<table border class="report-rsgcb">
+									<!-- <tr>
+										<td>姓名：{{patient.patientName}}</td>
+										<td>性别：{{patient.patientGenderString}}</td>
+										<td>年龄：{{patient.patientAge}}</td>
+										<td>诊断： {{patient.firstAidZlType}}</td>
+										<td>观察者： </td>
+									</tr>
+									<tr>
+										<td colspan="3">发病时间：{{queryItemInfo('XGZL-CCWC-TIME').toString()}}</td>
+										<td colspan="3">用药时间：{{queryItemInfo('RYPG-CBZD').toString()}}</td>
+									</tr> -->
+									<tr>
+										<td colspan="2">溶栓药物：{{queryItemInfo('JMRS-RSYW').toString()}}</td>
+										<td colspan="2">剂量：{{queryItemInfo('JMRS-JDJL').toString()}}</td>
+										<td colspan="2">用法用量： </td>
+									</tr>
+									<tr>
+										<td>时间点</td>
+										<td>血压(BP)</td>
+										<td>心率(HR)</td>
+										<td>血样饱和度(HR)</td>
+										<td>格拉斯评分</td>
+										<td>NIHSS</td>
+									</tr>
+									<tr>
+										<td>用药前</td>
+										<td>{{queryItemInfo('JMRS-Q-SYSTOLIC-PRESSURE').toString()}}</td>
+										<td></td>
+										<td></td>
+										<td></td>
+										<td>{{queryItemInfo('JMRS-Q-NIHSS').toString()}}</td>
+									</tr>
+									<tr>
+										<td>15min</td>
+										<td>{{queryItemInfo('JMRS-15-SYSTOLIC-PRESSURE').toString()}}</td>
+										<td></td>
+										<td></td>
+										<td></td>
+										<td>{{queryItemInfo('JMRS-15-NIHSS').toString()}}</td>
+									</tr>
+									<tr>
+										<td>30min</td>
+										<td>{{queryItemInfo('JMRS-30-SYSTOLIC-PRESSURE').toString()}}</td>
+										<td></td>
+										<td></td>
+										<td></td>
+										<td>{{queryItemInfo('JMRS-30-NIHSS').toString()}}</td>
+									</tr>
+									<tr>
+										<td>45min</td>
+										<td>{{queryItemInfo('JMRS-45-SYSTOLIC-PRESSURE').toString()}}</td>
+										<td></td>
+										<td></td>
+										<td></td>
+										<td>{{queryItemInfo('JMRS-45-NIHSS').toString()}}</td>
+									</tr>
+									<tr>
+										<td>60min</td>
+										<td>{{queryItemInfo('JMRS-60-SYSTOLIC-PRESSURE').toString()}}</td>
+										<td></td>
+										<td></td>
+										<td></td>
+										<td>{{queryItemInfo('JMRS-60-NIHSS').toString()}}</td>
+									</tr>
+									<tr>
+										<td>75min</td>
+										<td>{{queryItemInfo('JMRS-75-SYSTOLIC-PRESSURE').toString()}}</td>
+										<td></td>
+										<td></td>
+										<td></td>
+										<td>{{queryItemInfo('JMRS-75-NIHSS').toString()}}</td>
+									</tr>
+									<tr>
+										<td>90min</td>
+										<td>{{queryItemInfo('JMRS-90-SYSTOLIC-PRESSURE').toString()}}</td>
+										<td></td>
+										<td></td>
+										<td></td>
+										<td>{{queryItemInfo('JMRS-90-NIHSS').toString()}}</td>
+									</tr>
+									<tr>
+										<td>105min</td>
+										<td>{{queryItemInfo('JMRS-105-SYSTOLIC-PRESSURE').toString()}}</td>
+										<td></td>
+										<td></td>
+										<td></td>
+										<td>{{queryItemInfo('JMRS-105-NIHSS').toString()}}</td>
+									</tr>
+									<tr>
+										<td>120min</td>
+										<td>{{queryItemInfo('JMRS-120-SYSTOLIC-PRESSURE').toString()}}</td>
+										<td></td>
+										<td></td>
+										<td></td>
+										<td>{{queryItemInfo('JMRS-120-NIHSS').toString()}}</td>
+									</tr>
+								</table>
+							</div>
+						</div>
+					</a-card>
+				</a-col>
+				<a-col :span="24">
+					<a-card class="report-card" title="DNT时间表">
+						<a slot="extra" href="javascript:;" @click="handleExportDntPdf">导出</a>
+						<div class="doc-ct-content">
+							<div class="record-content">
+								<table border class="report-rsgcb">
+									<!-- <tr>
+										<td colspan="2">姓名：{{patient.patientName}}</td>
+										<td colspan="3">性别：{{patient.patientGenderString}}</td>
+										<td colspan="1">年龄：{{patient.patientAge}}</td>
+										<td colspan="2">血糖(BS)：{{queryItemInfo('RYPG-BLOOD-SUGAR').toString()}}</td>
+										<td colspan="2">血压(BP)：{{queryItemInfo('JMRS-Q-SYSTOLIC-PRESSURE').toString()}}
+										</td>
+									</tr>
+									<tr>
+										<td colspan="3">一线：</td>
+										<td colspan="3">二线：</td>
+										<td colspan="4">NIHSS：{{queryItemInfo('JMRS-Q-NIHSS').toString()}}</td>
+									</tr> -->
+									<tr>
+										<td colspan="2">溶栓流程</td>
+										<td colspan="3">具体时间</td>
+										<td colspan="2">采集方式</td>
+										<td colspan="3">备注</td>
+									</tr>
+									<tr>
+										<td colspan="2">发病时间</td>
+										<td colspan="3">{{queryItemInfo('JBXX-FBSJ').toString()}}</td>
+										<td colspan="2"></td>
+										<td colspan="3"></td>
+									</tr>
+									<tr>
+										<td colspan="2">到院时间</td>
+										<td colspan="3">{{queryItemInfo('JBXX-FBSJ').toString()}}</td>
+										<td colspan="2">质控平车：</td>
+										<td colspan="3"></td>
+									</tr>
+									<tr>
+										<td colspan="2">启动绿道时间</td>
+										<td colspan="3">{{queryItemInfo('RYPG-GR-TIME').toString()}}</td>
+										<td colspan="2">可视化信息竖屏：</td>
+										<td colspan="3"></td>
+									</tr>
+									<tr>
+										<td colspan="2">呼叫时间</td>
+										<td colspan="3">{{queryItemInfo('JBXX-TZCZYS-TIME').toString()}}</td>
+										<td colspan="2"></td>
+										<td colspan="3"></td>
+									</tr>
+									<tr>
+										<td colspan="2">一线到场时间</td>
+										<td colspan="3">{{queryItemInfo('JBXX-CZYSDC-TIME').toString()}}</td>
+										<td colspan="2"></td>
+										<td colspan="3"></td>
+									</tr>
+									<tr>
+										<td colspan="2">采血开始时间</td>
+										<td colspan="3">{{queryItemInfo('RYPG-BLOOD-TIME').toString()}}</td>
+										<td colspan="2">质控平车</td>
+										<td colspan="3"></td>
+									</tr>
+									<tr>
+										<td colspan="2">血样报告时间</td>
+										<td colspan="3">{{queryItemInfo('RYPG-BLOOD-REPORT-TIME').toString()}}</td>
+										<td colspan="2"></td>
+										<td colspan="3"></td>
+									</tr>
+									<tr>
+										<td colspan="2">心电开始时间</td>
+										<td colspan="3">{{queryItemInfo('RYPG-ECG-TIME').toString()}}</td>
+										<td colspan="2"></td>
+										<td colspan="3"></td>
+									</tr>
+									<tr>
+										<td colspan="2">到达CT时间</td>
+										<td colspan="3">{{queryItemInfo('RYPG-CT-DD-TIME').toString()}}</td>
+										<td colspan="2">质控平车</td>
+										<td colspan="3"></td>
+									</tr>
+									<tr>
+										<td colspan="2">CT检查开始时间</td>
+										<td colspan="3">{{queryItemInfo('RYPG-CT-JCKS-TIME').toString()}}</td>
+										<td colspan="2">质控平车</td>
+										<td colspan="3"></td>
+									</tr>
+									<tr>
+										<td colspan="2">CT检查完毕时间</td>
+										<td colspan="3">{{queryItemInfo('RYPG-CT-JCWB-TIME').toString()}}</td>
+										<td colspan="2"></td>
+										<td colspan="3"></td>
+									</tr>
+									<!-- <tr>
+										<td colspan="2">离开CT时间</td>
+										<td colspan="3">{{queryItemInfo('RYPG-CT-LK-TIME').toString()}}</td>
+										<td colspan="2"></td>
+										<td colspan="3"></td>
+									</tr> -->
+									<tr>
+										<td colspan="2">到达核磁时间</td>
+										<td colspan="3">{{queryItemInfo('JMRS-HC-TIME').toString()}}</td>
+										<td colspan="2"></td>
+										<td colspan="3"></td>
+									</tr>
+									<tr>
+										<td colspan="2">二线医生到场时间</td>
+										<td colspan="3">{{queryItemInfo('JBXX-SNYSDC-TIME').toString()}}</td>
+										<td colspan="2"></td>
+										<td colspan="3"></td>
+									</tr>
+									<tr>
+										<td colspan="2">谈话开始时间</td>
+										<td colspan="3">{{queryItemInfo('JMRS-TH-TIME').toString()}}</td>
+										<td colspan="2"></td>
+										<td colspan="3"></td>
+									</tr>
+									<tr>
+										<td colspan="2">签署知情同意书时间</td>
+										<td colspan="3">{{queryItemInfo('JMRS-ZQTY-TIME').toString()}}</td>
+										<td colspan="2"></td>
+										<td colspan="3"></td>
+									</tr>
+									<tr>
+										<td colspan="2">到达溶栓区时间</td>
+										<td colspan="3">{{queryItemInfo('JMRS-RSQ-TIME').toString()}}</td>
+										<td colspan="2"></td>
+										<td colspan="3"></td>
+									</tr>
+									<tr>
+										<td colspan="2">静脉溶栓开始时间</td>
+										<td colspan="3">{{queryItemInfo('JMRS-TIME').toString()}}</td>
+										<td colspan="2"></td>
+										<td colspan="3"></td>
+									</tr>
+									<tr>
+										<td colspan="2">静脉溶栓结束时间</td>
+										<td colspan="3">{{queryItemInfo('JMRS-END-TIME').toString()}}</td>
+										<td colspan="2"></td>
+										<td colspan="3"></td>
+									</tr>
+									<tr>
+										<td colspan="2">进入介入室时间</td>
+										<td colspan="3">{{queryItemInfo('JMRS-DDJRS').toString()}}</td>
+										<td colspan="2"></td>
+										<td colspan="3"></td>
+									</tr>
+									<tr>
+										<td colspan="2">置鞘时间</td>
+										<td colspan="3">{{queryItemInfo('XGZL-CCWC-TIME').toString()}}</td>
+										<td colspan="2"></td>
+										<td colspan="3"></td>
+									</tr>
+									<tr>
+										<td colspan="2">血管再通时间</td>
+										<td colspan="3">{{queryItemInfo('XGZL-SH-SCXGZTSJ').toString()}}</td>
+										<td colspan="2"></td>
+										<td colspan="3"></td>
+									</tr>
+									<tr>
+										<td colspan="2">进入病房时间</td>
+										<td colspan="3">{{queryItemInfo('JMRS-DDBF').toString()}}</td>
+										<td colspan="2"></td>
+										<td colspan="3"></td>
+									</tr>
+								</table>
+							</div>
+						</div>
+					</a-card>
+				</a-col>
+				<a-col :span="24">
+					<a-card class="report-card" title="介入手术记录">
+						<a slot="extra" href="javascript:;" @click="handleExportJrPdf">导出</a>
+						<div class="doc-ct-content" style="min-height: 300px;">
+							<div class="record-content" v-html="operaData"></div>
+							<div class="emtpy" v-if="!operaData">
+								<a-empty :image="emptyImage" description="暂无手术记录" />
+							</div>
+						</div>
+					</a-card>
+				</a-col>
+			</a-row>
+		</div>
+		<div style="background-color: #fff;padding-bottom: 12px;border-top: 1px solid #eee;">
+			<div class="throm-common-button" >
+				<a-button :disabled="writeAble" class="" type="primary" size="large" block
+					@click="handleExportAll">打印</a-button>
+				<!-- <a-button :disabled="writeAble" class="" block type="primary" size="large"
+					@click="onSubmit">导出</a-button> -->
+			</div>
+		</div>
+		
+		<throm-report-dnt ref="dnt"></throm-report-dnt>
+		<throm-report-record ref="record"></throm-report-record>
+		<throm-report-observe ref="observe"></throm-report-observe>
+		<throm-report-opera ref="opera"></throm-report-opera>
+		<a ref="downloadRef" target="_blank" href="javascript:;" style="display: none;"></a>
+	</div>
+</template>
+
+<script>
+	import {
+		mapMutations,
+		mapState
+	} from 'vuex';
+	import {
+		apiUrl
+	} from '@/config/setting.js';
+	import {
+		getNextNode,
+		messageQuery,
+		queryAidRecord,
+		queryLog,
+		operationLog,
+		getCtInfoPath,
+		operationLogEx,
+		exportRsPdf,
+		exportDntPdf,
+		exportRsgcbPdf,
+		exportJrPdf,
+		exportAll,
+	} from 'api';
+	import dayjs from 'dayjs';
+	import duration from 'dayjs/plugin/duration';
+	import ThromReportDnt from './throm-report-dnt.vue';
+	import ThromReportRecord from './throm-report-record.vue';
+	import ThromReportObserve from './throm-report-observe.vue';
+	import ThromReportOpera from './throm-report-opera.vue';
+	import emptyImage from '@/assets/images/slice/empty.png'
+
+	dayjs.extend(duration);
+	export default {
+		name: "throm-report",
+		components: {
+			ThromReportDnt,
+			ThromReportRecord,
+			ThromReportObserve,
+			ThromReportOpera,
+		},
+		data() {
+			return {
+				emptyImage,
+				currentIndex: 1,
+				dataList: [{
+						name: '急诊溶栓记录',
+						type: 'record'
+					},
+					{
+						name: '溶栓观察表',
+						type: 'observe'
+					},
+					{
+						name: 'DNT时间表',
+						type: 'dnt'
+					},
+					{
+						name: '介入手术记录',
+						type: 'opera'
+					},
+				],
+				nodeInfo: {
+					fbsj: '',
+					jfbSeconds: '',
+					dntSeconds: '',
+					ctSeconds: '',
+					nextStepName: '',
+					countDownInSeconds: '',
+					nodeList: [],
+				},
+				dataInfo: {
+					patientAge: '',
+					patientIdCardNo: '',
+					patientGender: '',
+					patientName: '',
+				},
+				codeForm: {
+					'RYPG-HEIGHT': '',
+					'RYPG-WEIGHT': '',
+					'RYPG-BMI': '',
+					'RYPG-PULSE': '',
+					'RYPG-SYSTOLIC-PRESSURE': '',
+					'RYPG-DIASTOLIC-PRESSURE': '',
+					'RYPG-MRS': '',
+					'RYPG-NIHSS': '',
+				},
+				request: 1,
+				processNodeIndex: 0,
+				patient: {},
+				recordData: "",
+				observeData: "",
+				dntData: "",
+				operaData: "",
+			}
+		},
+		props: {
+			reportType: {
+				type: String,
+				default: "",
+			},
+			dataSource: {
+				type: Object,
+				default: () => ({})
+			},
+			firstAidId: {
+				type: String,
+				default: "",
+			}
+		},
+		computed: {
+			...mapState('patient', ['patientData', 'nextNodeData', 'writeAble']),
+			getPatient() {
+				const {
+					firstAidId,
+					patientName,
+					patientGender,
+					patientAge
+				} = this.patient;
+				if (!firstAidId) return;
+				return `${patientName}  ${ patientGender === 0 ? '男' : patientGender === 1 ? '女' : '' }  ${patientAge || ''}`;
+			},
+			getPressure() {
+				const {
+					codeForm
+				} = this;
+				let result;
+				if (
+					codeForm['RYPG-SYSTOLIC-PRESSURE'] &&
+					codeForm['RYPG-DIASTOLIC-PRESSURE']
+				) {
+					result = `${codeForm['RYPG-SYSTOLIC-PRESSURE']}/${codeForm['RYPG-DIASTOLIC-PRESSURE']}mmHg`;
+				} else if (codeForm['RYPG-SYSTOLIC-PRESSURE']) {
+					result = `${codeForm['RYPG-SYSTOLIC-PRESSURE']}mmHg`;
+				} else {
+					result = '暂无';
+				}
+				return result;
+			},
+			getNodeList() {
+				const {
+					sop
+				} = this.nodeInfo;
+				if (!sop) return [];
+				const lastFinishIndex = sop.nodeList.findIndex(a => !!a.record) || 0
+				this.processNodeIndex = lastFinishIndex + 1
+				return sop.nodeList;
+			},
+			getFirstInfo() {
+				const {
+					recordValDict
+				} = this.patient
+				if (!recordValDict) return {}
+				else return {
+					'RYPG-WEIGHT': recordValDict['RYPG-WEIGHT']?.[0].answer[0], // 身高
+					'RYPG-HEIGHT': recordValDict['RYPG-HEIGHT']?.[0].answer[0], // 体重
+					'RYPG-MRS': recordValDict['RYPG-MRS']?.[0].answer[0], // MRS评分
+					'RYPG-NIHSS': recordValDict['RYPG-NIHSS']?.[0].answer[0], // NIHSS评分
+					'RYPG-BMI': recordValDict['RYPG-BMI']?.[0].answer[0], // BMI
+					'RYPG-SYSTOLIC-PRESSURE': recordValDict['RYPG-SYSTOLIC-PRESSURE']?.[0].answer[0], // 收缩压
+					'RYPG-DIASTOLIC-PRESSURE': recordValDict['RYPG-DIASTOLIC-PRESSURE']?.[0].answer[0], // 舒张压
+					'RYPG-BLOOD-SUGAR': recordValDict['RYPG-BLOOD-SUGAR']?.[0].answer[0], //血糖
+					'RYPG-PULSE': recordValDict['RYPG-PULSE']?.[0].answer[0], // 脉搏
+					'JMRS-RSYW': recordValDict['JMRS-RSYW']?.[0].answer[0], // 溶栓药物
+					'JMRS-JDJL': recordValDict['JMRS-JDJL']?.[0].answer[0], // 静滴剂量
+					'JMRS-TZJL': recordValDict['JMRS-TZJL']?.[0].answer[0], // 团注剂量
+				}
+			}
+		},
+		async mounted() {
+			//TODU
+			if (this.reportType == 'modal') {
+				console.log(this.dataSource)
+				// this.patient = this.dataSource
+				this.init(this.dataSource.firstAidId);
+			} else {
+				// if (!this.patientData) return;
+				// this.patient = this.patientData
+				if (this.firstAidId) {
+					this.init(this.firstAidId);
+					await this.getMessageQuery(this.firstAidId);
+				}
+			}
+			// const {
+			// 	firstAidId
+			// } = this.patient;
+			console.log('report firstAidId', this.firstAidId)
+
+		},
+		methods: {
+			...mapMutations('patient', ['setNextNodeData', 'setTimerData']),
+			async getMessageQuery(firstAidId) {
+				// const {
+				// 	firstAidId
+				// } = this.patientData;
+				const res = await messageQuery(firstAidId);
+				const {
+					code,
+					msg
+				} = res;
+				if (code === 200) {
+					this.setTimerData(res.data);
+				}
+			},
+			queryItemInfo(type) {
+				const dict = this.patient?.recordValDict?.[type]
+				if (dict) {
+					return dict[0].answer
+				} else {
+					return '-'
+				}
+			},
+			onSubmit() {
+				// this.$emit('next')
+			},
+			async getData(firstAidId) {
+				const resLog = await queryLog({
+					firstAidId
+				})
+				this.recordData = resLog.data || ''
+
+
+				// const resObserve = await getCtInfoPath({
+				// 	firstAidId
+				// })
+				// this.observeData = resObserve.data || []
+
+				const resOperaLog = await operationLog({
+					firstAidId
+				})
+				this.observeData = resOperaLog.data || ''
+				this.operaData = resOperaLog.data || ''
+
+				// const res = await operationLogEx({
+				// 	firstAidId
+				// })
+			},
+			getHMS(time) {
+				if (!time) return;
+				// ?️ 获取完整分钟数
+				const minutes = Math.floor(Number(time) / 60);
+
+				// ?️ 获得剩余的秒数
+				const seconds = Number(time) % 60;
+				// ✅ 格式化为 MM:SS
+				let result = `${this.padTo2Digits(minutes)}'${this.padTo2Digits(
+					seconds
+				)}''`;
+				console.log('minutes: ', minutes);
+				if (minutes / 60 > 4.5) {
+					result = '>4.5h';
+				}
+				return result;
+			},
+			padTo2Digits(num) {
+				return num.toString().padStart(2, '0');
+			},
+			//溶栓记录
+			toRecord() {
+				this.$router.push({
+					name: 'Record',
+				});
+			},
+			async handleExport() {
+				console.log('this.patient.firstAidId', this.patient.firstAidId)
+				const res = await exportRsPdf({
+					firstAidId: this.patient.firstAidId
+				})
+				if (res.code == 200) {
+					console.log('http://116.204.114.73:20007' + res.data)
+					this.$refs.downloadRef.setAttribute('href', 'http://116.204.114.73:20007' + res.data)
+					this.$refs.downloadRef.click()
+				}
+
+			},
+			checkReport(modalRef) {
+				console.log('modalRef', this.patient)
+				// const {
+				// 	sourceId,
+				// 	patientName,
+				// 	patientAge,
+				// 	patientGender,
+				// 	firstAidId,
+				// } = this.patient;
+				// this.setPatientData({
+				// 	sourceId,
+				// 	patientName,
+				// 	patientAge,
+				// 	patientGender,
+				// 	firstAidId,
+				// });
+				this.$refs[modalRef].open(this.patient)
+			},
+			//回显数据
+			echo(data) {
+				for (let k in data) {
+					if (data[k]) {
+						const {
+							answer
+						} = data[k][0];
+						this.codeForm[k] = answer.toString();
+						if (k === 'RYPG-WEIGHT' || k === 'RYPG-HEIGHT') {
+							this.codeForm['RYPG-BMI'] = this.utils.computeBMI(
+								this.codeForm['RYPG-WEIGHT'],
+								this.codeForm['RYPG-HEIGHT']
+							);
+						}
+					}
+				}
+			},
+			//初始化数据
+			async init(firstAidId) {
+
+				const res = await queryAidRecord(firstAidId)
+				console.log(res)
+				this.patient = res.data
+				// if (this.patientData) {
+				// 	const {
+				// 		recordValDict
+				// 	} = this.patientData;
+				// 	let data = Object.assign({}, this.patientData);
+				// 	this.utils.merge(this.dataInfo, data);
+				// 	if (recordValDict) {
+				// 		this.echo(recordValDict);
+				// 	}
+				// }
+				// const {
+				// 	firstAidId
+				// } = this.patientData;
+				this.getNextNode(firstAidId);
+				this.getData(firstAidId)
+			},
+			async getNextNode(firstAidId) {
+				let res = await getNextNode({
+					firstAidId,
+				});
+				const {
+					data,
+					code,
+					msg
+				} = res;
+				if (code === 200) {
+					console.log('this.nodeInfo', data)
+					this.nodeInfo = data;
+					this.setNextNodeData(data);
+				} else {
+					this.$message.error('缺少急救id信息');
+				}
+			},
+
+			async handleExportRsPdf() {
+				const {
+					firstAidId
+				} = this.patient
+				const res = await exportRsPdf({
+					firstAidId
+				})
+				const {
+					code,
+					data,
+					msg
+				} = res
+				if (code === 200) {
+					this.toDownLoad(data)
+				} else {
+					this.$message.error(msg)
+				}
+			},
+			async handleExportDntPdf() {
+				const {
+					firstAidId
+				} = this.patient
+				const res = await exportDntPdf({
+					firstAidId
+				})
+				const {
+					code,
+					data,
+					msg
+				} = res
+				if (code === 200) {
+					this.toDownLoad(data)
+				} else {
+					this.$message.error(msg)
+				}
+			},
+			async handleExportRsgcbPdf() {
+				const {
+					firstAidId
+				} = this.patient
+				const res = await exportRsgcbPdf({
+					firstAidId
+				})
+				const {
+					code,
+					data,
+					msg
+				} = res
+				if (code === 200) {
+					this.toDownLoad(data)
+				} else {
+					this.$message.error(msg)
+				}
+			},
+			async handleExportJrPdf() {
+				const {
+					firstAidId
+				} = this.patient
+				const res = await exportJrPdf({
+					firstAidId
+				})
+				const {
+					code,
+					data,
+					msg
+				} = res
+				if (code === 200) {
+					this.toDownLoad(data)
+				} else {
+					this.$message.error(msg)
+				}
+			},
+			async handleExportAll() {
+				const {
+					firstAidId
+				} = this.patient
+				const res = await exportAll({
+					firstAidId
+				})
+				const {
+					code,
+					data,
+					msg
+				} = res
+				if (code === 200) {
+					this.toDownLoad(data)
+				} else {
+					this.$message.error(msg)
+				}
+			},
+			toDownLoad(path) {
+				try {
+					// document.getElementById('exportFirst').href = path;
+					// document.getElementById('exportFirst').download = '.xlsx';
+
+					this.$refs.downloadRef.setAttribute('href', 'http://116.204.114.73:20007' + path)
+					this.$refs.downloadRef.setAttribute('download', '.xlsx')
+					this.$refs.downloadRef.click()
+				} catch (e) {
+					//TODO handle the exception
+					console.log(e.message)
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.throm-report {
+		.report-container {
+			height: calc(100vh - 196px);
+			overflow-y: auto;
+			overflow-x: hidden;
+		}
+
+		.report-card {
+			box-sizing: border-box;
+			font-size: 1rem;
+
+			.report-patient-box {
+				.report-patient-info {
+					display: flex;
+
+					.report-patient-avatar {
+						width: 60px;
+						height: 60px;
+						border-radius: 60px;
+						border: 2px solid #eee;
+						overflow: hidden;
+						margin-right: 2rem;
+
+						img {
+							width: 100%;
+							height: 100%;
+						}
+					}
+
+					.report-patient-name {
+						flex: 1;
+						display: flex;
+						flex-direction: column;
+						line-height: 30px;
+						padding: 5px 0;
+
+						.report-pname {
+							font-size: 1.2rem;
+							font-weight: bold;
+						}
+
+						.reort-psan {
+							.reort-psex {
+								margin-right: 1rem;
+							}
+
+							.reort-page {
+								margin-right: 1rem;
+							}
+
+							.reort-pnat {}
+						}
+					}
+				}
+
+				.report-patient-tags {
+					display: flex;
+					margin-top: 1rem;
+
+					.report-patient-tag {
+						border-radius: 6px;
+						background-color: #B3E5FF;
+						color: #007AFF;
+						padding: 6px 12px;
+						margin-right: 10px;
+					}
+				}
+
+				.report-patient-row {
+					margin: .5rem 0;
+
+					.report-patient-rowlabel {
+						color: #666666;
+					}
+
+					.report-patient-rowtext {
+						color: #000000;
+					}
+				}
+			}
+
+			.report-treat-box {
+				.report-treat-row1 {
+					margin: .2rem 0;
+					font-size: 1rem;
+					font-weight: bold;
+
+					.report-treat-rowlabel {
+						color: #000000;
+						margin-right: .5rem;
+					}
+
+					.report-treat-rowtext {
+						color: #007AFF;
+					}
+				}
+
+				.report-treat-row2 {
+					margin: .2rem 0;
+
+					.report-treat-rowlabel {
+						color: #666666;
+					}
+
+					.report-treat-rowtext {
+						color: #000000;
+						margin-right: 12px;
+					}
+				}
+
+			}
+
+			.report-rsgcb {
+				width: 100%;
+
+				td {
+					padding: 12px;
+				}
+			}
+
+
+		}
+	}
+</style>
+<style lang="less">
+	.throm-report {
+		.ant-list-item {
+			padding: 12px 20px;
+		}
+
+		.ant-card-body {
+			padding: 20px;
+		}
+
+		.report-timeline {
+			overflow-y: auto;
+			.ant-steps {
+				height: 100%;
+				padding-bottom: 20px;
+				box-sizing: border-box;
+				display: flex;
+				flex-direction: column;
+			}
+
+			.ant-steps-item-title {
+				padding: 0;
+				width: 100%;
+			}
+
+			.ant-steps-item-finish {
+				.ant-steps-item-title {
+					color: #000000;
+				}
+			}
+
+			.ant-steps-item-process {
+				.ant-steps-item-title {
+					color: #007AFF;
+					// 	// border-bottom: 1px solid #007AFF;
+					// 	border-bottom: 3px solid transparent;
+					// 	/* 设置透明的底部边框 */
+					// 	border-image: linear-gradient(to right, #fff, #007AFF) 1;
+					// 	/* 使用渐变色填充边框 */
+					// 	border-radius: 10px;
+					// 	/* 设置圆角 */
+				}
+			}
+		}
+		
+		.ant-card-bordered {
+				border: none;
+		
+				.ant-card-head {
+					border-bottom: none;
+				}
+			}
+			.baseInfo{
+				line-height:32px;
+				.ant-col-8{
+					padding-left:30px;
+					padding-right:30px;
+				}
+				.leftTitle{
+					float:left;
+					font-size:18px;
+					color:#888888; 
+				}
+				.rightValue{
+					float:right;
+					font-size:18px;
+					color:#222; 
+				}
+		
+				.midItem{
+					border-left:1px solid #eee;
+					border-right:1px solid #eee;
+				}
+			}
+		.report-rsgcb td{
+			font-size:18px;
+			color:#3D3D3D;
+		}
+	}
+	
+</style>
\ No newline at end of file
diff --git a/src/views/thrombolysis/components/throm-report.vue b/src/views/thrombolysis/components/throm-report.vue
index 15928a5..dcc0d92 100644
--- a/src/views/thrombolysis/components/throm-report.vue
+++ b/src/views/thrombolysis/components/throm-report.vue
@@ -87,7 +87,7 @@
 						<div class="doc-ct-content">
 							<div>
 								<table border class="report-rsgcb">
-									<tr>
+									<!-- <tr>
 										<td>姓名：{{patient.patientName}}</td>
 										<td>性别：{{patient.patientGenderString}}</td>
 										<td>年龄：{{patient.patientAge}}</td>
@@ -97,7 +97,7 @@
 									<tr>
 										<td colspan="3">发病时间：{{queryItemInfo('XGZL-CCWC-TIME').toString()}}</td>
 										<td colspan="3">用药时间：{{queryItemInfo('RYPG-CBZD').toString()}}</td>
-									</tr>
+									</tr> -->
 									<tr>
 										<td colspan="2">溶栓药物：{{queryItemInfo('JMRS-RSYW').toString()}}</td>
 										<td colspan="2">剂量：{{queryItemInfo('JMRS-JDJL').toString()}}</td>
@@ -194,7 +194,7 @@
 						<div class="doc-ct-content">
 							<div class="record-content">
 								<table border class="report-rsgcb">
-									<tr>
+									<!-- <tr>
 										<td colspan="2">姓名：{{patient.patientName}}</td>
 										<td colspan="3">性别：{{patient.patientGenderString}}</td>
 										<td colspan="1">年龄：{{patient.patientAge}}</td>
@@ -206,78 +206,54 @@
 										<td colspan="3">一线：</td>
 										<td colspan="3">二线：</td>
 										<td colspan="4">NIHSS：{{queryItemInfo('JMRS-Q-NIHSS').toString()}}</td>
-									</tr>
+									</tr> -->
 									<tr>
 										<td colspan="2">溶栓流程</td>
 										<td colspan="3">具体时间</td>
-										<td colspan="2">采集方式</td>
-										<td colspan="3">备注</td>
+										<td colspan="2">溶栓流程</td>
+										<td colspan="3">具体时间</td>
 									</tr>
 									<tr>
 										<td colspan="2">发病时间</td>
 										<td colspan="3">{{queryItemInfo('JBXX-FBSJ').toString()}}</td>
-										<td colspan="2"></td>
-										<td colspan="3"></td>
+										<td colspan="2">到达CT时间</td>
+										<td colspan="3">{{queryItemInfo('RYPG-CT-DD-TIME').toString()}}</td>
 									</tr>
 									<tr>
 										<td colspan="2">到院时间</td>
 										<td colspan="3">{{queryItemInfo('JBXX-FBSJ').toString()}}</td>
-										<td colspan="2">质控平车：</td>
-										<td colspan="3"></td>
+										<td colspan="2">CT检查开始时间</td>
+										<td colspan="3">{{queryItemInfo('RYPG-CT-JCKS-TIME').toString()}}</td>
 									</tr>
 									<tr>
 										<td colspan="2">启动绿道时间</td>
 										<td colspan="3">{{queryItemInfo('RYPG-GR-TIME').toString()}}</td>
-										<td colspan="2">可视化信息竖屏：</td>
-										<td colspan="3"></td>
+										<td colspan="2">CT检查结束时间：</td>
+										<td colspan="3">{{queryItemInfo('RYPG-CT-JCWB-TIME').toString()}}</td>
 									</tr>
 									<tr>
 										<td colspan="2">呼叫时间</td>
 										<td colspan="3">{{queryItemInfo('JBXX-TZCZYS-TIME').toString()}}</td>
-										<td colspan="2"></td>
-										<td colspan="3"></td>
+										<td colspan="2">到达核磁时间</td>
+										<td colspan="3">{{queryItemInfo('JMRS-HC-TIME').toString()}}</td>
 									</tr>
 									<tr>
 										<td colspan="2">一线到场时间</td>
 										<td colspan="3">{{queryItemInfo('JBXX-CZYSDC-TIME').toString()}}</td>
-										<td colspan="2"></td>
-										<td colspan="3"></td>
+										<td colspan="2">二线医生到场时间</td>
+										<td colspan="3">{{queryItemInfo('JBXX-SNYSDC-TIME').toString()}}</td>
 									</tr>
 									<tr>
 										<td colspan="2">采血开始时间</td>
 										<td colspan="3">{{queryItemInfo('RYPG-BLOOD-TIME').toString()}}</td>
-										<td colspan="2">质控平车</td>
-										<td colspan="3"></td>
+										<td colspan="2">谈话开始时间</td>
+										<td colspan="3">{{queryItemInfo('JMRS-TH-TIME').toString()}}</td>
 									</tr>
 									<tr>
 										<td colspan="2">血样报告时间</td>
 										<td colspan="3">{{queryItemInfo('RYPG-BLOOD-REPORT-TIME').toString()}}</td>
-										<td colspan="2"></td>
-										<td colspan="3"></td>
-									</tr>
-									<tr>
 										<td colspan="2">心电开始时间</td>
 										<td colspan="3">{{queryItemInfo('RYPG-ECG-TIME').toString()}}</td>
-										<td colspan="2"></td>
-										<td colspan="3"></td>
-									</tr>
-									<tr>
-										<td colspan="2">到达CT时间</td>
-										<td colspan="3">{{queryItemInfo('RYPG-CT-DD-TIME').toString()}}</td>
-										<td colspan="2">质控平车</td>
-										<td colspan="3"></td>
-									</tr>
-									<tr>
-										<td colspan="2">CT检查开始时间</td>
-										<td colspan="3">{{queryItemInfo('RYPG-CT-JCKS-TIME').toString()}}</td>
-										<td colspan="2">质控平车</td>
-										<td colspan="3"></td>
-									</tr>
-									<tr>
-										<td colspan="2">CT检查完毕时间</td>
-										<td colspan="3">{{queryItemInfo('RYPG-CT-JCWB-TIME').toString()}}</td>
-										<td colspan="2"></td>
-										<td colspan="3"></td>
 									</tr>
 									<!-- <tr>
 										<td colspan="2">离开CT时间</td>
@@ -285,71 +261,29 @@
 										<td colspan="2"></td>
 										<td colspan="3"></td>
 									</tr> -->
-									<tr>
-										<td colspan="2">到达核磁时间</td>
-										<td colspan="3">{{queryItemInfo('JMRS-HC-TIME').toString()}}</td>
-										<td colspan="2"></td>
-										<td colspan="3"></td>
-									</tr>
-									<tr>
-										<td colspan="2">二线医生到场时间</td>
-										<td colspan="3">{{queryItemInfo('JBXX-SNYSDC-TIME').toString()}}</td>
-										<td colspan="2"></td>
-										<td colspan="3"></td>
-									</tr>
-									<tr>
-										<td colspan="2">谈话开始时间</td>
-										<td colspan="3">{{queryItemInfo('JMRS-TH-TIME').toString()}}</td>
-										<td colspan="2"></td>
-										<td colspan="3"></td>
-									</tr>
 									<tr>
 										<td colspan="2">签署知情同意书时间</td>
 										<td colspan="3">{{queryItemInfo('JMRS-ZQTY-TIME').toString()}}</td>
-										<td colspan="2"></td>
-										<td colspan="3"></td>
-									</tr>
-									<tr>
 										<td colspan="2">到达溶栓区时间</td>
 										<td colspan="3">{{queryItemInfo('JMRS-RSQ-TIME').toString()}}</td>
-										<td colspan="2"></td>
-										<td colspan="3"></td>
 									</tr>
 									<tr>
 										<td colspan="2">静脉溶栓开始时间</td>
 										<td colspan="3">{{queryItemInfo('JMRS-TIME').toString()}}</td>
-										<td colspan="2"></td>
-										<td colspan="3"></td>
-									</tr>
-									<tr>
 										<td colspan="2">静脉溶栓结束时间</td>
 										<td colspan="3">{{queryItemInfo('JMRS-END-TIME').toString()}}</td>
-										<td colspan="2"></td>
-										<td colspan="3"></td>
 									</tr>
 									<tr>
 										<td colspan="2">进入介入室时间</td>
 										<td colspan="3">{{queryItemInfo('JMRS-DDJRS').toString()}}</td>
-										<td colspan="2"></td>
-										<td colspan="3"></td>
-									</tr>
-									<tr>
 										<td colspan="2">置鞘时间</td>
 										<td colspan="3">{{queryItemInfo('XGZL-CCWC-TIME').toString()}}</td>
-										<td colspan="2"></td>
-										<td colspan="3"></td>
 									</tr>
 									<tr>
 										<td colspan="2">血管再通时间</td>
 										<td colspan="3">{{queryItemInfo('XGZL-SH-SCXGZTSJ').toString()}}</td>
-										<td colspan="2"></td>
-										<td colspan="3"></td>
-									</tr>
-									<tr>
 										<td colspan="2">进入病房时间</td>
 										<td colspan="3">{{queryItemInfo('JMRS-DDBF').toString()}}</td>
-										<td colspan="2"></td>
-										<td colspan="3"></td>
 									</tr>
 								</table>
 							</div>
diff --git a/src/views/thrombolysis/components/throm-result-baseInfo.vue b/src/views/thrombolysis/components/throm-result-baseInfo.vue
index 141b4ba..7957b89 100644
--- a/src/views/thrombolysis/components/throm-result-baseInfo.vue
+++ b/src/views/thrombolysis/components/throm-result-baseInfo.vue
@@ -1,19 +1,17 @@
 <template>
-	<div class="BasicInfo">
+	<div class="BasicInfo throm-basic-info">
 		<div class="basic-content">
 			<!-- 患者基本信息 -->
 			<div class='basicr-back'>
 				<a-form class="detail-form" :form="baseForm">
-					
-							<a-form-item label="扫描身份证">
-								<div class="detail-form-control">
+								<div class="idCardItem">
 									<a-upload :disabled="writeAble" class="idcard-upload" accept=".img,.png,.jpg"
 										:before-upload="handleBeforeUpload" :showUploadList="false" name="file"
 										:multiple="false" :customRequest="handleUploadAdd">
-										<a-icon type="scan" class="fz24" />
+										<a-icon type="scan" class="scanicon" /><span>扫描身份证</span>
 									</a-upload>
 								</div>
-							</a-form-item>
+					
 							<a-form-item label="姓名">
 								<div class="detail-form-control">
 									<a-input :disabled="writeAble" v-decorator="['patientName']" 
@@ -419,7 +417,7 @@
 		width:49%;
 		float:left;
 	}
-	.basicr-back .ant-form-item:nth-child(odd) {
+	.basicr-back .ant-form-item:nth-child(even) {
 		border-right: 1px solid #ddd;
    	    border-radius: 0;
 		padding-right:2% !important;
@@ -480,4 +478,33 @@
 		float:left;
 		font-size:18px;
 	}
+	.idCardItem{
+		width: 29.45vw;
+		height: 4.09vw;
+		background: rgba(101, 154, 255, 0.11);
+		border-radius: 0.36vw 0.36vw 0.36vw 0.36vw;
+		border: 1px solid #007AFF;
+		text-align: center;
+		line-height: 4.09vw;
+		span{
+			font-size: 20px;
+			color: #3D3D3D;
+		}
+	}
+	.scanicon{
+		font-size:18px;
+		display: inline-block;
+		position: relative;
+		top: 1px;
+		right: 10px;
+	}
+</style>
+
+
+<style lang="less">
+	.throm-basic-info {
+		.detail-form .ant-form-item .ant-form-item-label{
+			width: 150px !important;
+		}
+	}
 </style>
\ No newline at end of file
diff --git a/src/views/thrombolysis/components/throm-result-firstInfo.vue b/src/views/thrombolysis/components/throm-result-firstInfo.vue
index f03fd0a..e7cbbdf 100644
--- a/src/views/thrombolysis/components/throm-result-firstInfo.vue
+++ b/src/views/thrombolysis/components/throm-result-firstInfo.vue
@@ -2,7 +2,7 @@
 	<div class="Overviewbasicr">
 		<div class="first-content">
 			<!-- 患者急救记录 -->
-			<div class="basicr-back">
+			<div class="basicr-back basicr-back-info">
 				<a-form class="detail-form" :form="firstForm">
 					<a-form-item class="jmrs-form-item" v-for="(k, v) in AID_CODE" :key="v">
 						<div class="jmrs-form-item-con">
@@ -166,7 +166,7 @@
 					<!-- 不良反应 -->
 					<div class="adverse">
 						<a-collapse class="jmrs-form-item-con" :bordered="false" expandIconPosition="right">
-							<a-collapse-panel key="1" header="不良反应">
+							<a-collapse-panel key="1" header="不良反应" >
 								<Adverse source="first" ref="adverse" />
 							</a-collapse-panel>
 						</a-collapse>
@@ -177,7 +177,7 @@
 			<div class="basicr-back">
 				<v-head text="血管内治疗"></v-head>
 				<a-form class="detail-form treatmentItem" :form="firstForm">
-					<a-form-item class="jmrs-form-item" v-for="(k, v) in XGZL_CODE" :key="v"
+					<a-form-item class="jmrs-form-item" :class="{'jmrs-form-item-autoH': k.type == 'checkbox'}" v-for="(k, v) in XGZL_CODE" :key="v"
 						v-if="computeShow(v, codeForm)">
 						<div class="jmrs-form-item-con" :class="k.type">
 							<div class="content-left ant-form-item-label">
@@ -633,10 +633,13 @@
 	.adverse {
 		padding: 15px 0;
 	}
+	.basicr-back-info.basicr-back .ant-form-item{
+		height: 50px;
+	}
 	.basicr-back .ant-form-item{
 		width:48%;
 		float:left;
-		height:60px;
+		// height:60px;
 	}
 	.basicr-back .ant-form-item:nth-child(odd) {
 		border-right: 1px solid #ddd;
@@ -644,13 +647,14 @@
 		padding-right:2% !important;
 		margin-right:2% !important;
 	}
-	.treatmentItem .ant-form-item:nth-child(9),.treatmentItem .ant-form-item:nth-child(10),.treatmentItem .ant-form-item:nth-child(11){
+	.treatmentItem .ant-form-item:nth-child(9),.treatmentItem .ant-form-item:nth-child(10),.treatmentItem .ant-form-item:nth-child(11),.treatmentItem .ant-form-item:nth-child(12){
 		width:100%;
 		float:left;
 		border:none;
 	}
-	.treatmentItem .ant-form-item:nth-child(10),.treatmentItem .ant-form-item:nth-child(11){
-		height:150px !important;
+	.treatmentItem .ant-form-item:nth-child(10),.treatmentItem .ant-form-item:nth-child(11),.treatmentItem .ant-form-item:nth-child(12){
+		// height:150px !important;
+		height: auto !important;
 	}
 	.basicr-back .ant-form-item .ant-form-item-label{
 		// width: 100px !important; 
@@ -659,6 +663,7 @@
 		// width: 100px !important; 
 		flex: none;
 		margin-right: 20px;
+		
 	}
 	.radioGroupItem:nth-of-type(2){
 		position: relative;
@@ -684,7 +689,7 @@
 	}
 
 	>>>.adverse .ant-form-item-label label {
-		font-size: 1.2rem !important;
+		font-size: 18px !important;
 	}
 
 	>>>.adverse .ant-input {
@@ -717,9 +722,9 @@
 	}
 
 	>>>.ant-collapse-header {
-		font-size: 1.2rem;
+		font-size: 18px;
 		padding: 10px 0 !important;
-		font-weight: bold;
+		/* font-weight: bold; */
 		text-align: left;
 	}