Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	openhis-server-new/openhis-application/src/main/java/com/openhis/web/consultation/appservice/impl/ConsultationAppServiceImpl.java

openhis-ui-vue3/src/views/doctorstation/components/consultation.vue

@@ -218,7 +218,7 @@
 
           <div class="section-title">会诊记录</div>
 
-          <el-form-item label="会诊邀请参加医师：">
+          <el-form-item label="会诊确认参加医师：">
             <el-input
               v-model="formData.invitedPhysiciansText"
               type="textarea"
@@ -713,6 +713,25 @@ const handleRowClick = async (row) => {
   if (row) {
     console.log('点击的行数据:', row);
     
+    // 🎯 处理会诊确认参加医师字段（可能是JSON格式）
+    let physiciansText = row.invitedPhysiciansText || '';
+    if (physiciansText) {
+      try {
+        // 尝试解析JSON格式
+        const physicians = JSON.parse(physiciansText);
+        if (Array.isArray(physicians)) {
+          // 格式化为：科室-姓名、科室-姓名
+          physiciansText = physicians
+            .map(p => `${p.deptName || ''}-${p.physicianName || ''}`)
+            .filter(text => text !== '-')
+            .join('、');
+        }
+      } catch (e) {
+        // 如果不是JSON，保持原值
+        console.log('invitedPhysiciansText不是JSON格式，使用原值:', physiciansText);
+      }
+    }
+    
     // 填充表单数据
     Object.assign(formData, {
       consultationId: row.consultationId,
@@ -731,7 +750,7 @@ const handleRowClick = async (row) => {
       createTime: row.consultationRequestDate || row.createTime,  // 申请时间
       
       // 🎯 填充会诊记录字段（如果会诊已完成或已签名）
-      invitedPhysiciansText: row.invitedPhysiciansText || '',
+      invitedPhysiciansText: physiciansText,
       consultationOpinion: row.consultationOpinion || '',
       attendingPhysician: row.attendingPhysician || '',
       representDepartment: row.representDepartment || '',