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

patient-co-wlyy/src/main/java/com/yihu/wlyy/repository/discussion/DiscussionGroupDao.java

@@ -28,7 +28,7 @@ public interface DiscussionGroupDao extends PagingAndSortingRepository<WlyyTalkG
	 * @param consultCode
	 * @return
	 */
	List<WlyyTalkGroup> findByCodeAndType(String consultCode,Integer type);
	List<WlyyTalkGroup> findByConsultCodeAndType(String consultCode,Integer type);
	
	/**
	 * 获取医生对应病人讨论组

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

@@ -186,7 +186,7 @@ public class TalkGroupService extends BaseService {
     */
    public JSONObject getConsultGroup(String consult) {
        JSONObject json = new JSONObject();
        List<WlyyTalkGroup> groups = discussionGroupDao.findByCodeAndType(consult, 2);
        List<WlyyTalkGroup> groups = discussionGroupDao.findByConsultCodeAndType(consult, 2);
        if (groups != null && groups.size() > 0) {
            json = new JSONObject(groups.get(0));
@@ -352,7 +352,7 @@ public class TalkGroupService extends BaseService {
     * @throws Exception
     */
    public JSONObject findConsultTalkGroup(String consult) throws Exception {
        List<WlyyTalkGroup> talkGroup = discussionGroupDao.findByCodeAndType(consult, 1);
        List<WlyyTalkGroup> talkGroup = discussionGroupDao.findByConsultCodeAndType(consult, 1);
        if (talkGroup != null && talkGroup.size() > 0) {
            JSONObject result = new JSONObject(talkGroup.get(0));