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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/consult/ConsultTeamService.java

@@ -926,7 +926,7 @@ public class ConsultTeamService extends ConsultService {
     * @param consult 三师咨询标识
     * @return
     */
    public void transfer(String from, String to, String consult,String groupCode) {
    public void transfer(String from, String to, String consult) {
        // 检查是否存在
        if (consultTeamDoctorDao.isExist(consult, to) == 0) {
            ConsultTeam ct = consultTeamDao.findByConsult(consult);
@@ -945,20 +945,6 @@ public class ConsultTeamService extends ConsultService {
            cd.setFromName(d.getName());
            cd.setTo(to);
            consultTeamDoctorDao.save(cd);
            //添加讨论组成员
            // 保存医生到讨论组
            Doctor toDoctor = doctorDao.findByCode(to);
            WlyyTalkGroup wlyyTalkGroup=talkGroupService.findTalkGroup(groupCode);
            WlyyTalkGroupMember doctorMember=new WlyyTalkGroupMember();
            doctorMember.setMemberCode(to);
            doctorMember.setMemberName(toDoctor.getName());
            doctorMember.setGroupCode(groupCode);
            doctorMember.setGroupName(wlyyTalkGroup.getName());
            doctorMember.setType(3);
            doctorMember.setStatus(1);
            doctorMember.setCzrq(new Date());
            talkGroupService.saveTalkMember(doctorMember);
        }
    }
@@ -1175,10 +1161,10 @@ public class ConsultTeamService extends ConsultService {
        return consultTeam;
    }
    public void transfers(String uid, String doctor, String consult,String groupCode) {
    public void transfers(String uid, String doctor, String consult) {
        String[] doctors = doctor.split(",");
        for (int i = 0; i < doctors.length; i++) {
            transfer(uid, doctors[i], consult,groupCode);
            transfer(uid, doctors[i], consult);
        }
    }

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/doctor/consult/DoctorConsultController.java

@@ -675,4 +675,27 @@ public class DoctorConsultController extends WeixinBaseController {
            return error(-1, "查询失败");
        }
    }
    /**
     * 三师咨询转接接口
     *
     * @param consult 图咨询标识
     * @param doctor  转接对象标识 健康管理师转全科是 1个    全科转专科是多个  传多个doctor逗号分隔
     * @param type    转接对象类型，1三师团队，2指定医生，3工作组团队
     * @return
     */
    @RequestMapping(value = "transfer")
    @ResponseBody
    public String transfer(
            String consult,
            String doctor,
            @RequestParam(required = false) int type) {
        try {
            consultTeamService.transfers(getUID(), doctor, consult);
            return success("转接成功");
        } catch (Exception e) {
            error(e);
            return error(-1, "转接失败！");
        }
    }
}

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

@@ -44,6 +44,7 @@ public class DoctorDiscussionGroupController extends BaseController {
    @Autowired
    private ConsultTeamService consultTeamService;
    /**
     * 医生创建讨论组
     *
@@ -154,6 +155,10 @@ public class DoctorDiscussionGroupController extends BaseController {
                talkGroupService.saveTalkGroup(talkGroup, members);
                if (type == 1) {
                    consultTeamService.transfer(getUID(), talkDoctor, consult);
                }
                JSONObject jsonObject = new JSONObject(talkGroup);
                JSONArray membersJson = new JSONArray();
@@ -295,6 +300,12 @@ public class DoctorDiscussionGroupController extends BaseController {
                        doctorTalkMember.setCzrq(new Date());
                        talkMembers.add(doctorTalkMember);
                        if(type == 1 && object.getInt("doctorType") == 2){
                            if (type == 1) {
                                consultTeamService.transfer(getUID(), object.getString("doctor"), consult);
                            }
                        }
                    }
                }
@@ -628,16 +639,16 @@ public class DoctorDiscussionGroupController extends BaseController {
     */
    @RequestMapping(value = "/getConsultByGroupCode", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    public String getConsultByGroupCode( @RequestParam(required = false)String groupCode, @RequestParam(required = false)String consultCode) {
    public String getConsultByGroupCode(@RequestParam(required = false) String groupCode, @RequestParam(required = false) String consultCode) {
        try {
            ConsultTeam consult = null;
            if(!org.springframework.util.StringUtils.isEmpty(groupCode)){
                consult=  talkGroupService.findConsultByGroup(groupCode);
            if (!org.springframework.util.StringUtils.isEmpty(groupCode)) {
                consult = talkGroupService.findConsultByGroup(groupCode);
            }
            if(!org.springframework.util.StringUtils.isEmpty(consultCode)){
                consult=  consultTeamService.findByConsultCode(consultCode);
            if (!org.springframework.util.StringUtils.isEmpty(consultCode)) {
                consult = consultTeamService.findByConsultCode(consultCode);
            }
            if(org.springframework.util.StringUtils.isEmpty(consultCode)&&org.springframework.util.StringUtils.isEmpty(groupCode)){
            if (org.springframework.util.StringUtils.isEmpty(consultCode) && org.springframework.util.StringUtils.isEmpty(groupCode)) {
                return error(-1, "查询失败");
            }
            JSONObject json = new JSONObject();
@@ -673,13 +684,13 @@ public class DoctorDiscussionGroupController extends BaseController {
            json.put("startId", consult.getStartMsgId());
            json.put("endId", consult.getEndMsgId());
            List<WlyyTalkGroup> wlyyTalkGroups = talkGroupService.findAllConsultTalkGroup(consult.getConsult());
            if (wlyyTalkGroups != null && wlyyTalkGroups.size() > 0){
            if (wlyyTalkGroups != null && wlyyTalkGroups.size() > 0) {
                for (WlyyTalkGroup wlyyTalkGroup : wlyyTalkGroups) {
                    json.put("group" + wlyyTalkGroup.getType(), wlyyTalkGroup.getCode());
                    json.put("groupName" + wlyyTalkGroup.getType(), wlyyTalkGroup.getName());
                    json.put("groupCreator"+ wlyyTalkGroup.getType(), wlyyTalkGroup.getCreator());
                    json.put("groupCreatorName"+ wlyyTalkGroup.getType(), wlyyTalkGroup.getCreatorName());
                    json.put("groupType"+ wlyyTalkGroup.getType(), wlyyTalkGroup.getType());
                    json.put("groupCreator" + wlyyTalkGroup.getType(), wlyyTalkGroup.getCreator());
                    json.put("groupCreatorName" + wlyyTalkGroup.getType(), wlyyTalkGroup.getCreatorName());
                    json.put("groupType" + wlyyTalkGroup.getType(), wlyyTalkGroup.getType());
                }
            }
            return write(200, "查询成功", "data", json);