Merge branch 'dev' of huangwenjie/wlyy2.0 into dev

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -1022,10 +1022,14 @@ public class ImService {
		consultDao.save(cons);
		consultTeamDao.save(consultTeam);
		
		WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.findOne(cons.getRelationCode());
		if(wlyyOutpatientDO != null && wlyyOutpatientDO.getId() != null){
			wlyyOutpatientDO.setStatus("2");
		//判断是否是在线复诊
		if(cons.getRelationCode() != null){
			WlyyOutpatientDO wlyyOutpatientDO = outpatientDao.findOne(cons.getRelationCode());
			if(wlyyOutpatientDO != null && wlyyOutpatientDO.getId() != null){
				wlyyOutpatientDO.setStatus("2");
			}
		}
		return 1;
	}