Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java
===================================================================
diff -u -r17512 -r17944
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 17512)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseInstance.java	(.../TousseInstance.java)	(revision 17944)
@@ -162,7 +162,7 @@
 	
 	private Date invoiceSendTime; // 发货时间
 
-	private String packageType; // 包类型
+	private String packageType; // 包装类型
 
 	private TousseDefinition tousseDefinition;// 器械包定义
 
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java
===================================================================
diff -u -r17442 -r17944
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java	(.../TousseDefinition.java)	(revision 17442)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java	(.../TousseDefinition.java)	(revision 17944)
@@ -1190,7 +1190,7 @@
 	}
 	@Transient
 	public String getIncludeImplantStr() {
-		if(includeImplant == INCLUDE_IMPLANT){
+		if(includeImplant != null && includeImplant.intValue() == INCLUDE_IMPLANT){
 			return STR_YES;
 		}
 		return STR_NO;