Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r30896 -r30899
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 30896)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 30899)
@@ -8746,6 +8746,16 @@
     	if(StringUtils.isBlank(splitForeignTousseName)){
     		return;
     	}
+    	//不保存后面的部分
+    	int endIndex = 0;
+    	if(splitForeignTousseName.contains("(部分")){
+    		endIndex = splitForeignTousseName.lastIndexOf("(部分");
+    	}else if(splitForeignTousseName.contains("(")){
+    		endIndex = splitForeignTousseName.lastIndexOf("(");
+    	}
+    	if(endIndex > 0){
+    		splitForeignTousseName = splitForeignTousseName.substring(0, endIndex);
+    	}
     	if(objectDao.countBySql(" select count(0) from " + SplitForeignTousseName.class.getSimpleName() + " where splitTousseName='"+ splitForeignTousseName +"'") > 0){
     		return;
     	}
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r30881 -r30899
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 30881)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 30899)
@@ -1041,11 +1041,7 @@
 		}
 		String saPurpose = sterilisationManager.getSterilisationPurposeByName(tousseInstance.getSterilingType());
 		obj.put("id", tousseInstance.getId());
-		if(StringUtils.isNotBlank(tousseInstance.getTousseNameAlias())){
-			obj.put("tousseName", tousseInstance.getTousseNameAlias());
-		}else{
-			obj.put("tousseName", tousseName);
-		}
+		obj.put("tousseName", tousseName);
 		obj.put("tousseDefinitionId", td.getId());
 		obj.put("tousseNameAlias", tousseInstance.getTousseNameAlias());
 		obj.put("tousseBarcode", tousseInstance.getBarcode());
@@ -1298,8 +1294,8 @@
 	 * @return
 	 */
 	private Map<Long, List<MaterialErrorDamageDetail>> loadWaitSupplementRecyclingErrors(){
-		String sql = String.format("select * from %s po where po.amount != po.additionalAmount and po.packingTaskId is not null and po.type = '%s' and (po.status is null or po.status<>1) ", 
-				MaterialErrorDamageDetail.class.getSimpleName(),MaterialErrorDamageDetail.TYPE_ERROR);
+		String sql = String.format("select * from %s po where po.amount != po.additionalAmount and po.packingTaskId is not null and po.type = '%s' and (po.status is null or po.status<>%s) ", 
+				MaterialErrorDamageDetail.class.getSimpleName(),MaterialErrorDamageDetail.TYPE_ERROR,MaterialErrorDamageDetail.STATUS_ONE);
 		ResultSet rs = objectDao.executeSql(sql);
 		Map<Long, List<MaterialErrorDamageDetail>> map = new HashMap<Long, List<MaterialErrorDamageDetail>>();
 		try {
@@ -1349,8 +1345,8 @@
 	 */
 	private Map<Long, List<MaterialErrorDamageDetail>> loadWaitSupplementRecyclingDamages(){
 		String sql = String.format("select packingTaskId,id,materialName,amount,additionalAmount,materialDefinitionId "
-				   + "from %s po where po.packingTaskId is not null and po.amount != po.additionalAmount and po.type = '%s' and (po.status is null or po.status<>1) ",
-				   MaterialErrorDamageDetail.class.getSimpleName(),MaterialErrorDamageDetail.TYPE_DAMAGE);
+				   + "from %s po where po.packingTaskId is not null and po.amount != po.additionalAmount and po.type = '%s' and (po.status is null or po.status<>%s) ",
+				   MaterialErrorDamageDetail.class.getSimpleName(),MaterialErrorDamageDetail.TYPE_DAMAGE,MaterialErrorDamageDetail.STATUS_ONE);
 		ResultSet rs = objectDao.executeSql(sql);
 		Map<Long, List<MaterialErrorDamageDetail>> map = new HashMap<Long, List<MaterialErrorDamageDetail>>();
 		try {