Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/FormDefinitionHelper.java
===================================================================
diff -u -r35797 -r35816
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/FormDefinitionHelper.java	(.../FormDefinitionHelper.java)	(revision 35797)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/FormDefinitionHelper.java	(.../FormDefinitionHelper.java)	(revision 35816)
@@ -24,6 +24,12 @@
 	private GoodsOptionManager goodsOptionManager;
 	@Autowired
 	private QualityMonitoringDefinitionManager qualityMonitoringDefinitionManager;
+	/**
+	 * 获取数据源对应的质量监测 为空就获取默认的质量监测
+	 * @param model 配置的数据源
+	 * @param list 质量监测
+	 * @return
+	 */
 	public String[] getModelSources(String model, List<QualityMonitoringDefinition> list){
 		String[] source = goodsOptionManager.getGoodsOptionValue(model, "");
 		if(source != null && source.length > 0){
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
===================================================================
diff -u -r35806 -r35816
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 35806)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 35816)
@@ -1230,13 +1230,6 @@
 	 */
 	public List<JSONObject> getEquipmentData();
 	/**
-	 * 获取数据源对应的质量监测 为空就获取默认的质量监测
-	 * @param model 配置的数据源
-	 * @param list 质量监测
-	 * @return
-	 */
-	public String[] getModelSources(String model, List<QualityMonitoringDefinition> list);
-	/**
 	 * CDSLQYQYYY-114 获取器械维修记录报表
 	 * @param startTime 查询登记开始时间 
 	 * @param endTime 查询登记结束时间
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java
===================================================================
diff -u -r35589 -r35816
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java	(.../WorkQualityCollectionDataIndex.java)	(revision 35589)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java	(.../WorkQualityCollectionDataIndex.java)	(revision 35816)
@@ -35,6 +35,7 @@
 import com.forgon.disinfectsystem.foreigntousseapplication.service.ForeignTousseApplicationManager;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.WorkQualityCollection;
 import com.forgon.disinfectsystem.jasperreports.service.JasperReportManager;
+import com.forgon.disinfectsystem.jasperreports.util.FormDefinitionHelper;
 import com.forgon.disinfectsystem.qualitymonitoring.definition.service.QualityMonitoringDefinitionManager;
 import com.forgon.disinfectsystem.reportforms.vo.ReportQueryParams;
 import com.forgon.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager;
@@ -109,6 +110,8 @@
 	private DataIndex dataIndex;
 	@Autowired
 	private JasperReportManager jasperReportManager;
+	@Autowired
+	private FormDefinitionHelper formDefinitionHelper;
 	/**
 	 * 
 	 * @param startAndEndDays
@@ -1413,7 +1416,7 @@
 		WorkQualityCollection bean = new WorkQualityCollection();
 		String queryYear = year + "-01-01 00:00:00";
 		String nextYear = dataIndex.getNextYear(year) + " 00:00:00";
-		String[] washSumUnqualifiedSource = jasperReportManager.getModelSources(GoodsOption.MODEL_WASHUNQUALIFIEDSOURCE, null);
+		String[] washSumUnqualifiedSource = formDefinitionHelper.getModelSources(GoodsOption.MODEL_WASHUNQUALIFIEDSOURCE, null);
 		// 清洗不合格量
 		String sql = "select "
 				+ dateQueryAdapter.dateConverAdapter3("qi.dateTime", "mm")
@@ -1695,7 +1698,7 @@
 			List<WorkQualityCollection> list,String querySupplyRoom,
 			boolean isHidePartOfWorkQualityCollection) throws SQLException {
 		WorkQualityCollection bean = new WorkQualityCollection();
-		String[] washSumUnqualifiedSource = jasperReportManager.getModelSources(GoodsOption.MODEL_WASHUNQUALIFIEDSOURCE, null);
+		String[] washSumUnqualifiedSource = formDefinitionHelper.getModelSources(GoodsOption.MODEL_WASHUNQUALIFIEDSOURCE, null);
 		for (String key : startAndEndDays.keySet()) {
 			String startDay = null;
 			String endDay = null;
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r35815 -r35816
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35815)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35816)
@@ -10089,79 +10089,7 @@
 			String queryYear, String departCoding) {
 		return qualityControlOfClinicHelper.getQualityControlOfClinic(queryYear, departCoding);
 	}
-
-	/**
-	 * 获取数据源对应的质量监测 为空就获取默认的质量监测
-	 * @param model 配置的数据源
-	 * @param list 质量监测
-	 * @return
-	 */
 	@Override
-	public String[] getModelSources(String model, List<QualityMonitoringDefinition> list){
-		String[] source = goodsOptionManager.getGoodsOptionValue(model, "");
-		if(source != null && source.length > 0){
-			return source;
-		}//如果没设置 就找默认值
-		if(list == null){
-			list = qualityMonitoringDefinitionManager
-					.loadLastDeployFormDefinitionGroupByFormName("", FormDefinition.FOMRTYPE_QUALITYMONITORING, "",false);
-			if(CollectionUtils.isEmpty(list)){
-				return source;
-			}
-		}
-		Set<String> sourceNames = new HashSet<String>();
-		for (QualityMonitoringDefinition formDefinition : list) {
-			if(isDefaultValueOfGoodsOptionModel(model, formDefinition.getFormName())){
-				sourceNames.add(formDefinition.getFormName());
-			}
-		}
-		if(sourceNames.size() > 0){
-			source = new String[sourceNames.size()];
-			int i = 0;
-			for (String sourceName : sourceNames) {
-				source[i] = sourceName;
-				i++;
-			}
-		}
-		return source;
-	}
-	/**
-	 * 判断质量监测是否是数据源的默认值
-	 * @param model 数据源
-	 * @param formName 质量监测名
-	 * @return
-	 */
-	private boolean isDefaultValueOfGoodsOptionModel(String model, String formName){
-		if(GoodsOption.MODEL_WASHUNQUALIFIEDSOURCE.equals(model)){
-			return formName.contains("清洗不合格") || formName.contains("清洗不及格");
-		}else if(GoodsOption.MODEL_RECYCLINGTOUSSEERROR.equals(model)){
-			return formName.contains("回收器械丢失");
-		}else if(GoodsOption.MODEL_WETPACKETSUNQUALIFIEDSOURCE.equals(model)){
-			return formName.contains("湿包");
-		}else if(GoodsOption.MODEL_ONLY_PACKINGUNQUALIFIEDSOURCE.equals(model)){
-			return formName.contains("包装密闭不合格");
-		}else if(GoodsOption.MODEL_DISPOSABLEGOODS.equals(model)){
-			return formName.contains("消毒物品不合格");
-		}else if(GoodsOption.MODEL_MISSING_INTOUSSE.equals(model)){
-			return formName.contains("包内器械缺失");
-		}else if(GoodsOption.MODEL_INSUFFICIENCY_INTOUSSE.equals(model)){
-			return formName.contains("包内器械功能不全");
-		}else if(GoodsOption.MODEL_TYPEERROR_INTOUSSE.equals(model)){
-			return formName.contains("包内器械种类错误");
-		}else if(GoodsOption.MODEL_CHEMICALINDICATORCARD_INTOUSSE_UNQUALIFIED.equals(model)){
-			return formName.contains("包内化学指示卡不合格");
-		}else if(GoodsOption.MODEL_ITEM_ID_IS_INCORRECT.equals(model)){
-			return formName.contains("包标识不正确");
-		}else if(GoodsOption.MODEL_STERILIZATION_FAILURE.equals(model)){
-			return formName.contains(GoodsOption.MODEL_STERILIZATION_FAILURE);
-		}else if(GoodsOption.MODEL_ITEM_INVOICE_ERROR.equals(model)){
-			return formName.contains(GoodsOption.MODEL_ITEM_INVOICE_ERROR);
-		}else if(GoodsOption.MODEL_INCORRECT_CHOICE_STERILIZATIONMODE.equals(model)){
-			return formName.contains(GoodsOption.MODEL_INCORRECT_CHOICE_STERILIZATIONMODE);
-		}
-		return false;
-	}
-	@Override
 	public List<SupplyRoomQualityQuota> getSupplyRoomQualityQuota(
 			String departmentCode, String queryScope, String queryTime, JSONArray dataConfigArr, Integer beginDateOfMonth, Set<String> dataIndexSources
 			, String startTime, String endTime, boolean dataIndexsAsRows) {