Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
===================================================================
diff -u -r15403 -r15405
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 15403)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 15405)
@@ -249,7 +249,7 @@
 	
 	public static final String ROUTINE_YES = "是";
 	public static final String ROUTINE_NO = "否";
-	private String isRoutine = ROUTINE_YES;  //是否常规发货,默认是常规发货（这里的不常规指的是：正在做"生物监测"时就把这个器械包发货了）
+	private String isRoutine;  //是否常规发货,默认是常规发货（这里的不常规指的是：正在做"生物监测"时就把这个器械包发货了）
 	
 	
 	public static final String[] filterProperties = { "handler",
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js
===================================================================
diff -u -r15403 -r15405
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 15403)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js	(.../invoicePlanExtractedForm.js)	(revision 15405)
@@ -518,13 +518,13 @@
 				}
 				
 				if (goods.noBiologicalMonitoring && (goods.tousseType == '外来器械包' || goods.tousseType == '外来器械拆分小包')) {  //此外来器械包没做生物监测（cjr）
-					if (!confirm(goodsName + '没做生物监测，确定要发货吗？')){
+					if (!confirm('[' + goods.name + ']没做生物监测，确定要发货吗？')){
 						continue;
 					}
 				}
 				
 				if (goods.isRoutine == '否'){  //此外来器械包正在做生物监测（cjr）
-					if (!confirm(goodsName + '正在做生物监测的器械包，需要紧急发货吗？')){
+					if (!confirm('[' + goods.name + ']正在做生物监测的器械包，需要紧急发货吗？')){
 						continue;
 					}
 				}