Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r33957 -r33962
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33957)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33962)
@@ -25293,46 +25293,6 @@
 		JSONObject dynamicColumnObj = queryFormDefinitionDynamicColumnInfo(formName,modeType);
 		String instrumentSetTypes = StrutsParamUtils.getPraramValue("instrumentSetTypes", "");
 		List<MonitoringItemBean> monitoringItemBeans = getQualityMonitoringDataSource(instrumentSetTypes, formName, responsibilityPart, recordRinseInformation, scope, requestParameters,dynamicColumnObj.optBoolean("haveRequirement"), isShowTousseMaerialSumAmount);
-		if(!CollectionUtils.isEmpty(monitoringItemBeans)){
-			//获取最新的属性
-			Map<String, FormDefinitionItem> formDefinitionItemNameMap = getFormDefinitionOrderInfo(formName);
-			if(!MapUtils.isEmpty(formDefinitionItemNameMap)){
-				Iterator<MonitoringItemBean> it = monitoringItemBeans.iterator();
-				while(it.hasNext()){
-					MonitoringItemBean monitoringItemBean = it.next();
-					String questionName = monitoringItemBean.getQuestionName();
-					if(StringUtils.isBlank(questionName)){
-						continue;
-					}
-					if("-".equals(questionName)){
-						String option = monitoringItemBean.getOption();
-						if(formDefinitionItemNameMap.containsKey(option)){
-							FormDefinitionItem thisFormDefinitionItem = formDefinitionItemNameMap.get(option);
-							monitoringItemBean.setDisplayFormat(thisFormDefinitionItem.getDisplayFormat());
-							monitoringItemBean.setWidth(thisFormDefinitionItem.getWidth());
-						}
-					}else if(formDefinitionItemNameMap.containsKey(questionName)){
-						FormDefinitionItem thisFormDefinitionItem = formDefinitionItemNameMap.get(questionName);
-						if(FormDefinitionItem.FORMAT_ALL.equals(thisFormDefinitionItem.getDisplayFormat())){
-							String option = monitoringItemBean.getOption();
-							if(!"√".equals(monitoringItemBean.getAnswer())){
-								it.remove();
-								continue;
-							}
-							if(option.contains("P+")){
-								monitoringItemBean.setAnswer(monitoringItemBean.getOption().substring(option.indexOf("P+") + 2));
-							}else{
-								monitoringItemBean.setAnswer(monitoringItemBean.getOption());
-							}
-							monitoringItemBean.setOption(monitoringItemBean.getQuestionName());
-							monitoringItemBean.setQuestionName("-");
-						}
-						monitoringItemBean.setDisplayFormat(thisFormDefinitionItem.getDisplayFormat());
-						monitoringItemBean.setWidth(thisFormDefinitionItem.getWidth());
-					}
-				}
-			}
-		}
 		String dataType = requestParameters.get("dataType");
 		if("监测范围为灭菌炉记录的定期监测数据".equals(dataType)){
 			Map<String, Map<String ,Map<String, List<MonitoringItemBean>>>> dataTimeMap = new HashMap<String, Map<String,Map<String,List<MonitoringItemBean>>>>();