Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java
===================================================================
diff -u -r22200 -r22205
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 22200)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseInstanceManagerImpl.java	(.../TousseInstanceManagerImpl.java)	(revision 22205)
@@ -3979,9 +3979,9 @@
                         flag = true;
                     }
                     String key =vo.getDefinitionName();
-                    //boolean isCountBarcode="是".equals(vo.getIsTraceable())?true:false;
+                    boolean isCountBarcode=Constants.STR_NO.equals(vo.getIsTraceable());
                     String objName=vo.getDefinitionName(); 
-                    if(bMap.containsKey(key) && isCountBarcode(vo.getBarcode())){//只有支持扫固定条码的包，才去统计
+                    if(bMap.containsKey(key) && isCountBarcode){//只有支持扫固定条码的包，才去统计
                         //已存在 则取出该对象，对象中 objAmount 累加。
                         JSONObject obj = bMap.get(key);
                         int amt=(int) obj.get("objAmount");
@@ -4016,7 +4016,7 @@
                         }else{
                             tousseInBasket.put("isUrgent", TousseDefinition.STR_NO);
                         }
-                        if(isCountBarcodeFor(vo.getBarcode())){
+                        if(isCountBarcode){
                             bMap.put(key, tousseInBasket);
                         }else{
                             bMap.put(vo.getBarcode(), tousseInBasket);  
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r22156 -r22205
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 22156)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 22205)
@@ -552,6 +552,11 @@
 			e.printStackTrace();
 			throw new RuntimeException(e.getMessage());
 		}
+        //灭菌完成后去更新包的失效日期
+        boolean isSuccess = updateTousseInsValidUntilDate(sterilizationRecordIds);
+        if(!isSuccess){
+            return JSONUtil.buildJsonObject(false, "更新包的失效日期失败");
+        }
 		return JSONUtil.buildJsonObject(true, "完成灭菌。");
 	}
 	
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
===================================================================
diff -u -r22156 -r22205
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java	(.../SterilizationRecordAction.java)	(revision 22156)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java	(.../SterilizationRecordAction.java)	(revision 22205)
@@ -330,12 +330,6 @@
 			JSONObject jsonResult = null;
 			jsonResult = sterilizationRecordManager.completeSterilization(
 					sterilizationRecordIds, orgUnitCode,null,finishComfirmer,needFinishConfirm);
-			//灭菌完成后去更新包的失效日期
-			boolean isSuccess = sterilizationRecordManager.updateTousseInsValidUntilDate(sterilizationRecordIds);
-			if(!isSuccess){
-			    StrutsResponseUtils.output(false, "更新包的失效日期失败"); 
-			    return;
-			}
 			StrutsResponseUtils.output(jsonResult);
 		} catch (Exception e) {
 			e.printStackTrace();