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

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

@@ -221,7 +221,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("type", diaExportVO.getType()).eq("is_deleted", IsDeleteEnum.N.getKey()).orderByDesc("gmt_modified");
 		List<DiagnoseQuestion> datas = diagnoseQuestionService.list(diaQuery);
 
 		GsonUtil.toJson(datas);

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

@@ -26,7 +26,7 @@ public class DiagnoseQuestionFacade  {
 		
 		QueryWrapper<DiagnoseQuestion> diaQuery = new QueryWrapper<>();
 		diaQuery.like("type",diagnoseQuestionPageVO.getType());
-		diaQuery.like("dis_name",diagnoseQuestionPageVO.getDisName()).like("question_name",diagnoseQuestionPageVO.getQuestionCode()).eq("is_deleted",IsDeleteEnum.N.getKey());
+		diaQuery.like("dis_name",diagnoseQuestionPageVO.getDisName()).like("question_name",diagnoseQuestionPageVO.getQuestionCode()).eq("is_deleted",IsDeleteEnum.N.getKey()).orderByDesc("gmt_modified");
 				
 		IPage<DiagnoseQuestionPageDTO> datas = diagnoseQuestionService.page(diagnoseQuestionPageVO, diaQuery);