Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java
===================================================================
diff -u -r31770 -r32188
--- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 31770)
+++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java	(.../ImportBasedataManagerImpl.java)	(revision 32188)
@@ -3028,11 +3028,14 @@
 						tousseDefinition.setWbCode(GB2WB.getWBCode(tousseDefinition.getName()));
 						// 设置材料的顺序
 						TousseDefinitionUtils.resetTousseDefinitionMaterialSequence(tousseDefinitionMaterials);
-						totalCount = saveOrUpdateAndClearCache(totalCount,
-								tousseDefinition);
+						objectDao.saveOrUpdate(tousseDefinition);
 						tousseDefinition.setAncestorID(tousseDefinition.getId());
 						tousseDefinition.setParentID(tousseDefinition.getId());
 						successCount++;
+						totalCount++;
+						if (totalCount % 50 == 0) {
+							objectDao.clearCache();
+						}
 						materialInstanceList = null;
 						tousseDefinitionMaterials = null;
 						tousseDefinition = null;
@@ -3163,8 +3166,11 @@
 				tousseDefinition.setWbCode(GB2WB.getWBCode(tousseDefinition.getName()));
 				// 设置材料的顺序
 				TousseDefinitionUtils.resetTousseDefinitionMaterialSequence(tousseDefinitionMaterials);
-				totalCount = saveOrUpdateAndClearCache(totalCount,
-						tousseDefinition);
+				objectDao.saveOrUpdate(tousseDefinition);
+				totalCount++;
+				if (totalCount % 50 == 0) {
+					objectDao.clearCache();
+				}
 				tousseDefinition.setAncestorID(tousseDefinition.getId());
 				tousseDefinition.setParentID(tousseDefinition.getId());
 				successCount++;
@@ -3421,8 +3427,7 @@
 								.setDiposableGoodsItems(diposableGoodsInstanceList);
 						// 设置材料的顺序
 						TousseDefinitionUtils.resetTousseDefinitionMaterialSequence(tousseDefinitionMaterials);
-						totalCount = saveOrUpdateAndClearCache(totalCount,
-								tousseDefinition);
+						objectDao.saveOrUpdate(tousseDefinition);
 						// 器械包种类GDSZYY-86
 						if(enableInstrumentSetTypeSetting){
 							instrumentSetTypeManager.setInstrumentSetType(tousseDefinition, instrumentSetType);
@@ -3451,6 +3456,9 @@
 						materialInstanceList = null;
 						diposableGoodsInstanceList = null;
 						tousseDefinitionMaterials = null;
+						if (++totalCount % 50 == 0) {
+							objectDao.clearCache();
+						}
 						tousseDefinition = null;
 					}
 					materialInstanceList = new ArrayList<MaterialInstance>();
@@ -3935,7 +3943,8 @@
 				tousseDefinition.setDiposableGoodsItems(diposableGoodsInstanceList);
 				// 设置材料的顺序
 				TousseDefinitionUtils.resetTousseDefinitionMaterialSequence(tousseDefinitionMaterials);
-				totalCount = saveOrUpdateAndClearCache(totalCount, tousseDefinition);
+				objectDao.saveOrUpdate(tousseDefinition);
+				totalCount++;
 				tousseDefinition.setAncestorID(tousseDefinition.getId());
 				if(tousseDefinition.getForDisplay()){
 					tousseInstanceManager.getOrCreateTousseDefinitionFixedBarcode(tousseDefinition.getId());
@@ -5945,8 +5954,7 @@
 						}else{
 							isNewTousse = true;
 						}
-						totalCount = saveOrUpdateAndClearCache(totalCount,
-								tousseDefinition);
+						objectDao.saveOrUpdate(tousseDefinition);
 						tousseDefinition.setAncestorID(tousseDefinition.getId());
 						if(isNewTousse){
 							tousseDefinitionManager.addCssdHandleToussesConfig(tousseDefinition);
@@ -5964,6 +5972,9 @@
 							}
 						}
 						successCount++;
+						if (++totalCount % 50 == 0) {
+							objectDao.clearCache();
+						}
 						tousseDefinition = null;
 					}
 					tousseDefinition = new TousseDefinition();
@@ -6091,7 +6102,8 @@
 					}else {
 						isNewTousse = true;
 					}
-					totalCount = saveOrUpdateAndClearCache(totalCount, tousseDefinition);
+					objectDao.saveOrUpdate(tousseDefinition);
+					totalCount++;
 					tousseDefinition.setAncestorID(tousseDefinition.getId());
 					
 					// 器械包种类GDSZYY-86