Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/action/QualityMonitoringDefinitionAction.java
===================================================================
diff -u -r16176 -r16179
--- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/action/QualityMonitoringDefinitionAction.java	(.../QualityMonitoringDefinitionAction.java)	(revision 16176)
+++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/action/QualityMonitoringDefinitionAction.java	(.../QualityMonitoringDefinitionAction.java)	(revision 16179)
@@ -102,15 +102,26 @@
 	public void loadLastDeployFormDefinitionGroupByFormName(){
 		String spell = StrutsParamUtils.getPraramValue("spell", "");
 		String formType = StrutsParamUtils.getPraramValue("formType", "");
+		String querySupplyRoom = StrutsParamUtils.getPraramValue("querySupplyRoom", "");
 		String responsiblePerson = StrutsParamUtils.getPraramValue("responsiblePerson", "");
 		List<QualityMonitoringDefinition> list = qualityMonitoringDefinitionManager.loadLastDeployFormDefinitionGroupByFormName(spell,formType,responsiblePerson);
 		JSONArray data = new JSONArray();
 		if(list != null){
 			for (FormDefinition formDefinition : list) {
-				JSONObject obj = new JSONObject();
-				obj.put("id", formDefinition.getId());
-				obj.put("name", formDefinition.getFormName());
-				data.add(obj);
+				if(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);
+					}
+				}else{
+					JSONObject obj = new JSONObject();
+					obj.put("id", formDefinition.getId());
+					obj.put("name", formDefinition.getFormName());
+					data.add(obj);
+				}
 			}
 		}
 		JSONObject obj = new JSONObject();