From a50f641bdf83a92450fc36a277c8c1e07a41c622 Mon Sep 17 00:00:00 2001
From: shiyang <316555390@qq.com>
Date: Fri, 13 May 2022 13:44:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E7=8E=AF=E4=BF=A1=E6=B3=A8?=
 =?UTF-8?q?=E5=86=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../talkonlineweb/controller/DoctorController.java | 26 +++++++++++-----------
 .../controller/PatientController.java              | 14 ++++++------
 .../controller/TkRecordController.java             |  8 +++----
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorController.java
index e457b1c..b6105c2 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorController.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorController.java
@@ -126,15 +126,15 @@ public class DoctorController {
                 baseResponse.setErrorcode(1);
                 return baseResponse;
             }
-//            LymsHdepart hdepart=lymsHdepartService.getById(doctor.getDpid());
-//            if(doctor.getHxid()==null ){
-//                JSONObject json=hxService.addUser(doctor.getDlogin(),Constant.COMMON_PASSWD,doctor.getDname()+","+hdepart.getDname()+","+hdepart.getHname());
-//                JSONArray rArr=json.getJSONArray("entities");
-//                if(rArr.size()>0){
-//                    doctor.setHxid(rArr.getJSONObject(0).getString("uuid"));
-//                }
-////                lymsDoctorService.saveOrUpdate(doctor);
-//            }
+            LymsHdepart hdepart=lymsHdepartService.getById(doctor.getDpid());
+            if(doctor.getHxid()==null ){
+                JSONObject json=hxService.addUser(doctor.getDlogin(),Constant.COMMON_PASSWD,doctor.getDname()+","+hdepart.getDname()+","+hdepart.getHname());
+                JSONArray rArr=json.getJSONArray("entities");
+                if(rArr.size()>0){
+                    doctor.setHxid(rArr.getJSONObject(0).getString("uuid"));
+                }
+//                lymsDoctorService.saveOrUpdate(doctor);
+            }
         }else{
             did=1;
             doctor.setUpdatedTime(new Date());
@@ -166,10 +166,10 @@ public class DoctorController {
     public BaseResponse delDoctor(LymsDoctor doctor){
         BaseResponse baseResponse=new BaseResponse();
         boolean f=lymsDoctorService.removeById(doctor.getDid());
-//        if (f){
-//            JSONObject rs=hxService.delUser(doctor.getDlogin());
-//            log.info(rs);
-//        }
+        if (f){
+            JSONObject rs=hxService.delUser(doctor.getDlogin());
+            log.info(rs);
+        }
         //保存操作记录
         lymsLogsCrud(doctor,null);
         baseResponse.setErrorcode(f==true?0:1);
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java
index 0f67df9..ca02c24 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java
@@ -373,13 +373,13 @@ public class PatientController {
 
             if (StringUtils.isEmpty(patient2.getHxid()) || StringUtils.isEmpty(patient2.getOpenid())) {
 
-//                if (patient2.getHxid() == null) {
-//                    JSONObject json = hxService.addUser(patient2.getIdno(), Constant.COMMON_PASSWD, patient2.getPname());
-//                    JSONArray rArr = json.getJSONArray("entities");
-//                    if (rArr.size() > 0) {
-//                        patient2.setHxid(rArr.getJSONObject(0).getString("uuid"));
-//                    }
-//                }
+                if (patient2.getHxid() == null) {
+                    JSONObject json = hxService.addUser(patient2.getIdno(), Constant.COMMON_PASSWD, patient2.getPname());
+                    JSONArray rArr = json.getJSONArray("entities");
+                    if (rArr.size() > 0) {
+                        patient2.setHxid(rArr.getJSONObject(0).getString("uuid"));
+                    }
+                }
                 if (StringUtils.isEmpty(patient2.getOpenid())) {
                     patient2.setOpenid(WeiXinUtil.getWxOpenId(patient.getCode()));
                 }
diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/TkRecordController.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/TkRecordController.java
index afd8a01..f758264 100644
--- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/TkRecordController.java
+++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/TkRecordController.java
@@ -82,10 +82,10 @@ public class TkRecordController {
             group.setTarget(doctor.getDlogin());
             group.setOwnerk("test");
 
-//            log.info("创建环信组:{} from:{} target:{}", group.getOwnerk(), group.getFromp(), group.getTarget());
-//            JSONObject rJson = hxService.addChatGroups(group.getFromp() + "," + group.getTarget(), group.getOwnerk(), new String[]{group.getFromp(), group.getTarget()});
-//            log.info("rJson:" + rJson);
-//            group.setHxgroupid(rJson.getJSONObject("data").getString("groupid"));
+            log.info("创建环信组:{} from:{} target:{}", group.getOwnerk(), group.getFromp(), group.getTarget());
+            JSONObject rJson = hxService.addChatGroups(group.getFromp() + "," + group.getTarget(), group.getOwnerk(), new String[]{group.getFromp(), group.getTarget()});
+            log.info("rJson:" + rJson);
+            group.setHxgroupid(rJson.getJSONObject("data").getString("groupid"));
             group.setDescription(group.getFromp() + "," + group.getTarget());
 //            group.setGroupname(group.getFromp() + "," + group.getTarget());
 
-- 
1.8.3.1