Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManagerImpl.java
===================================================================
diff -u -r30305 -r31147
--- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManagerImpl.java	(.../QualityMonitoringDefinitionManagerImpl.java)	(revision 30305)
+++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManagerImpl.java	(.../QualityMonitoringDefinitionManagerImpl.java)	(revision 31147)
@@ -92,7 +92,7 @@
 			}
 			sql += " and (po.isDisabled is null or po.isDisabled = '' or po.isDisabled = '" + Constants.STR_NO + "')";
 			// KPSZXYY-44(查询最新版本的监测项)
-			sql += " and po.version = (select max(version) from QualityMonitoringDefinition where formName = po.formName)";
+			sql += " and po.version = (select max(version) from QualityMonitoringDefinition where formName = po.formName and formType='" + formType + "' and isDeploy='" + FormDefinition.ACTION_DEPLOY + "')";
 			sql += " order by sortNumber asc ";
 			return objectDao.findBySql(QualityMonitoringDefinition.class.getSimpleName(),sql);
 	}