diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientDetailsDto.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientDetailsDto.java
index f69e716fb..badac96e1 100755
--- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientDetailsDto.java
+++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/PatientDetailsDto.java
@@ -63,6 +63,18 @@ public class PatientDetailsDto {
      */
     private String address;
 
+    /** 地址省 */
+    private String addressProvince;
+
+    /** 地址市 */
+    private String addressCity;
+
+    /** 地址区 */
+    private String addressDistrict;
+
+    /** 地址街道 */
+    private String addressStreet;
+
     /**
      * 工作单位
      */
diff --git a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationPtDetailsAppMapper.xml b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationPtDetailsAppMapper.xml
index ffb3b920c..25db46189 100755
--- a/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationPtDetailsAppMapper.xml
+++ b/openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationPtDetailsAppMapper.xml
@@ -11,6 +11,10 @@
         p.birth_date,
         p.phone,
         p.address,
+        p.address_province,
+        p.address_city,
+        p.address_district,
+        p.address_street,
         p.work_company,
         p.nationality_code,
         p.marital_status_enum,
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/api.js b/openhis-ui-vue3/src/views/doctorstation/components/api.js
index e439096c7..d61560d3d 100755
--- a/openhis-ui-vue3/src/views/doctorstation/components/api.js
+++ b/openhis-ui-vue3/src/views/doctorstation/components/api.js
@@ -1232,3 +1232,14 @@ export function exportInfectiousCards(data) {
     data: data,
   });
 }
+
+/**
+ * 获取患者详情（含地址、职业信息）
+ */
+export function getPatientDetails(encounterId) {
+  return request({
+    url: '/doctor-station/patient-details/patient-details',
+    method: 'get',
+    params: { encounterId },
+  });
+}
diff --git a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue
index b0dbde20b..6a5943cdb 100755
--- a/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue
+++ b/openhis-ui-vue3/src/views/doctorstation/components/diagnosis/infectiousDiseaseReportDialog.vue
@@ -972,7 +972,7 @@
 <script setup>
 import { ref, computed, getCurrentInstance, watch } from 'vue';
 import pcas from 'china-division/dist/pcas-code.json';
-import { saveInfectiousDiseaseReport, getNextCardNo } from '../api';
+import { saveInfectiousDiseaseReport, getNextCardNo, getPatientDetails } from '../api';
 import useUserStore from '@/store/modules/user';
 import { useDict } from '@/utils/dict';
 
@@ -1840,11 +1840,31 @@ async function show(diagnosisData) {
   // 更新selectedDiseases数组
   updateSelectedDiseases();
 
-  // 设置地址选择组件初始值
-  const provName = diagnosisData?.addressProv || '';
-  const cityName = diagnosisData?.addressCity || '';
-  const countyName = diagnosisData?.addressCounty || '';
-  const townName = diagnosisData?.addressTown || '';
+  // 获取患者详细信息（含现住址、职业），自动填充传染病报告卡
+  const encounterId = patientInfo.encounterId;
+  if (encounterId) {
+    try {
+      const res = await getPatientDetails(encounterId);
+      if (res.code === 200 && res.data) {
+        const detail = res.data;
+        // 使用患者档案中的地址信息填充现住址
+        if (detail.addressProvince) form.value.addressProv = detail.addressProvince;
+        if (detail.addressCity) form.value.addressCity = detail.addressCity;
+        if (detail.addressDistrict) form.value.addressCounty = detail.addressDistrict;
+        if (detail.addressStreet) form.value.addressTown = detail.addressStreet;
+        // 使用患者档案中的职业信息填充职业
+        if (detail.prfsEnum_enumText) form.value.occupation = detail.prfsEnum_enumText;
+      }
+    } catch (err) {
+      console.error('获取患者详情失败:', err);
+    }
+  }
+
+  // 设置地址选择组件初始值（优先使用患者档案地址，回退到诊断数据）
+  const provName = form.value.addressProv || diagnosisData?.addressProv || '';
+  const cityName = form.value.addressCity || diagnosisData?.addressCity || '';
+  const countyName = form.value.addressCounty || diagnosisData?.addressCounty || '';
+  const townName = form.value.addressTown || diagnosisData?.addressTown || '';
 
   initAddressByName(provName, cityName, countyName, townName);