Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r21975 -r21977
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 21975)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 21977)
@@ -3577,7 +3577,7 @@
                     String key =vo.getDefinitionName();
                     //boolean isCountBarcode="是".equals(vo.getIsTraceable())?true:false;
                     String objName=vo.getDefinitionName(); 
-                    if(bMap.containsKey(key) && isCountBarcodeFor(vo.getBarcode())){//只有支持扫固定条码的包，才去统计
+                    if(bMap.containsKey(key) && isCountBarcode(vo.getBarcode())){//只有支持扫固定条码的包，才去统计
                         //已存在 则取出该对象，对象中 objAmount 累加。
                         JSONObject obj = bMap.get(key);
                         int amt=(int) obj.get("objAmount");
@@ -3774,11 +3774,11 @@
                     top = "top "+td.getScanAmount();  
                 }
                 if(dbConnection.isOracle()){
-                    rownum =" rownum = "+td.getScanAmount(); 
+                    rownum =" and rownum <= "+td.getScanAmount(); 
                 }
             }
             barcodes=StringUtils.isNotBlank(barcodes)?barcodes:"0";
-            if(TousseDefinition.PACKAGE_TYPE_INSIDE.equals(td.getTousseType())){//器械包
+            if(TousseDefinition.PACKAGE_TYPE_INSIDE.equals(td.getTousseType())|| TousseDefinition.PACKAGE_TYPE_DRESSING.equals(td.getTousseType())){//器械包
                 findSql =" select "+top+" ti.id,ti.tousseName,bd.barcode  from TousseInstance ti left join "
                         + " ProxyDisinfection pd on ti.proxyDisinfection_id=pd.id left join invoicePlan ip on "
                         + " ip.id=pd.id join barcodeDevice bd on bd.id = ti.id where tousseDefinition_id="+td.getId()+"  "
@@ -3793,14 +3793,15 @@
                         + " ip.handleDepartCoding='"+userCode+"')or(ti.proxyDisinfection_id is null and ti.orgUnitCoding='"+userCode+"'))"
                                 + " and reviewBasket_id is null and bd.barcode not in ("+barcodes+") "; 
             }
+            
             if(!StringUtils.isNotBlank(findSql)){
                 return new ArrayList<String>();
             }
             //追加状态
             findSql+=sqlStatus;
             findSql+=rownum;
             findSql+=" order by ti.reviewTime asc";  
-            
+
             ResultSet rs = objectDao.executeSql(findSql);
             List<String> barcodeList = new ArrayList<String>();
             try {