Merge remote-tracking branch 'origin/dev/diagbotcloud20190808_diagnose' into dev/diagbotcloud20190808_diagnose

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

@@ -26,11 +26,10 @@ public class DiagnoseQuestionFacade  {
 	public IPage<DiagnoseQuestionPageDTO> queryQuestionPage(DiagnoseQuestionPageVO diagnoseQuestionPageVO) {
 		
 		QueryWrapper<DiagnoseQuestion> diaQuery = new QueryWrapper<>();
-		if(diagnoseQuestionPageVO.getType() != null ||diagnoseQuestionPageVO.getType() != 0 ){
-			diaQuery.like("dis_name",diagnoseQuestionPageVO.getDisName()).like("question_name",diagnoseQuestionPageVO.getQuestionCode()).like("type",diagnoseQuestionPageVO.getType()).eq("is_deleted",IsDeleteEnum.N.getKey());
-		}else{
-			diaQuery.like("dis_name",diagnoseQuestionPageVO.getDisName()).like("question_name",diagnoseQuestionPageVO.getQuestionCode()).eq("is_deleted",IsDeleteEnum.N.getKey());
+		if(diagnoseQuestionPageVO.getType() != null && diagnoseQuestionPageVO.getType() != 0 ){
+			diaQuery.like("type",diagnoseQuestionPageVO.getType());
 		}
+		diaQuery.like("dis_name",diagnoseQuestionPageVO.getDisName()).like("question_name",diagnoseQuestionPageVO.getQuestionCode()).eq("is_deleted",IsDeleteEnum.N.getKey());
 				
 		IPage<DiagnoseQuestionPageDTO> datas = diagnoseQuestionService.page(diagnoseQuestionPageVO, diaQuery);