Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r33355 -r33356
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33355)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33356)
@@ -23219,7 +23219,7 @@
 		.append(dateQueryAdapter.dateAdapter(endDate+" 23:59:59"))
 		.append(") and fd.formName='")
 		.append(formName)
-		.append("' and fdi.isReportDisplay='是' order by fd.version desc,fdi.orderNumber,fdio.orderNumber asc");
+		.append("' and fdi.isReportDisplay='是' order by fdi.orderNumber,fdio.orderNumber asc");
 		ResultSet rs = null;
 		Map<String, List<String>> columnNameMap = new LinkedHashMap<String, List<String>>();
 		Map<String, Integer> columnWidthMap = new LinkedHashMap<String, Integer>();
@@ -23265,7 +23265,7 @@
 						vo.setFdioOrderNumber(fdioOrderNumberMap.get(formDefinitionItemName));
 					}else{
 						vo.setFdioOrderNumber(j);
-						fdiOrderNumberMap.put(formDefinitionItemName, j);
+						fdioOrderNumberMap.put(formDefinitionItemName, j);
 						j++;
 					}
 					vo.setValue(value);