Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r28870 -r28900
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 28870)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 28900)
@@ -1019,9 +1019,10 @@
 				    	}
 				    	
 				    	//如果为消毒物品则状态变为已消毒(用于省医高水平消毒的需求,since 2016-01-20 SYF)
-				    	if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseInstance.getTousseDefinition().getTousseType())){
+				    	//GZYKDXFSKQ-70 棉球包(一次性)灭菌完成后，包的状态变成已消毒的问题
+				    	/*if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseInstance.getTousseDefinition().getTousseType())){
 				    		status = TousseInstance.STATUS_DISINFECTED;
-				    	}
+				    	}*/
 				    	
 				    	ExpirationDateInfo expirationDateInfo = null;
 				    	//包装类型
@@ -4839,22 +4840,25 @@
                 tousseInstanceBarcodesInclude.add("'" + tousseInstanceBarcode + "'");
             }
             //新增器械包的处理
-            String findTousseInsSql = "select * from TousseInstance ti join barcodeDevice bd on bd.id = ti.id  where bd.barcode "
+            List<TousseInstance> tiList = tousseInstanceManager.getByHql(String.format("where status='%s' and %s", TousseInstance.STATUS_REVIEWED,
+            		SqlUtils.getStringFieldInLargeCollectionsPredicate("barcode", tousseInstanceBarcodesInclude)));
+            /*String findTousseInsSql = "select ti.id,ti.type from TousseInstance ti join barcodeDevice bd on bd.id = ti.id  where bd.barcode "
                     +" in (" + StringUtils.join(tousseInstanceBarcodesInclude.toArray() , ",") + ")"
-                    + "and status = '已审核'";
+                    + "and status = '已审核'";*/
             String insertSql = "insert into sterilization_tousseInstance (sterilizationRecord_id,tousseInstance_id) values (%s,%s)";
-            ResultSet rs = null;
+            //ResultSet rs = null;
             try {
-                rs = objectDao.executeSql(findTousseInsSql);
+                //rs = objectDao.executeSql(findTousseInsSql);
                 //灭菌程序对应灭菌方式的map
     			Map<String , String> sterilingTypeToSterilingModeMap = new HashMap<String , String>();
-                while(rs.next()){
-                    TousseInstance ti = (TousseInstance) objectDao.getByProperty(TousseInstance.class.getSimpleName(), "id", rs.getLong("id"));
-                    if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(rs.getString("type"))){
+                //while(rs.next()){
+    			for(TousseInstance ti : tiList){
+                    //TousseInstance ti = (TousseInstance) objectDao.getByProperty(TousseInstance.class.getSimpleName(), "id", rs.getLong("id"));
+                    /*if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(rs.getString("type"))){
                         ti.setStatus(TousseInstance.STATUS_DISINFECTED);
-                    }else{
+                    }else{*/
                         ti.setStatus(TousseInstance.STATUS_STERILED);
-                    }
+                    //}
                     ti.setSterileEndTime(endDateOfSr);
                     setValidUntilAndWarningUntil(ti, edsMap, sr);
                     ti.setSterileStartTime(startDateOfSr);
@@ -4873,7 +4877,7 @@
                 result.put(JSONUtil.JSON_KEY_MESSAGE, exHandler.handleException(e));
                 return result;
             }finally{
-                DatabaseUtil.closeResultSetAndStatement(rs);
+                //DatabaseUtil.closeResultSetAndStatement(rs);
             }
         }
       //=========================处理删除器械包
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/TestDisinfectGoodsSteriliManager.java
===================================================================
diff -u -r26308 -r28900
--- ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/TestDisinfectGoodsSteriliManager.java	(.../TestDisinfectGoodsSteriliManager.java)	(revision 26308)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/disinfectgoods/TestDisinfectGoodsSteriliManager.java	(.../TestDisinfectGoodsSteriliManager.java)	(revision 28900)
@@ -1056,7 +1056,7 @@
 		for(TousseInstance tousseInstance : tousseInstanceList){
 			//因为实例方法里有用到jdbcTemplate批处理,所以需要刷新实体对象
 			objectDao.getHibernateSession().refresh(tousseInstance);
-			assertEquals(tousseInstance.getStatus(), TousseInstance.STATUS_DISINFECTED);
+			assertEquals(tousseInstance.getStatus(), TousseInstance.STATUS_STERILED);
 		}
 		container = (Container)objectDao.getByProperty("BarcodeDevice", "barcode", Constants.Barcode.REVIEW_BASKET_1);
 		assertNotNull(container);