Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java
===================================================================
diff -u -r34645 -r34652
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java	(.../WorkQualityCollectionDataIndex.java)	(revision 34645)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java	(.../WorkQualityCollectionDataIndex.java)	(revision 34652)
@@ -271,7 +271,7 @@
 	 */
 	public Map<String,Integer> getPackAmountMap(ReportQueryParams reportParams, String format, String type){
 		Map<String,Integer> map = new HashMap<String,Integer>();
-		if("mm".equals(format) || "dd".equals(format)|| "year".equals(format)){
+		if("mm".equals(format) || "dd".equals(format)|| "yyyy".equals(format)){
 			reportParams.monthlyStr = dateQueryAdapter.dateConverAdapter3("ti.operationTime",format);
 		}else if("yyyy-MM-dd".equals(format)){
 			reportParams.monthlyStr = dateQueryAdapter.dateConverAdapter("ti.operationTime",null);
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r34650 -r34652
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 34650)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 34652)
@@ -22603,8 +22603,8 @@
 				reportParams.monthlyStr = dateQueryAdapter.dateConverAdapter(dateQueryAdapter.stringFieldToDate("ti.sterileEndTime"),format);
 				reviewTimeSql = dateQueryAdapter.dateConverAdapter("case when ti.reviewTime is not null then ti.reviewTime else ti.operationTime end", null);
 			} else if(SupplyRoomQualityQuota.YEAR.endsWith(queryScope)){
-				reportParams.monthlyStr = dateQueryAdapter.dateConverAdapter3(dateQueryAdapter.stringFieldToDate("ti.sterileEndTime"),"year");
-				reviewTimeSql = dateQueryAdapter.dateConverAdapter3("case when ti.reviewTime is not null then ti.reviewTime else ti.operationTime end", "year");
+				reportParams.monthlyStr = dateQueryAdapter.dateConverAdapter3(dateQueryAdapter.stringFieldToDate("ti.sterileEndTime"),"yyyy");
+				reviewTimeSql = dateQueryAdapter.dateConverAdapter3("case when ti.reviewTime is not null then ti.reviewTime else ti.operationTime end", "yyyy");
 			}else {
 				format = "mm";
 				reportParams.monthlyStr = dateQueryAdapter.dateConverAdapter3(dateQueryAdapter.stringFieldToDate("ti.sterileEndTime"),format);
@@ -22673,7 +22673,7 @@
 				endTime = endTime + " 23:59:59";
 				params.monthlyStr = dateQueryAdapter.dateConverAdapter("wr.endDate",null);
 			} else if(SupplyRoomQualityQuota.YEAR.endsWith(queryScope)){
-				params.monthlyStr = dateQueryAdapter.dateConverAdapter3("wr.endDate","year");
+				params.monthlyStr = dateQueryAdapter.dateConverAdapter3("wr.endDate","yyyy");
 			}else {
 				params.monthlyStr = dateQueryAdapter.dateConverAdapter3("wr.endDate","mm");
 				startTime = date + "-01-01 00:00:00";
@@ -22914,7 +22914,7 @@
 				endTime = endTime + " 23:59:59";
 				qmiDateTimeSql = dateQueryAdapter.dateConverAdapter("qmi.dateTime", null);
 			} else if(SupplyRoomQualityQuota.YEAR.endsWith(queryScope)){
-				qmiDateTimeSql = dateQueryAdapter.dateConverAdapter3("qmi.dateTime", "year");
+				qmiDateTimeSql = dateQueryAdapter.dateConverAdapter3("qmi.dateTime", "yyyy");
 			}else {
 				qmiDateTimeSql = dateQueryAdapter.dateConverAdapter3("qmi.dateTime", "mm");
 				startTime = date + "-01-01 00:00:00";
@@ -23196,7 +23196,7 @@
 					total += packAmountMap.get(key);
 				}
 			}
-		} else if("year".equals(format)){
+		} else if("yyyy".equals(format)){
 			for (String key : packAmountMap.keySet()) {
 				map.put(key, packAmountMap.get(key));
 			}
@@ -23244,7 +23244,7 @@
 			format = "mm";
 			size = 12;
 		}else if(SupplyRoomQualityQuota.YEAR.equals(queryScope)){
-			format = "year";
+			format = "yyyy";
 			size = 2;
 		}
 		String betweenSql = String.format(" between %s and %s ", dateQueryAdapter.dateAdapter(startTime),dateQueryAdapter.dateAdapter(endTime));
@@ -23898,7 +23898,7 @@
 	 */
 	private Map<String,Map<String,Object>> getSterilizerUseAmountMap(String startTime, String endTime, String orgUnitCoding, String format){
 		String monthlyStr = dateQueryAdapter.dateConverAdapter("sr.enddate",null);
-		if("mm".equals(format) || "year".equals(format)){
+		if("mm".equals(format) || "yyyy".equals(format)){
 			monthlyStr = dateQueryAdapter.dateConverAdapter3("sr.enddate",format);
 		}else{
 			monthlyStr = dateQueryAdapter.dateConverAdapter("sr.enddate",null);
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
===================================================================
diff -u -r34645 -r34652
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java	(.../DataIndex.java)	(revision 34645)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java	(.../DataIndex.java)	(revision 34652)
@@ -2781,7 +2781,7 @@
 				}
 				reportParams.monthlyStr = dateQueryAdapter.dateConverAdapter(dateQueryAdapter.stringFieldToDate("ti.sterileEndTime"),format);
 			} else if(SupplyRoomQualityQuota.YEAR.endsWith(queryScope)){
-				reportParams.monthlyStr = dateQueryAdapter.dateConverAdapter3(dateQueryAdapter.stringFieldToDate("ti.sterileEndTime"),"year");
+				reportParams.monthlyStr = dateQueryAdapter.dateConverAdapter3(dateQueryAdapter.stringFieldToDate("ti.sterileEndTime"),"yyyy");
 			}else {
 				reportParams.monthlyStr = dateQueryAdapter.dateConverAdapter3(dateQueryAdapter.stringFieldToDate("ti.sterileEndTime"),"mm");
 			}