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

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

@@ -220,7 +220,7 @@ public class DiagnoseImportFacade {
 	public void exportDiagnosticBasis(DiagnosticBasisExportVO diaExportVO, HttpServletResponse response) {
 		QueryWrapper<DiagnoseQuestion> diaQuery = new QueryWrapper<>();
 		diaQuery.like("dis_name", diaExportVO.getDisName()).like("question_name", diaExportVO.getQuestion())
-				.like("type", diaExportVO.getType()).eq("is_deleted", IsDeleteEnum.N.getKey());
+				.like("question_type", diaExportVO.getQuestionType()).eq("is_deleted", IsDeleteEnum.N.getKey());
 		List<DiagnoseQuestion> datas = diagnoseQuestionService.list(diaQuery);
 
 		GsonUtil.toJson(datas);

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

@@ -25,8 +25,8 @@ public class DiagnoseQuestionFacade  {
 	public IPage<DiagnoseQuestionPageDTO> queryQuestionPage(DiagnoseQuestionPageVO diagnoseQuestionPageVO) {
 		
 		QueryWrapper<DiagnoseQuestion> diaQuery = new QueryWrapper<>();
-		if(diagnoseQuestionPageVO.getType() != null && diagnoseQuestionPageVO.getType() != 0 ){
-			diaQuery.like("type",diagnoseQuestionPageVO.getType());
+		if(diagnoseQuestionPageVO.getQuestionType() != null && diagnoseQuestionPageVO.getQuestionType() != 0 ){
+			diaQuery.eq("question_type",diagnoseQuestionPageVO.getQuestionType());
 		}
 		diaQuery.like("dis_name",diagnoseQuestionPageVO.getDisName()).like("question_name",diagnoseQuestionPageVO.getQuestionCode()).eq("is_deleted",IsDeleteEnum.N.getKey());
 				

knowledgeman-service/src/main/java/com/diagbot/vo/DiagnoseQuestionPageVO.java

@@ -29,7 +29,7 @@ public class DiagnoseQuestionPageVO extends Page implements Serializable {
     /**
      * 类型
      */
-    private Integer type;
+    private Integer questionType;
 
     /**
      * 问题词

knowledgeman-service/src/main/java/com/diagbot/vo/DiagnosticBasisExportVO.java

@@ -14,6 +14,6 @@ import lombok.Setter;
 public class DiagnosticBasisExportVO {
 	private String disName;
 	private String question;
-	private String type;
+	private String questionType;
 
 }