Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/QualityMonitoringHelper.java =================================================================== diff -u -r36374 -r36768 --- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/QualityMonitoringHelper.java (.../QualityMonitoringHelper.java) (revision 36374) +++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/QualityMonitoringHelper.java (.../QualityMonitoringHelper.java) (revision 36768) @@ -91,7 +91,7 @@ modeType = "recordSterilizatioInformation"; } //监测元素属性map - Map formDefinitionItemNameMap = new HashMap(); + Map formDefinitionItemNameMap = new LinkedHashMap(); JSONObject dynamicColumnObj = queryFormDefinitionDynamicColumnInfo(formName,modeType, formDefinitionItemNameMap); String instrumentSetTypes = StrutsParamUtils.getPraramValue("instrumentSetTypes", ""); List monitoringItemBeans = getQualityMonitoringDataSource(instrumentSetTypes, formName, responsibilityPart, recordRinseInformation, scope, requestParameters,dynamicColumnObj.optBoolean("haveRequirement"), isShowTousseMaerialSumAmount); @@ -1683,11 +1683,11 @@ fdiOrderNumberMap.put(formDefinitionItemName, i); i++; } - if(fdioOrderNumberMap.containsKey(formDefinitionItemName)){ - vo.setFdioOrderNumber(fdioOrderNumberMap.get(formDefinitionItemName)); + if(fdioOrderNumberMap.containsKey(key)){ + vo.setFdioOrderNumber(fdioOrderNumberMap.get(key)); }else{ vo.setFdioOrderNumber(j); - fdioOrderNumberMap.put(formDefinitionItemName, j); + fdioOrderNumberMap.put(key, j); j++; } vo.setValue(value);