Merge branch 'dev' of lyr/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/discussion/DoctorDiscussionGroupController.java

@@ -155,9 +155,9 @@ public class DoctorDiscussionGroupController extends BaseController {
                talkGroupService.saveTalkGroup(talkGroup, members);
                if (type == 1) {
                    consultTeamService.transfer(getUID(), talkDoctor, consult);
                }
//                if (type == 1) {
//                    consultTeamService.transfer(getUID(), talkDoctor, consult);
//                }
                JSONObject jsonObject = new JSONObject(talkGroup);
                JSONArray membersJson = new JSONArray();
@@ -301,11 +301,11 @@ public class DoctorDiscussionGroupController extends BaseController {
                        talkMembers.add(doctorTalkMember);
                        if(type == 1 && object.getInt("doctorType") == 2){
                            if (type == 1) {
                                consultTeamService.transfer(getUID(), object.getString("doctor"), consult);
                            }
                        }
//                        if(type == 1 && object.getInt("doctorType") == 2){
//                            if (type == 1) {
//                                consultTeamService.transfer(getUID(), object.getString("doctor"), consult);
//                            }
//                        }
                    }
                }