Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java
===================================================================
diff -u -r16994 -r17031
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 16994)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java	(.../ServiceManagerImpl.java)	(revision 17031)
@@ -617,6 +617,7 @@
 							item.setTousseType(td.getTousseType());
 							item.setDiposable("否");
 							item.setTousseDefinitionId(td.getId());
+							item.setIsInvoice(td.getIsInvoice());
 							item.setExpressRecycling(td.getExpressRecycling());
 							item.setIsApplyEntireTousse(td.getIsApplyEntireTousse());
 							item.setIsCleanedEntirely(td.getIsCleanedEntirely());
Index: ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js
===================================================================
diff -u -r16586 -r17031
--- ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js	(.../printConfig.js)	(revision 16586)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zd5y/print/printConfig.js	(.../printConfig.js)	(revision 17031)
@@ -1889,7 +1889,7 @@
         		  tousseName  = "(" + department + ")" + tousseName;
         	  }*/
         	  //调整为消毒物品的器械包定义是否打印科室如果为是,则打印科室名称
-        	  if(tousseObj.isPrintOrg == true){
+        	  if(tousseObj.printOrgSource != "无"){
         		  tousseName = "(" + department + ")" + tousseName;
         	  }
           }
Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.6.3_4.6.4.sql
===================================================================
diff -u -r17010 -r17031
--- ssts-web/src/main/webapp/dataUpdater/sqls/4.6.3_4.6.4.sql	(.../4.6.3_4.6.4.sql)	(revision 17010)
+++ ssts-web/src/main/webapp/dataUpdater/sqls/4.6.3_4.6.4.sql	(.../4.6.3_4.6.4.sql)	(revision 17031)
@@ -2,4 +2,5 @@
 update TousseDefinition set printOrgSource='回收科室' where isPrintOrg='是';
 update TousseDefinition set printOrgSource='无' where isPrintOrg='否';
 update TousseInstance set discountPrice=fluctuationPrice;
-update InvoiceItem set settlementDiscountPrice=settlementPrice;
\ No newline at end of file
+update InvoiceItem set settlementDiscountPrice=settlementPrice;
+update TousseItem set isInvoice='是';
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js
===================================================================
diff -u -r16455 -r17031
--- ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js	(.../printConfig.js)	(revision 16455)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgszyy/print/printConfig.js	(.../printConfig.js)	(revision 17031)
@@ -1026,7 +1026,7 @@
 }
 function getDepartAndName(obj){
 	ret = '';
-	if(obj.isPrintOrg && !isUndefinedOrNullOrEmpty(obj.department)){
+	if(obj.printOrgSource != "无" && !isUndefinedOrNullOrEmpty(obj.department)){
 		ret += obj.department;
 		ret += '-';
 	}
@@ -1041,7 +1041,7 @@
 		tousseSize = 1;
 	}
 	var ret = "<center>";
-	if(obj.isPrintOrg && !isUndefinedOrNullOrEmpty(obj.department)){
+	if(obj.printOrgSource != "无" && !isUndefinedOrNullOrEmpty(obj.department)){
 		ret += "<font size=" + departSize + "px>";
 		if(departBold){
 			ret += "<b>";
@@ -1056,7 +1056,7 @@
 	if(!departBold){
 		ret += "<b>";
 	}
-	if(obj.isPrintOrg && !isUndefinedOrNullOrEmpty(obj.department)){
+	if(obj.printOrgSource != "无" && !isUndefinedOrNullOrEmpty(obj.department)){
 		ret += '-';
 	}
 	ret += obj.nameWithoutDepart;
@@ -1250,7 +1250,7 @@
         		  tousseName  = "(" + department + ")" + tousseName;
         	  }*/
         	  //调整为消毒物品的器械包定义是否打印科室如果为是,则打印科室名称
-        	  if(tousseObj.isPrintOrg == true){
+        	  if(tousseObj.printOrgSource != "无"){
         		  tousseName = "(" + department + ")" + tousseName;
         	  }
           }
Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
===================================================================
diff -u -r16963 -r17031
--- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 16963)
+++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 17031)
@@ -488,7 +488,7 @@
 	// 打印器械包
 	else{
 		//如果该器械包配置需要打印科室且科室信息不为空,将科室信息拼加至名称前面进行打印
-		if(tousseObj.isPrintOrg == true){
+		if(tousseObj.printOrgSource != "无"){
 			
 			if(tousseObj.department && tousseObj.department != ''){
 				var departPrefix = "(" + tousseObj.department + ")";
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java
===================================================================
diff -u -r16969 -r17031
--- ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 16969)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/AbstractCSSDTest.java	(.../AbstractCSSDTest.java)	(revision 17031)
@@ -2282,6 +2282,7 @@
 					if (td != null) {
 						Long tousseDefinitionId = td.getId();
 						item.setTousseDefinitionId(tousseDefinitionId);
+						item.setIsInvoice(td.getIsInvoice());
 					} else {
 						logger.debug("找不到器械包定义：" + tousseItemName);
 					}