From f529e418bcef9c95f8a975e9f225ce7b9e6e5997 Mon Sep 17 00:00:00 2001
From: changpengfei <changpengfei@lymsh.com>
Date: Tue, 12 Oct 2021 14:01:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BC=9A=E8=AF=9D=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ChatGroupController.java            | 39 ++++++++++++++--------
 1 file changed, 25 insertions(+), 14 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 96ff844..31b8bdb 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java
@@ -206,21 +206,9 @@ public class ChatGroupController {
                     if(row.getJSONObject("meta").size()>0){
                         JSONObject payload=row.getJSONObject("meta").getJSONObject("payload");
                         System.out.println(payload);
-                        String from =payload.getString("from");
-                        Map<String,Object> param=new HashMap<>();
-                        param.put("idno",from);
-                        List<LymsPatient> pLst=lymsPatientService.listByMap(param);
-                        if(pLst.size()>0){
-                            payload.put("pat",pLst.get(0));
-                        }
-                        param.clear();
-                        param.put("dlogin",from);
-                        List<LymsDoctor> dLst=lymsDoctorService.listByMap(param);
-                        if(dLst.size()>0){
-                            payload.put("doc",dLst.get(0));
-                        }
+
                         payload.put("unread_num",row.get("unread_num"));
-                        rs.add(payload);
+
                         String to=payload.getString("to");
                         LymsTkrecord tkrecord=new LymsTkrecord();
                         tkrecord.setHxgroupid(to);
@@ -229,6 +217,29 @@ public class ChatGroupController {
                         if(rLst.size()>0){
                             payload.put("stat",rLst.get(0).getStat());
                         }
+
+                        LymsChatgroup chatgroup=new LymsChatgroup();
+                        chatgroup.setHxgroupid(to);
+                        List<LymsChatgroup> cLst=lymsChatgroupService.list(Wrappers.query(chatgroup));
+
+                        if(cLst.size()>0){
+                            chatgroup=cLst.get(0);
+                            Map<String,Object> param=new HashMap<>();
+                            param.put("idno",chatgroup.getFromp());
+                            List<LymsPatient> pLst=lymsPatientService.listByMap(param);
+                            if(pLst.size()>0){
+                                payload.put("pat",pLst.get(0));
+                            }
+                            param.clear();
+                            param.put("dlogin",chatgroup.getTarget());
+                            List<LymsDoctor> dLst=lymsDoctorService.listByMap(param);
+                            if(dLst.size()>0){
+                                payload.put("doc",dLst.get(0));
+                            }
+                        }
+
+                        payload.put("timestamp",row.getJSONObject("meta").get("timestamp"));
+                        rs.add(payload);
                     }
 
                 }
-- 
1.8.3.1