@@ -1060,7 +1055,7 @@ const handleSync = async () => {
return null
}),
// 一般检查报告请求
- PatientApi.GetApiYbjcInfo(medicalSn, '15262719621023461x')//测试一般检查
+ PatientApi.GetApiYbjcInfo(medicalSn, selectedPatient.value?.cardId)//测试一般检查
.catch(error => {
console.warn('获取一般检查报告失败:', error)
return null
@@ -1865,7 +1860,7 @@ border-left-color: #409EFF;
.basic-info {
display: flex;
gap: 20px;
-padding: 20px;
+padding: 10px;
background: #F8F9FA;
border-radius: 4px;
}
@@ -1979,10 +1974,10 @@ flex: 1;
}
.result-table {
-margin: 20px 0;
+margin: 2px 0;
border: 1px solid #ebeef5;
border-radius: 4px;
-height: 520px; /* 固定高度,与Charge.vue保持一致 */
+height: 366px; /* 固定高度,与Charge.vue保持一致 */
display: flex;
flex-direction: column;
background: #fff;
@@ -2507,6 +2502,7 @@ cursor: not-allowed;
flex-direction: column;
height: 100%;
overflow: hidden;
+ padding: 3px;
}
.tabs-container {
diff --git a/src/views/summary/reprot-print/report-print.vue b/src/views/summary/reprot-print/report-print.vue
index ef855e3..52545b6 100644
--- a/src/views/summary/reprot-print/report-print.vue
+++ b/src/views/summary/reprot-print/report-print.vue
@@ -156,6 +156,11 @@ const handleQuery = () => {
queryParams.pageNo = 1
getList()
}
+<<<<<<< HEAD
+=======
+/** 添加/修改操作 */
+const formRef = ref()
+>>>>>>> bf92e612362b10f9fc040f7c99a393b750708a39
/** 初始化 **/
onMounted(() => {