Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r34631 -r34633
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 34631)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 34633)
@@ -672,11 +672,32 @@
 					title = "供应室护理质量指标统计表";
 				}
 				JSONArray dataIndexsArray = dataConfigObj.optJSONArray("dataIndexsArray");
+				Set<String> ownGroups = objectDao.getStringSet("select distinct ownGroup from Sterilizer ", "空");
+				Map<String,String> descriptionOfDataIndexMap = new HashMap<String, String>();
 				if(dataIndexsArray != null && ("split".equals(queryScope) || "compareToLastYear".equals(queryScope))){
-					String[] dataIndexNameArr = new String[dataIndexsArray.size()];
+					String[] dataIndexNameArr = new String[dataIndexsArray.size() + ownGroups.size() - 1];
+					int k = 0;
 					for (int i = 0; i < dataIndexsArray.size(); i++) {
 						JSONObject dataIndex = dataIndexsArray.optJSONObject(i);
-						dataIndexNameArr[i] = dataIndex.optString("dataIndexNameForDisplay");
+						if("灭菌器使用炉次(按灭菌炉分组)".equals(dataIndex.optString("dataIndexSource"))){
+							String dataIndexNameForDisplay = dataIndex.optString("dataIndexNameForDisplay");
+							for (String ownGroup : ownGroups) {
+								dataIndexNameArr[i + k] = dataIndexNameForDisplay + " ("+ ownGroup +")";
+								k++;
+							}
+						}else{
+							dataIndexNameArr[i + k] = dataIndex.optString("dataIndexNameForDisplay");
+						}
+						String descriptionOfDataIndex = dataIndex.optString("descriptionOfDataIndex");
+						if(StringUtils.isNotBlank(descriptionOfDataIndex)){
+							if("灭菌器使用炉次(按灭菌炉分组)".equals(dataIndex.optString("dataIndexSource"))){
+								for (String ownGroup : ownGroups) {
+									descriptionOfDataIndexMap.put(dataIndex.optString("dataIndexNameForDisplay")  + " ("+ ownGroup +")", descriptionOfDataIndex);
+								}
+							}else{
+								descriptionOfDataIndexMap.put(dataIndex.optString("dataIndexNameForDisplay"), descriptionOfDataIndex);
+							}
+						}
 					}
 					parametMap.put("dataIndexNameForDisplay", dataIndexNameArr);
 				}
@@ -713,14 +734,6 @@
 					if(comapreReportsSettings != null){
 						boolean showDescriptionColumnOfDataIndex = comapreReportsSettings.optBoolean("showDescriptionColumnOfDataIndex");
 						if(showDescriptionColumnOfDataIndex){
-							Map<String,String> descriptionOfDataIndexMap = new HashMap<String, String>();
-							for (int i = 0; i < dataIndexsArray.size(); i++) {
-								JSONObject dataConfig = (JSONObject)dataIndexsArray.get(i);
-								String descriptionOfDataIndex = dataConfig.optString("descriptionOfDataIndex");
-								if(StringUtils.isNotBlank(descriptionOfDataIndex)){
-									descriptionOfDataIndexMap.put(dataConfig.optString("dataIndexNameForDisplay"), descriptionOfDataIndex);
-								}
-							}
 							if(MapUtils.isNotEmpty(descriptionOfDataIndexMap)){
 								for (SupplyRoomQualityQuota supplyRoomQualityQuota : list) {
 									if(descriptionOfDataIndexMap.containsKey(supplyRoomQualityQuota.getRowName())){