From 2010e2a563826badfb16eb8d4d70049ff2a3f8a9 Mon Sep 17 00:00:00 2001
From: changpengfei <changpengfei@lymsh.com>
Date: Sat, 25 Sep 2021 16:31:21 +0800
Subject: [PATCH] update

---
 .../controller/ChatGroupController.java            |  2 +-
 .../talkonlineweb/controller/CommonController.java | 22 ++++++++++++++++++++++
 .../lyms/talkonlineweb/domain/LymsTkrecord.java    |  5 +++++
 3 files changed, 28 insertions(+), 1 deletion(-)

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 4c13a28..9359056 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java
@@ -51,7 +51,7 @@ public class ChatGroupController {
     @PostMapping("saveChatGroup")
     public BaseResponse saveChatGroup(@RequestBody LymsChatgroup group) {
         BaseResponse baseResponse = new BaseResponse();
-        List<LymsChatgroup> gLst = lymsChatgroupService.list(Wrappers.query(group));
+        List<LymsChatgroup> gLst = lymsChatgroupService.list(Wrappers.query(group).orderByDesc("id"));
         if (group.getOwnerk() == null) {
             group.setOwnerk("test");
         }
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/CommonController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/CommonController.java
index 738d6ef..4a76d15 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/CommonController.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/CommonController.java
@@ -2,8 +2,14 @@ package com.lyms.talkonlineweb.controller;
 
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fasterxml.jackson.databind.ser.Serializers;
+import com.lyms.talkonlineweb.domain.LymsChatgroup;
+import com.lyms.talkonlineweb.domain.LymsDoctor;
+import com.lyms.talkonlineweb.domain.LymsPatient;
 import com.lyms.talkonlineweb.domain.LymsTkrecord;
 import com.lyms.talkonlineweb.result.BaseResponse;
+import com.lyms.talkonlineweb.service.LymsChatgroupService;
+import com.lyms.talkonlineweb.service.LymsDoctorService;
+import com.lyms.talkonlineweb.service.LymsPatientService;
 import com.lyms.talkonlineweb.service.LymsTkrecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -19,6 +25,12 @@ import java.util.List;
 public class CommonController {
     @Autowired
     private LymsTkrecordService lymsTkrecordService;
+    @Autowired
+    private LymsChatgroupService lymsChatgroupService;
+    @Autowired
+    private LymsDoctorService lymsDoctorService;
+    @Autowired
+    private LymsPatientService lymsPatientService;
 
     @GetMapping("endTalk")
     public BaseResponse endTalk(LymsTkrecord tkrecord){
@@ -27,6 +39,16 @@ public class CommonController {
         baseResponse.setErrorcode(1);
         int updateby=tkrecord.getUpdatedby();
         tkrecord.setUpdatedby(null);
+        LymsChatgroup group=new LymsChatgroup();
+        LymsPatient patient=lymsPatientService.getById(tkrecord.getPid());
+        LymsDoctor doctor=lymsDoctorService.getById(tkrecord.getDid());
+        group.setFromp(patient.getIdno());
+        group.setTarget(doctor.getDlogin());
+        List<LymsChatgroup> gLst = lymsChatgroupService.list(Wrappers.query(group).orderByDesc("id"));
+
+        if(gLst.size()>0){
+            tkrecord.setHxgroupid(gLst.get(0).getHxgroupid());
+        }
 
         List<LymsTkrecord> tLst=lymsTkrecordService.list(Wrappers.query(tkrecord).orderByDesc("createdtime"));
         if (tLst.size()>0){
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsTkrecord.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsTkrecord.java
index 1eba847..e207daa 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsTkrecord.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/domain/LymsTkrecord.java
@@ -84,4 +84,9 @@ public class LymsTkrecord implements Serializable {
     @TableField(value = "updatedtime",fill = FieldFill.UPDATE)
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updatedtime;
+    /**
+     * 环信群组ID
+     */
+    @TableField(value="hxgroupid")
+    private String hxgroupid;
 }
\ No newline at end of file
-- 
1.8.3.1