From 97e6a9b2544bf0f7b93ca8369e2334f94a7fa817 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Sat, 21 May 2022 09:57:53 +0800
Subject: [PATCH] update

---
 .../controller/ChatGroupController.java            | 24 +++++-----------------
 1 file changed, 5 insertions(+), 19 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 49d72f7..1a95ebd 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/ChatGroupController.java
@@ -81,33 +81,20 @@ public class ChatGroupController {
         if (group.getOwnerk() == null) {
             group.setOwnerk("test");
         }
+        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()));
         if (gLst.size() > 0) {
             LymsChatgroup group2 = gLst.get(0);
             group = group2;
             //回访的状态才去执行
-            if (1==group2.getType()) {
+            if (1==gLst.get(0).getType()) {
                 group2.setStat(0);
                 //修改群组状态
                 lymsChatgroupService.updateById(group2);
-                //添加回访记录
-                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()));
-                LymsReturnVisitRecord returnVisitRecord=new LymsReturnVisitRecord();
-                returnVisitRecord.setDlogin(group.getRetDlogin());//前端传的当前登录医生账号
-                returnVisitRecord.setDpid(doctor.getDpid());
-                returnVisitRecord.setIdno(patient.getIdno());
-                returnVisitRecord.setType(1);
-                returnVisitRecord.setPcid(group.getPcid());
-                returnVisitRecord.setHxgroupid(group2.getHxgroupid());
-                lymsReturnVisitRecordService.save(returnVisitRecord);
             }
         } else {
-            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()));
             List<String> adminDlogins=new ArrayList<>();
             adminDlogins.add(group.getFromp());
             List<String> groupnames=new ArrayList<>();
@@ -197,7 +184,6 @@ public class ChatGroupController {
         //不作为条件查询
         Integer type=chatgroup.getType();
         chatgroup.setType(null);
-//        chatgroup = lymsChatgroupService.getOne(Wrappers.query(chatgroup));
         List<LymsChatgroup> gLst = lymsChatgroupService.list(Wrappers.query(chatgroup).orderByDesc("id"));
 
         if (gLst.size()>0){
-- 
1.8.3.1