From daa7a00daaa292ed2c8cb0ab69d73c4819d3abed Mon Sep 17 00:00:00 2001
From: wucongxing8150 <815046773@qq.com>
Date: Tue, 12 Aug 2025 18:08:28 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E8=AE=BA=E9=97=AE=E9=A2=983333?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../case-clinical-doctor-form.vue             | 43 +++++++++++++++++--
 1 file changed, 39 insertions(+), 4 deletions(-)

diff --git a/src/views/business/case-clinical-doctor/case-clinical-doctor-form.vue b/src/views/business/case-clinical-doctor/case-clinical-doctor-form.vue
index 92438aa..43d750e 100644
--- a/src/views/business/case-clinical-doctor/case-clinical-doctor-form.vue
+++ b/src/views/business/case-clinical-doctor/case-clinical-doctor-form.vue
@@ -56,7 +56,9 @@
                   </template>
                   <template #description>
                     <div class="doctor-details">
-                      <span v-if="item.province">省份：{{ item.province }}</span>
+                      <span v-if="item.province || item.city || item.county">
+                        {{ [item.province, item.city, item.county].filter(Boolean).join(' ') }}
+                      </span>
                       <span v-if="item.hospitalName" style="margin-left: 16px;">医院：{{ item.hospitalName }}</span>
                     </div>
                   </template>
@@ -172,6 +174,9 @@ const formDefault = {
   hospitalName: undefined,
   status: 1,
   avatar: undefined,
+  province: undefined,
+  city: undefined,
+  county: undefined,
 };
 
 // 表单数据
@@ -205,14 +210,26 @@ async function show(rowData) {
       
       // 如果有医院信息，添加到选项中
       if (result.data.hospitalId && result.data.hospitalName) {
+        // 构建省市区信息
+        const locationParts = [result.data.province, result.data.city, result.data.county].filter(Boolean);
+        const locationText = locationParts.length > 0 ? `（${locationParts.join(' ')}）` : '';
+        
         hospitalOptions.value = [{
-          label: result.data.hospitalName,
+          label: `${result.data.hospitalName}${locationText}`,
           value: result.data.hospitalId,
           hospitalId: result.data.hospitalId,
           hospitalName: result.data.hospitalName,
           hospitalUuid: result.data.hospitalUuid,
+          province: result.data.province,
+          city: result.data.city,
+          county: result.data.county,
         }];
       }
+      
+      // 确保省市区信息被正确设置
+      form.province = result.data.province;
+      form.city = result.data.city;
+      form.county = result.data.county;
     } catch (e) {
       smartSentry.captureError(e);
       Object.assign(form, rowData);
@@ -278,6 +295,9 @@ function selectDoctor(doctor) {
   form.doctorName = doctor.doctorName;
   form.doctorIden = doctor.uuid;
   form.hospitalUuid = doctor.hospitalUuid;
+  form.province = doctor.province;
+  form.city = doctor.city;
+  form.county = doctor.county;
   
   // 如果医生有医院信息，自动设置
   if (doctor.hospitalName) {
@@ -286,12 +306,19 @@ function selectDoctor(doctor) {
     
     // 添加到医院选项中
     if (doctor.hospitalId) {
+      // 构建省市区信息
+      const locationParts = [doctor.province, doctor.city, doctor.county].filter(Boolean);
+      const locationText = locationParts.length > 0 ? `（${locationParts.join(' ')}）` : '';
+      
       hospitalOptions.value = [{
-        label: doctor.hospitalName,
+        label: `${doctor.hospitalName}${locationText}`,
         value: doctor.hospitalId,
         hospitalId: doctor.hospitalId,
         hospitalName: doctor.hospitalName,
         hospitalUuid: doctor.hospitalUuid,
+        province: doctor.province,
+        city: doctor.city,
+        county: doctor.county,
       }];
     }
     
@@ -321,12 +348,20 @@ async function loadHospitalOptions() {
         const hospitalId = item.hospitalId || item.id;
         const hospitalName = item.hospitalName || item.name || item.hospital_name;
         const hospitalUuid = item.hospitalUuid || item.uuid;
+        
+        // 构建省市区信息
+        const locationParts = [item.province, item.city, item.county].filter(Boolean);
+        const locationText = locationParts.length > 0 ? `（${locationParts.join(' ')}）` : '';
+        
         return {
-          label: hospitalName,
+          label: `${hospitalName}${locationText}`,
           value: hospitalId,
           hospitalId,
           hospitalName,
           hospitalUuid,
+          province: item.province,
+          city: item.city,
+          county: item.county,
         };
       });
       hospitalOptions.value = formattedData;