Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoicePlanTableManager.java
===================================================================
diff -u -r31342 -r34123
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoicePlanTableManager.java	(.../InvoicePlanTableManager.java)	(revision 31342)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/dwr/table/InvoicePlanTableManager.java	(.../InvoicePlanTableManager.java)	(revision 34123)
@@ -8,6 +8,7 @@
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import net.sf.json.JsonConfig;
+import net.sf.json.util.CycleDetectionStrategy;
 import net.sf.json.util.PropertyFilter;
 
 import org.apache.commons.collections4.CollectionUtils;
@@ -139,8 +140,9 @@
 					new String[] { "applicationItems",
 							"invoice", "proxyTousses", "reviewedBaskets",
 							"recyclingApplications", "parent",
-							"foreignProxyItems", "recyclingRecord" });
+							"foreignProxyItems", "recyclingRecord", "adverseEventRecords" });
 			config.setJsonPropertyFilter(propertyFilter);
+			config.setCycleDetectionStrategy(CycleDetectionStrategy.LENIENT);
 			json = JSONObject.fromObject(
 					invoicePlanManager.get(id), config)
 					.toString();
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java
===================================================================
diff -u -r33835 -r34123
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java	(.../RecyclingApplicationAction.java)	(revision 33835)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/RecyclingApplicationAction.java	(.../RecyclingApplicationAction.java)	(revision 34123)
@@ -1039,8 +1039,9 @@
 				PropertyFilter propertyFilter = new JsonPropertyFilter(
 						new String[] { "invoiceItem", "noProvideGoods",
 								"tousseInstances", "diposableGoodsItems",
-								"recyclingApplication" });
+								"recyclingApplication", "adverseEventRecords" });
 				config.setJsonPropertyFilter(propertyFilter);
+				config.setCycleDetectionStrategy(CycleDetectionStrategy.LENIENT);
 
 				Map<String, Object> map = new HashMap<String, Object>();
 				map.put("success", true);
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java
===================================================================
diff -u -r31818 -r34123
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java	(.../CustomRecyclingApplicationAction.java)	(revision 31818)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/CustomRecyclingApplicationAction.java	(.../CustomRecyclingApplicationAction.java)	(revision 34123)
@@ -464,8 +464,9 @@
 		PropertyFilter propertyFilter = new JsonPropertyFilter(new String[] {
 				"readers", "administrators", "editors", "readersForDisplay",
 				"administratorsForDisplay", "editorsForDisplay", "companyId",
-				"readerOrgUnitCode", "invoice" });
+				"readerOrgUnitCode", "invoice", "adverseEventRecords" });
 		config.setJsonPropertyFilter(propertyFilter);
+		config.setCycleDetectionStrategy(CycleDetectionStrategy.LENIENT);
 
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("success", true);
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r34022 -r34123
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 34022)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 34123)
@@ -5763,10 +5763,11 @@
 			PropertyFilter propertyFilter = new JsonPropertyFilter(new String[] {
 					"applicationItems", "invoice",
 					"recyclingRecord", "recyclingApplications", "parent",
-					"recyclingRecords" });
+					"recyclingRecords", "adverseEventRecords" });
 			config.setJsonPropertyFilter(propertyFilter);
 			//设置hibernate延时加载器句柄,以防申请单的submitTime值为空时调用JSONObject.fromObject报错
 			config.setExcludes(new String[]{"handler","hibernateLazyInitializer"});
+			config.setCycleDetectionStrategy(CycleDetectionStrategy.LENIENT);
 			json = JSONObject.fromObject(recyclingApplicationManager.getInvoicePlanAndVerifyEdit(id),config);
 			json.put("success", true);
 		} catch (Exception e) {
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java
===================================================================
diff -u -r33232 -r34123
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java	(.../ProxyDisinfectionManagerImpl.java)	(revision 33232)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java	(.../ProxyDisinfectionManagerImpl.java)	(revision 34123)
@@ -16,6 +16,7 @@
 import net.sf.json.JSONObject;
 import net.sf.json.JsonConfig;
 import net.sf.json.processors.DefaultValueProcessor;
+import net.sf.json.util.CycleDetectionStrategy;
 import net.sf.json.util.PropertyFilter;
 
 import org.apache.commons.collections.MapUtils;
@@ -1231,7 +1232,9 @@
 				"applicationItems", "proxyTousses",
 				"invoice", "returnedTousseItems",
 				"foreignProxyTousses", "reviewedBaskets",
-				"recyclingApplications", "parent", "recyclingRecord" });
+				"recyclingApplications", "parent", "recyclingRecord", "adverseEventRecords" });
+		//设置级联映射转换,防止自包含
+		config.setCycleDetectionStrategy(CycleDetectionStrategy.LENIENT);
 		String printTime = DateTools.getCurrentDayByFormat(DateTools.COMMON_DATE_HM);
 		for (ProxyDisinfection proxyDisinfection : proxyDisinfectionList) {
 			JSONObject obj = JSONObject.fromObject(proxyDisinfection, config);
@@ -1325,8 +1328,9 @@
 		JsonConfig config = new JsonConfig();
 		PropertyFilter propertyFilter = new JsonPropertyFilter(new String[] {
 				"proxyTousses", "applicationItems", "invoice",
-		"reviewedBaskets" });
+		"reviewedBaskets", "adverseEventRecords" });
 		config.setJsonPropertyFilter(propertyFilter);
+		config.setCycleDetectionStrategy(CycleDetectionStrategy.LENIENT);
 		config.registerDefaultValueProcessor(Integer.class,
 				new DefaultValueProcessor() {
 			@Override
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/UntracableRecyclingApplicationAction.java
===================================================================
diff -u -r28124 -r34123
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/UntracableRecyclingApplicationAction.java	(.../UntracableRecyclingApplicationAction.java)	(revision 28124)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/action/UntracableRecyclingApplicationAction.java	(.../UntracableRecyclingApplicationAction.java)	(revision 34123)
@@ -121,9 +121,10 @@
 		PropertyFilter propertyFilter = new JsonPropertyFilter(new String[] {
 				"readers", "administrators", "editors", "readersForDisplay",
 				"administratorsForDisplay", "editorsForDisplay", "companyId",
-				"readerOrgUnitCode", "invoice" });
+				"readerOrgUnitCode", "invoice", "adverseEventRecords" });
 		config.setJsonPropertyFilter(propertyFilter);
-
+		config.setCycleDetectionStrategy(CycleDetectionStrategy.LENIENT);
+		
 		Map<String, Object> map = new HashMap<String, Object>();
 		map.put("success", true);
 		map.put("data", recyclingApplication);
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java
===================================================================
diff -u -r34119 -r34123
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 34119)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/dwr/table/RecyclingApplicationTableManager.java	(.../RecyclingApplicationTableManager.java)	(revision 34123)
@@ -434,6 +434,7 @@
 				"recyclingRecord", "recyclingApplications", "parent",
 		"recyclingRecords", "adverseEventRecords" });
 		config.setJsonPropertyFilter(propertyFilter);
+		config.setCycleDetectionStrategy(CycleDetectionStrategy.LENIENT);
 		//设置hibernate延时加载器句柄,以防申请单的submitTime值为空时调用JSONObject.fromObject报错
 		config.setExcludes(new String[]{"handler","hibernateLazyInitializer"});