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

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

@@ -267,7 +267,7 @@ public class DiagnoseImportFacade {
 	 */
 	public void exportDiagnosticAll(DiagnosticAllExportVO diaAllExportVO, HttpServletResponse response) {
 		QueryWrapper<DiagnoseDetail> diaQuery = new QueryWrapper<>();
-		diaQuery.eq("diagnose_id", diaAllExportVO.getDisId()).eq("is_deleted", IsDeleteEnum.N.getKey());
+		diaQuery.eq("diagnose_id", diaAllExportVO.getDiagnoseId()).eq("is_deleted", IsDeleteEnum.N.getKey());
 		List<DiagnoseDetail> datas = diagnoseDetailService.list(diaQuery);
 
 		GsonUtil.toJson(datas);

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

@@ -13,5 +13,5 @@ import lombok.Setter;
 @Setter
 public class DiagnosticAllExportVO {
 
-	private Long disId;
+	private Long diagnoseId;
 }