From 877ba46d07dedd68ff525969039526a9d23e3a93 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Wed, 25 May 2022 11:52:03 +0800
Subject: [PATCH] update

---
 .../controller/ChatGroupController.java            | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 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 1d6e554..0a80f82 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java
@@ -690,10 +690,11 @@ public class ChatGroupController {
      * @param jsonObject 参数集合
      */
     public void getChatRecord(JSONArray rs,JSONObject jsonObject){
+        JSONArray rsrjson=new JSONArray();
         //登录账号
-        String user_name=jsonObject.getJSONObject("user_name").toString();
+        String user_name=jsonObject.get("user_name").toString();
         //1 环信管理员 2 医生 3 患者
-        String type=jsonObject.getJSONObject("type").toString();
+        String type=jsonObject.get("type").toString();
         LymsChatgroup queryChatgroup=new LymsChatgroup();
         switch (type){
             case "1":
@@ -714,7 +715,7 @@ public class ChatGroupController {
             reusltJsonObject.put("stat",lymsChatgroup.getStat());
             //患者信息
             LambdaQueryWrapper<LymsPatient> patientQueryWrapper=new QueryWrapper().lambda();
-            patientQueryWrapper.ge(LymsPatient::getIdno, lymsChatgroup.getFromp());
+            patientQueryWrapper.eq(LymsPatient::getIdno, lymsChatgroup.getFromp());
             LymsPatient patient = lymsPatientService.getOne(patientQueryWrapper);
             if (null==patient) {
                 continue;
@@ -722,7 +723,7 @@ public class ChatGroupController {
             reusltJsonObject.put("pat",patient);
             //聊天记录
             LambdaQueryWrapper<LymsMessage> messageQueryWrapper=new QueryWrapper().lambda();
-            messageQueryWrapper.ge(LymsMessage::getTargetid, lymsChatgroup.getHxgroupid());
+            messageQueryWrapper.eq(LymsMessage::getTargetid, lymsChatgroup.getHxgroupid());
             messageQueryWrapper.orderByDesc(LymsMessage::getSendtime);
             final List<LymsMessage> lymsMessageList = lymsMessageService.list(messageQueryWrapper);
             Map map=new HashMap();
@@ -730,9 +731,9 @@ public class ChatGroupController {
             map.put("type","txt");
             reusltJsonObject.put("bodies",Arrays.asList(map));
             //医生信息
-            map.clear();
-            map.put("dlogin", lymsChatgroup.getTarget());
-            List<AppgetdoctorlistInfo> dLst = appgetdoctorlistInfoService.listByMap(map);
+            LambdaQueryWrapper<AppgetdoctorlistInfo> appgetdoctorlistInfoQueryWrapper=new QueryWrapper().lambda();
+            appgetdoctorlistInfoQueryWrapper.eq(AppgetdoctorlistInfo::getDlogin, lymsChatgroup.getTarget());
+            List<AppgetdoctorlistInfo> dLst = appgetdoctorlistInfoService.list(appgetdoctorlistInfoQueryWrapper);
             if (dLst.size()==0) {
                 continue;
             }
@@ -744,10 +745,13 @@ public class ChatGroupController {
             for (Object r : rs) {
                 JSONObject rjson= (JSONObject) JSON.toJSON(r);
                 if (! rjson.get("to").toString().equals(lymsChatgroup.getHxgroupid())) {
-                    rs.add(reusltJsonObject);
+                    rsrjson.add(reusltJsonObject);
                 }
             }
         }
-
+        //结果集中添加
+        for (Object o : rsrjson) {
+            rs.add(o);
+        }
     }
 }
-- 
1.8.3.1