|
|
@ -6,6 +6,7 @@ import com.yihu.wlyy.entity.discussion.WlyyTalkGroup;
|
|
|
import com.yihu.wlyy.entity.discussion.WlyyTalkGroupMember;
|
|
|
import com.yihu.wlyy.entity.doctor.profile.Doctor;
|
|
|
import com.yihu.wlyy.entity.patient.Patient;
|
|
|
import com.yihu.wlyy.repository.doctor.DoctorDao;
|
|
|
import com.yihu.wlyy.service.common.account.PatientService;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
@ -377,24 +378,31 @@ public class DoctorDiscussionGroupController extends BaseController {
|
|
|
@ResponseBody
|
|
|
public String addTalkMember(
|
|
|
@RequestParam(required = true) String groupCode,
|
|
|
@RequestParam(required = true) String groupName,
|
|
|
@RequestParam(required = false) String groupName,
|
|
|
@RequestParam(required = true) String doctor,
|
|
|
@RequestParam(required = true) String doctorName, int doctorType) {
|
|
|
@RequestParam(required = false) String doctorName,
|
|
|
@RequestParam(required = false, defaultValue = "0") int doctorType) {
|
|
|
try {
|
|
|
|
|
|
WlyyTalkGroup group = talkGroupService.findTalkGroup(groupCode);
|
|
|
if(group == null){
|
|
|
return error(-1,"讨论组不存在");
|
|
|
}
|
|
|
if (talkGroupService.isMemberExists(groupCode, groupName)) {
|
|
|
return error(-2, "成员已在该讨论组");
|
|
|
}
|
|
|
|
|
|
WlyyTalkGroupMember member = new WlyyTalkGroupMember();
|
|
|
Doctor doc = doctorService.findDoctorByCode(doctor);
|
|
|
if(doc == null){
|
|
|
return error(-1,"添加的医生的信息查询失败");
|
|
|
}
|
|
|
|
|
|
member.setGroupCode(groupCode);
|
|
|
member.setGroupName(groupName);
|
|
|
member.setGroupName(group.getName());
|
|
|
member.setMemberCode(doctor);
|
|
|
member.setMemberName(doctorName);
|
|
|
member.setMemberName(doc.getName());
|
|
|
member.setStatus(1);
|
|
|
member.setCzrq(new Date());
|
|
|
member.setType(doctorType);
|
|
|
member.setType(doc.getLevel());
|
|
|
|
|
|
talkGroupService.saveTalkMember(member);
|
|
|
|
|
|
@ -432,7 +440,9 @@ public class DoctorDiscussionGroupController extends BaseController {
|
|
|
*/
|
|
|
@RequestMapping(value = "/addmembers", method = {RequestMethod.GET, RequestMethod.POST})
|
|
|
@ResponseBody
|
|
|
public String addMembers(String groupCode, String groupName, String members) {
|
|
|
public String addMembers(@RequestParam(required = true)String groupCode,
|
|
|
@RequestParam(required = false)String groupName,
|
|
|
@RequestParam(required = true)String members) {
|
|
|
try {
|
|
|
List<WlyyTalkGroupMember> talkMembers = new ArrayList<>();
|
|
|
JSONArray membersJArray = new JSONArray(members);
|
