Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManagerImpl.java
===================================================================
diff -u -r30242 -r30305
--- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManagerImpl.java	(.../QualityMonitoringDefinitionManagerImpl.java)	(revision 30242)
+++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/service/QualityMonitoringDefinitionManagerImpl.java	(.../QualityMonitoringDefinitionManagerImpl.java)	(revision 30305)
@@ -155,13 +155,16 @@
 			}
 			
 			for (FormDefinition formDefinition : nList) {
-				if(!showAll && StringUtils.isNotBlank(querySupplyRoom)){
-					String departNames = formDefinition.getDepartNames();
-					if(StringUtils.isNotBlank(departNames) && departNames.contains(querySupplyRoom)){
-						JSONObject obj = new JSONObject();
-						obj.put("id", formDefinition.getId());
-						obj.put("name", formDefinition.getFormName());
-						data.add(obj);
+				if(StringUtils.isNotBlank(querySupplyRoom)){
+					QualityMonitoringDefinition qmd = null;
+					if(formDefinition instanceof QualityMonitoringDefinition){
+						qmd = (QualityMonitoringDefinition)formDefinition;
+						if(StringUtils.isNotBlank(qmd.getHandleDepartCoding()) && qmd.getHandleDepart().equals(querySupplyRoom)){
+							JSONObject obj = new JSONObject();
+							obj.put("id", formDefinition.getId());
+							obj.put("name", formDefinition.getFormName());
+							data.add(obj);
+						}
 					}
 				}else{
 					JSONObject obj = new JSONObject();