12

ruoyi-ui/src/views/diseaseTreatment/onlineConsult/ai/index.vue

@@ -442,20 +442,26 @@ export default {
       })
     },
     renderChatMarkdown,
-    /** 若依问诊会话主键：listAiConsultSessions 使用 realSessionId */
+    /** 若依问诊主键：listAiConsultMessages / sendAiConsultMessage 路径参数（id，非 realSessionId） */
     resolveSessionId(session) {
       if (!session) {
         return null
       }
-      if (session.realSessionId != null && session.realSessionId !== "") {
-        return String(session.realSessionId)
+      if (typeof session === "string" || typeof session === "number") {
+        return String(session)
       }
       if (session.id != null && session.id !== "") {
         return String(session.id)
       }
+      if (session.sessionId != null && session.sessionId !== "") {
+        return String(session.sessionId)
+      }
+      if (session.realSessionId != null && session.realSessionId !== "") {
+        return String(session.realSessionId)
+      }
       return null
     },
-    /** 列表 rows[].sessionId 为大模型网关会话 id */
+    /** 列表行中的大模型网关 sessionId（real_session_id / llmSessionId） */
     resolveLlmSessionIdFromRow(session) {
       if (!session) {
         return null
@@ -464,6 +470,12 @@ export default {
         return String(session.llmSessionId)
       }
       const consultId = this.resolveSessionId(session)
+      if (session.realSessionId != null && session.realSessionId !== "") {
+        const rid = String(session.realSessionId)
+        if (!consultId || rid !== consultId) {
+          return rid
+        }
+      }
       if (session.sessionId != null && session.sessionId !== "") {
         const sid = String(session.sessionId)
         if (!consultId || sid !== consultId) {
@@ -609,15 +621,14 @@ export default {
           if (data.disclaimer) {
             this.disclaimer = data.disclaimer
           }
-          const id = data.realSessionId != null ? data.realSessionId : data.id
-          if (!id) {
+          if (data.id == null || data.id === "") {
             return
           }
-          const consultId = String(id)
+          const consultId = String(data.id)
           this.clearLlmSessionId(consultId)
           const row = {
             id: consultId,
-            realSessionId: consultId,
+            realSessionId: data.realSessionId || null,
             llmSessionId: null,
             sessionTitle: data.sessionTitle || DEFAULT_SESSION_TITLE,
             lastMessagePreview: data.lastMessagePreview || "",
@@ -788,11 +799,11 @@ export default {
         }
       })
       return (rows || []).map((row) => {
-        const id = this.resolveSessionId(row)
-        if (!id) {
+        const consultId =
+          row.id != null && row.id !== "" ? String(row.id) : this.resolveSessionId(row)
+        if (!consultId) {
           return row
         }
-        const consultId = String(id)
         const llm =
           this.resolveLlmSessionIdFromRow(row) ||
           prevMap[consultId] ||
@@ -800,8 +811,7 @@ export default {
           null
         const next = {
           ...row,
-          id: consultId,
-          realSessionId: row.realSessionId != null ? row.realSessionId : consultId
+          id: consultId
         }
         if (llm) {
           next.llmSessionId = String(llm)