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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/talk/TalkGroupService.java

@@ -9,11 +9,13 @@ import java.util.*;
import javax.print.Doc;
import javax.transaction.Transactional;
import com.yihu.wlyy.entity.consult.Consult;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
import com.yihu.wlyy.entity.doctor.team.admin.AdminTeam;
import com.yihu.wlyy.entity.doctor.team.admin.AdminTeamMember;
import com.yihu.wlyy.entity.doctor.team.sign.SignPatientLabelInfo;
import com.yihu.wlyy.entity.patient.Patient;
import com.yihu.wlyy.repository.consult.ConsultDao;
import com.yihu.wlyy.repository.doctor.DoctorDao;
import com.yihu.wlyy.repository.patient.PatientDao;
import com.yihu.wlyy.service.app.team.AdminTeamService;
@@ -52,6 +54,8 @@ public class TalkGroupService extends BaseService {
    AdminTeamService teamService;
    @Autowired
    PatientDao patientDao;
    @Autowired
    private ConsultDao consultDao;
    /**
     * 讨论组保存
@@ -1106,5 +1110,10 @@ public class TalkGroupService extends BaseService {
    public List<WlyyTalkGroup> findTalkGroupByConsult(String consult) {
        return discussionGroupDao.findByConsult(consult);
    }
    public Consult findConsultByGroup(String groupCode) {
        WlyyTalkGroup w=discussionGroupDao.findByCode(groupCode);
        return consultDao.findByCode(w.getConsultCode());
    }
}

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

@@ -2,6 +2,7 @@ package com.yihu.wlyy.web.doctor.discussion;
import java.util.*;
import com.yihu.wlyy.entity.consult.Consult;
import com.yihu.wlyy.entity.discussion.WlyyTalkGroup;
import com.yihu.wlyy.entity.discussion.WlyyTalkGroupMember;
import com.yihu.wlyy.entity.doctor.profile.Doctor;
@@ -612,7 +613,23 @@ public class DoctorDiscussionGroupController extends BaseController {
            return error(-1, "查询失败");
        }
    }
    /**
     * 根据讨论组查找咨询code
     *
     * @param groupCode
     * @return
     */
    @RequestMapping(value = "/getConsultByGroupCode", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    public String getConsultByGroupCode(String groupCode) {
        try {
           Consult consult= talkGroupService.findConsultByGroup(groupCode);
            return write(200, "查询成功", "data", new JSONObject(consult));
        } catch (Exception e) {
            return error(-1, "查询失败");
        }
    }
    /**
     * 获取讨论组成员列表
     *

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

@@ -611,7 +611,7 @@ public class ConsultController extends WeixinBaseController {
                log.setContent(content);
                log.setDel("1");
                log.setChatType(type);
                log.setType(2);
                log.setType(1);
                logs.add(log);
            }
            consultTeamService.reply(logs, getUID());