Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java
===================================================================
diff -u -r16501 -r16632
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 16501)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java	(.../TousseDefinitionManagerImpl.java)	(revision 16632)
@@ -542,11 +542,9 @@
 			if(td.getOrginalName() != null && !td.getOrginalName().equals(td.getName())){
 				if(TousseDefinition.PACKAGE_TYPE_INSIDE.equals(td.getTousseType())
 						|| TousseDefinition.PACKAGE_TYPE_DRESSING.equals(td.getTousseType())
-						|| TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY.equals(td.getTousseType())){
+						|| TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY.equals(td.getTousseType())
+						|| td.isDisinfection()){
 					updateOtherEntityTousseName(td.getOrginalName() , td);
-				}else if(td.isDisinfection()){
-					//供应室处理器械包配置CssdHandleTousses
-					objectDao.excuteSQL(String.format("update %s set tousseName='%s' where tousseDefinitionId=%s",CssdHandleTousses.class.getSimpleName(), td.getName(),td.getId()));
 				}
 				//器械包定义名称修改输出到日志
 				appLogManager.saveLog(AcegiHelper.getLoginUser(),
@@ -567,10 +565,6 @@
 		try{
 			List<String> updateSqlList = new ArrayList<String>();
 			
-			//清洗记录ClassifiedItem(整包清洗相应字段的修改)
-			updateSqlList.add("update ClassifiedItem set name='" + targetTousseName + "'" 
-				+ " where itemType<>'材料' and toussedefinition_id=" + td.getId());
-
 			//清洗记录ClassifiedItem(拆包清洗相应字段的修改)
 			updateSqlList.add("update ClassifiedItem set tousseNameForMaterial='" + targetTousseName + "'" 
 						+ " where itemType='材料' and tousseNameForMaterial='" + originalTousseName + "'");
@@ -601,24 +595,47 @@
 			//回收报损项RecyclingDamageItem
 			updateSqlList.add("update RecyclingDamageItem set tousseName='"+ targetTousseName +"' where tousseName='"+ originalTousseName +"'");
 			
-			//退物项ReturnGoodsItem
-			updateSqlList.add("update ReturnGoodsItem set tousseName='"+ targetTousseName +"' where tousseDefinition_id="+ td.getId());
-			
-			//器械包实例TousseInstance
-			updateSqlList.add("update TousseInstance set tousseName='"+ targetTousseName +"' where tousseDefinition_id="+ td.getId());
-			
-			//申请项TousseItem
-			updateSqlList.add("update TousseItem set tousseName='"+ targetTousseName +"' where tousseDefinitionId="+ td.getId());
-			
 			//申请项TousseStock
 			updateSqlList.add("update TousseStock set tousseName='"+ targetTousseName +"' where tousseName='"+ originalTousseName +"'");
 			
+			//如果修改前的名称与修改后的名称不一致,则修改器械包定义的器械包名称为相应修改其它相关表的器械包名称
+			if(td.isDisinfection()){
+				//退物项ReturnGoodsItem
+				updateSqlList.add("update ReturnGoodsItem set tousseName='"+ targetTousseName +"' where tousseDefinition_id in (select id from TousseDefinition where ancestorId="+ td.getId() +")");
+				
+				//器械包实例TousseInstance
+				updateSqlList.add("update TousseInstance set tousseName='"+ targetTousseName +"' where tousseDefinition_id in (select id from TousseDefinition where ancestorId="+ td.getId() +")");
+				
+				//申请项TousseItem
+				updateSqlList.add("update TousseItem set tousseName='"+ targetTousseName +"' where tousseDefinitionId in (select id from TousseDefinition where ancestorId="+ td.getId() +")");
+				
+				//清洗记录ClassifiedItem(整包清洗相应字段的修改)
+				updateSqlList.add("update ClassifiedItem set name='" + targetTousseName + "'" 
+					+ " where itemType<>'材料' and toussedefinition_id in (select id from TousseDefinition where ancestorId="+ td.getId() +")");
+			}else if(TousseDefinition.PACKAGE_TYPE_INSIDE.equals(td.getTousseType())
+					|| TousseDefinition.PACKAGE_TYPE_DRESSING.equals(td.getTousseType())
+					|| TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY.equals(td.getTousseType())){
+				//退物项ReturnGoodsItem
+				updateSqlList.add("update ReturnGoodsItem set tousseName='"+ targetTousseName +"' where tousseDefinition_id="+ td.getId());
+				
+				//器械包实例TousseInstance
+				updateSqlList.add("update TousseInstance set tousseName='"+ targetTousseName +"' where tousseDefinition_id="+ td.getId());
+				
+				//申请项TousseItem
+				updateSqlList.add("update TousseItem set tousseName='"+ targetTousseName +"' where tousseDefinitionId="+ td.getId());
+				
+				// 器械包库存GoodsStock更改名字
+				updateSqlList.add(String.format("update %s set name='%s' where tousseDefinitionId=%s",GoodsStock.class.getSimpleName(), targetTousseName,td.getId()));
+				
+				//清洗记录ClassifiedItem(整包清洗相应字段的修改)
+				updateSqlList.add("update ClassifiedItem set name='" + targetTousseName + "'" 
+					+ " where itemType<>'材料' and toussedefinition_id=" + td.getId());
+			}
+
 			// 器械包库存GoodsStock更改名字
 			updateSqlList.add(String.format("update %s set name='%s' where tousseDefinitionId=%s",GoodsStock.class.getSimpleName(), targetTousseName,td.getId()));
-			
 			//供应室处理器械包配置CssdHandleTousses
 			updateSqlList.add(String.format("update %s set tousseName='%s' where tousseDefinitionId=%s",CssdHandleTousses.class.getSimpleName(), targetTousseName,td.getId()));
-			
 			for(String updateSql : updateSqlList){
 				objectDao.excuteSQL(updateSql);
 			}
@@ -985,7 +1002,7 @@
 		String sql = createQuerySQL(simpleSpell);
 		
 		if (onlySearchRecyclingTousse){
-			sql += " and po.isRecycling = '"+TousseDefinition.STR_YES+"' ";
+			sql += " and po.isRecycling = '"+TousseDefinition.STR_YES+"' and po.tousseType in ('"+ TousseDefinition.PACKAGE_TYPE_INSIDE +"','"+ TousseDefinition.PACKAGE_TYPE_DISINFECTION +"') ";
 		}
 		
 		//按处理科室查询器械包,改为从CssdHandleTousses表查询,不再按器械包定义里面的查询
@@ -1513,7 +1530,7 @@
 	}
 */
 	/**
-	 * 触摸屏回收
+	 * 触摸屏回收(只搜索需要回收的器械包和消毒物品)
 	 */
 	@Override
 	public String searchInsideTousse(String simpleSpell, String pages,
@@ -2108,7 +2125,6 @@
 				//借用OrgUnit的id字段保存cssdHandleTousses的id值进行修改操作
 				cssdHandleTousses.setId(orgUnit.getId());
 				cssdHandleTousses.setOrgUnitCode(orgUnit.getOrgUnitCoding());
-				cssdHandleTousses.setOrgUnitId(orgUnit.getId());
 				cssdHandleTousses.setOrgUnitName(orgUnit.getName());
 				cssdHandleTousses.setTousseDefinitionId(tousseDefinition.getId());
 				cssdHandleTousses.setTousseName(tousseDefinition.getName());
@@ -2177,7 +2193,6 @@
 			CssdHandleTousses cssdHandleTousses = null;
 			for(TousseDefinition tousseDefinition : tousseDefinitionList){
 				cssdHandleTousses = new CssdHandleTousses();
-				cssdHandleTousses.setOrgUnitId(orgUnit.getId());
 				cssdHandleTousses.setOrgUnitCode(orgUnit.getOrgUnitCoding());
 				cssdHandleTousses.setOrgUnitName(orgUnit.getName());
 				cssdHandleTousses.setTousseDefinitionId(tousseDefinition.getId());