Commit 4f014994dd27ed47354304d1696984c61c0a0e62
1 parent
5433d55ab6
Exists in
master
and in
1 other branch
去掉环信注册功能
Showing 3 changed files with 24 additions and 24 deletions
talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/DoctorController.java
View file @
4f01499
| ... | ... | @@ -126,15 +126,15 @@ |
| 126 | 126 | baseResponse.setErrorcode(1); |
| 127 | 127 | return baseResponse; |
| 128 | 128 | } |
| 129 | - LymsHdepart hdepart=lymsHdepartService.getById(doctor.getDpid()); | |
| 130 | - if(doctor.getHxid()==null ){ | |
| 131 | - JSONObject json=hxService.addUser(doctor.getDlogin(),Constant.COMMON_PASSWD,doctor.getDname()+","+hdepart.getDname()+","+hdepart.getHname()); | |
| 132 | - JSONArray rArr=json.getJSONArray("entities"); | |
| 133 | - if(rArr.size()>0){ | |
| 134 | - doctor.setHxid(rArr.getJSONObject(0).getString("uuid")); | |
| 135 | - } | |
| 136 | -// lymsDoctorService.saveOrUpdate(doctor); | |
| 137 | - } | |
| 129 | +// LymsHdepart hdepart=lymsHdepartService.getById(doctor.getDpid()); | |
| 130 | +// if(doctor.getHxid()==null ){ | |
| 131 | +// JSONObject json=hxService.addUser(doctor.getDlogin(),Constant.COMMON_PASSWD,doctor.getDname()+","+hdepart.getDname()+","+hdepart.getHname()); | |
| 132 | +// JSONArray rArr=json.getJSONArray("entities"); | |
| 133 | +// if(rArr.size()>0){ | |
| 134 | +// doctor.setHxid(rArr.getJSONObject(0).getString("uuid")); | |
| 135 | +// } | |
| 136 | +//// lymsDoctorService.saveOrUpdate(doctor); | |
| 137 | +// } | |
| 138 | 138 | }else{ |
| 139 | 139 | did=1; |
| 140 | 140 | doctor.setUpdatedTime(new Date()); |
| ... | ... | @@ -166,10 +166,10 @@ |
| 166 | 166 | public BaseResponse delDoctor(LymsDoctor doctor){ |
| 167 | 167 | BaseResponse baseResponse=new BaseResponse(); |
| 168 | 168 | boolean f=lymsDoctorService.removeById(doctor.getDid()); |
| 169 | - if (f){ | |
| 170 | - JSONObject rs=hxService.delUser(doctor.getDlogin()); | |
| 171 | - log.info(rs); | |
| 172 | - } | |
| 169 | +// if (f){ | |
| 170 | +// JSONObject rs=hxService.delUser(doctor.getDlogin()); | |
| 171 | +// log.info(rs); | |
| 172 | +// } | |
| 173 | 173 | //保存操作记录 |
| 174 | 174 | lymsLogsCrud(doctor,null); |
| 175 | 175 | baseResponse.setErrorcode(f==true?0:1); |
talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/PatientController.java
View file @
4f01499
| ... | ... | @@ -373,13 +373,13 @@ |
| 373 | 373 | |
| 374 | 374 | if (StringUtils.isEmpty(patient2.getHxid()) || StringUtils.isEmpty(patient2.getOpenid())) { |
| 375 | 375 | |
| 376 | - if (patient2.getHxid() == null) { | |
| 377 | - JSONObject json = hxService.addUser(patient2.getIdno(), Constant.COMMON_PASSWD, patient2.getPname()); | |
| 378 | - JSONArray rArr = json.getJSONArray("entities"); | |
| 379 | - if (rArr.size() > 0) { | |
| 380 | - patient2.setHxid(rArr.getJSONObject(0).getString("uuid")); | |
| 381 | - } | |
| 382 | - } | |
| 376 | +// if (patient2.getHxid() == null) { | |
| 377 | +// JSONObject json = hxService.addUser(patient2.getIdno(), Constant.COMMON_PASSWD, patient2.getPname()); | |
| 378 | +// JSONArray rArr = json.getJSONArray("entities"); | |
| 379 | +// if (rArr.size() > 0) { | |
| 380 | +// patient2.setHxid(rArr.getJSONObject(0).getString("uuid")); | |
| 381 | +// } | |
| 382 | +// } | |
| 383 | 383 | if (StringUtils.isEmpty(patient2.getOpenid())) { |
| 384 | 384 | patient2.setOpenid(WeiXinUtil.getWxOpenId(patient.getCode())); |
| 385 | 385 | } |
talkonlineweb/src/main/java/com/lyms/talkonlineweb/controller/TkRecordController.java
View file @
4f01499
| ... | ... | @@ -82,10 +82,10 @@ |
| 82 | 82 | group.setTarget(doctor.getDlogin()); |
| 83 | 83 | group.setOwnerk("test"); |
| 84 | 84 | |
| 85 | - log.info("创建环信组:{} from:{} target:{}", group.getOwnerk(), group.getFromp(), group.getTarget()); | |
| 86 | - JSONObject rJson = hxService.addChatGroups(group.getFromp() + "," + group.getTarget(), group.getOwnerk(), new String[]{group.getFromp(), group.getTarget()}); | |
| 87 | - log.info("rJson:" + rJson); | |
| 88 | - group.setHxgroupid(rJson.getJSONObject("data").getString("groupid")); | |
| 85 | +// log.info("创建环信组:{} from:{} target:{}", group.getOwnerk(), group.getFromp(), group.getTarget()); | |
| 86 | +// JSONObject rJson = hxService.addChatGroups(group.getFromp() + "," + group.getTarget(), group.getOwnerk(), new String[]{group.getFromp(), group.getTarget()}); | |
| 87 | +// log.info("rJson:" + rJson); | |
| 88 | +// group.setHxgroupid(rJson.getJSONObject("data").getString("groupid")); | |
| 89 | 89 | group.setDescription(group.getFromp() + "," + group.getTarget()); |
| 90 | 90 | // group.setGroupname(group.getFromp() + "," + group.getTarget()); |
| 91 | 91 |