From c88f71a6857029da942740ee6cc0d4f681997caa Mon Sep 17 00:00:00 2001
From: shiyang <wtt@qq.com>
Date: Thu, 30 Sep 2021 16:57:39 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8E=AF=E4=BF=A1=E7=BE=A4=E7=BB=84=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=9B=B4=E6=94=B9=E4=B8=BA=E5=A7=93=E5=90=8D=E4=B8=B2?=
 =?UTF-8?q?-=E7=94=A8=E4=BA=8EPC=E7=AB=AF=E9=97=AE=E8=AF=8A=E5=B1=95?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/talkonlineweb/controller/ChatGroupController.java   | 9 ++++++++-
 .../main/java/com/lyms/talkonlineweb/domain/LymsChatgroup.java   | 4 ++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java
index 9359056..bf90d10 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java
@@ -1,6 +1,8 @@
 package com.lyms.talkonlineweb.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.lyms.talkonlineweb.domain.*;
@@ -64,7 +66,12 @@ public class ChatGroupController {
             log.info("rJson:" + rJson);
             group.setHxgroupid(rJson.getJSONObject("data").getString("groupid"));
             group.setDescription(group.getFromp() + "," + group.getTarget());
-            group.setGroupname(group.getFromp() + "," + group.getTarget());
+//            group.setGroupname(group.getFromp() + "," + group.getTarget());
+            //环信群组名称更改为姓名串-用于PC端问诊展示
+            LymsPatient patient= lymsPatientService.getOne(new QueryWrapper<LymsPatient>().lambda().eq(LymsPatient::getIdno, group.getFromp()));
+            LymsDoctor doctor= lymsDoctorService.getOne(new QueryWrapper<LymsDoctor>().lambda().eq(LymsDoctor::getDlogin, group.getTarget()));
+            group.setGroupname(patient.getPname() + "," + doctor.getDdname());
+
             group.setCtime(new Date());
             lymsChatgroupService.saveOrUpdate(group);
         }
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsChatgroup.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsChatgroup.java
index 14988ad..c763d82 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsChatgroup.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsChatgroup.java
@@ -22,13 +22,13 @@ public class LymsChatgroup implements Serializable {
     private Integer id;
 
     /**
-     * 
+     * 环信群组名称
      */
     @TableField(value = "groupname")
     private String groupname;
 
     /**
-     * 
+     * 环信群组描述
      */
     @TableField(value = "description")
     private String description;
-- 
1.8.3.1