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

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

@@ -1210,4 +1210,7 @@ public class ConsultTeamService extends ConsultService {
        consultTeamDao.save(consult);
    }
    public ConsultTeam findByConsultCode(String consultCode) {
        return consultTeamDao.findByConsult(consultCode);
    }
}

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

@@ -9,6 +9,8 @@ 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.app.consult.ConsultService;
import com.yihu.wlyy.service.app.consult.ConsultTeamService;
import com.yihu.wlyy.service.common.account.PatientService;
import com.yihu.wlyy.util.DateUtil;
import io.swagger.annotations.Api;
@@ -39,6 +41,8 @@ public class DoctorDiscussionGroupController extends BaseController {
    private TalkGroupService talkGroupService;
    @Autowired
    private PatientService patientService;
    @Autowired
    private ConsultTeamService consultTeamService;
    /**
     * 医生创建讨论组
@@ -624,9 +628,18 @@ public class DoctorDiscussionGroupController extends BaseController {
     */
    @RequestMapping(value = "/getConsultByGroupCode", method = {RequestMethod.GET, RequestMethod.POST})
    @ResponseBody
    public String getConsultByGroupCode(String groupCode) {
    public String getConsultByGroupCode( @RequestParam(required = false)String groupCode, @RequestParam(required = false)String consultCode) {
        try {
            ConsultTeam consult = talkGroupService.findConsultByGroup(groupCode);
            ConsultTeam consult = null;
            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)&&org.springframework.util.StringUtils.isEmpty(groupCode)){
                return error(-1, "查询失败");
            }
            JSONObject json = new JSONObject();
            json.put("id", consult.getId());
            // 设置咨询标识