Merge branch 'dev/diagbotcloud20190911_disease' into dev/diagbotcloud20190918_vital

knowledgeman-service/src/main/java/com/diagbot/facade/RelationContactFacade.java

@@ -157,7 +157,10 @@ public class RelationContactFacade extends RelationServiceImpl {
 		relationQe.eq("start_id", conceptId);
 		if(relationNodeVO!=null&&relationNodeVO.getSonRelationId()!=null){
 			relationQe.eq("relation_id", relationNodeVO.getSonRelationId());
+		}else{
+			relationQe.eq("relation_id", -999999l);
 		}
+		
 		List<Relation> relationList = list(relationQe);
 		
 		if(ListUtil.isNotEmpty(relationList)){