Index: ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/action/QualityMonitoringDefinitionAction.java
===================================================================
diff -u -r16345 -r16357
--- ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/action/QualityMonitoringDefinitionAction.java	(.../QualityMonitoringDefinitionAction.java)	(revision 16345)
+++ ssts-qualitymon/src/main/java/com/forgon/disinfectsystem/qualitymonitoring/definition/action/QualityMonitoringDefinitionAction.java	(.../QualityMonitoringDefinitionAction.java)	(revision 16357)
@@ -1,6 +1,7 @@
 package com.forgon.disinfectsystem.qualitymonitoring.definition.action;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
@@ -106,10 +107,32 @@
 		String formType = StrutsParamUtils.getPraramValue("formType", "");
 		String querySupplyRoom = StrutsParamUtils.getPraramValue("querySupplyRoom", "");
 		String responsiblePerson = StrutsParamUtils.getPraramValue("responsiblePerson", "");
-		List<QualityMonitoringDefinition> list = qualityMonitoringDefinitionManager.loadLastDeployFormDefinitionGroupByFormName(spell,formType,responsiblePerson);
+		String isNotLimitInspect = StrutsParamUtils.getPraramValue("isNotLimitInspect", "");
+		List<QualityMonitoringDefinition> list = new ArrayList<QualityMonitoringDefinition>();
+		if("是".equals(isNotLimitInspect) && StringUtils.isNotBlank(responsiblePerson)){
+			list = qualityMonitoringDefinitionManager.loadLastDeployFormDefinitionGroupByFormName(spell,formType,null);
+		}else{
+			list = qualityMonitoringDefinitionManager.loadLastDeployFormDefinitionGroupByFormName(spell,formType,responsiblePerson);
+		}
 		JSONArray data = new JSONArray();
 		if(list != null){
-			for (FormDefinition formDefinition : list) {
+			// 如果从责任环节进来，且不限制责任环节，重新按照责任环节排序
+			List<QualityMonitoringDefinition> nList = new ArrayList<QualityMonitoringDefinition>();
+			if("是".equals(isNotLimitInspect) && StringUtils.isNotBlank(responsiblePerson)){
+				List<QualityMonitoringDefinition> otherList = new ArrayList<QualityMonitoringDefinition>();
+				for (QualityMonitoringDefinition formDefinition : list){
+					if(responsiblePerson.equals(formDefinition.getResponsibilityPart())){
+						nList.add(formDefinition);
+					}else{
+						otherList.add(formDefinition);
+					}
+				}
+				nList.addAll(otherList);
+			}else{
+				nList = list;
+			}
+			
+			for (FormDefinition formDefinition : nList) {
 				if(StringUtils.isNotBlank(querySupplyRoom)){
 					String departNames = formDefinition.getDepartNames();
 					if(StringUtils.isNotBlank(departNames) && departNames.contains(querySupplyRoom)){