Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java
===================================================================
diff -u -r22004 -r22092
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java	(.../SupplyRoomConfig.java)	(revision 22004)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/supplyroomconfig/SupplyRoomConfig.java	(.../SupplyRoomConfig.java)	(revision 22092)
@@ -17,7 +17,9 @@
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
+
 import com.forgon.Constants;
+import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.tools.string.StringTools;
 
 /**
@@ -77,8 +79,17 @@
 	private String ftDefaultSterilingMethod; //外来器械默认的灭菌程序
 	
 	private String ftDefaultPackageType; //外来器械默认的包装类型
-	
 	/**
+	 * 打印科室来源,默认为无
+	 * 有资产归属、回收科室、无三个选择可选,对应之前的是否打印科室字段是和否
+	 */
+	private String ftPrintOrgSource = TousseDefinition.PRINGORGSOURCE_NONE;
+
+	/**
+	 * 打印份数，默认为1
+	 */
+	private Integer ftPrintAmount = 1;
+	/**
 	 * 外来器械包默认申请科室
 	 */
 	private String ftApplyDepartment;
@@ -238,6 +249,22 @@
 		this.ftDefaultPackageType = ftDefaultPackageType;
 	}
 
+	public String getFtPrintOrgSource() {
+		return ftPrintOrgSource;
+	}
+
+	public Integer getFtPrintAmount() {
+		return ftPrintAmount;
+	}
+
+	public void setFtPrintOrgSource(String ftPrintOrgSource) {
+		this.ftPrintOrgSource = ftPrintOrgSource;
+	}
+
+	public void setFtPrintAmount(Integer ftPrintAmount) {
+		this.ftPrintAmount = ftPrintAmount;
+	}
+
 	public boolean isPrintUserFullName() {
 		return printUserFullName;
 	}
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
===================================================================
diff -u -r22004 -r22092
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 22004)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 22092)
@@ -765,6 +765,8 @@
 				ancestorTD.setParentID(ancestorTD.getId());
 				ancestorTD.setAncestorID(ancestorTD.getId());
 				ancestorTD.setBarcodePaperType(barcodePaperType);
+				ancestorTD.setPrintAmount(config.getFtPrintAmount());
+				ancestorTD.setPrintOrgSource(config.getFtPrintOrgSource());
 			}
 			tousseDefinition.setAncestorID(ancestorTD.getId());
 			tousseDefinition.setBarcodePaperType(ancestorTD.getBarcodePaperType());
@@ -786,6 +788,8 @@
 				barcodePaperType = ancestorTD.getBarcodePaperType();
 			}
 			tousseDefinition.setBarcodePaperType(barcodePaperType);
+			tousseDefinition.setPrintAmount(ancestorTD.getPrintAmount());
+			tousseDefinition.setPrintOrgSource(ancestorTD.getPrintOrgSource());
 			tousseDefinitionManager.saveOrUpdate(tousseDefinition);
 			
 			obj.put("tousseDefinitionId", tousseDefinition.getId());
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r21914 -r22092
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 21914)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 22092)
@@ -1289,7 +1289,46 @@
 										}
 									}
 		             		  }]
-		             	  }
+		             	  },{
+					    	  columnWidth : .25,
+					    	  layout : 'form',
+							  labelWidth : 180,
+							  labelAlign:"right",
+					    	  items:[{
+					    		  xtype : 'combo',
+					    		  fieldLabel : '打印科室来源',
+					    		  id : 'ftPrintOrgSource',
+					    		  name : 'ftPrintOrgSource',
+					    		  valueField : 'value',
+					    		  displayField : 'value',
+					    		  store : new Ext.data.SimpleStore( {
+					    				fields : [ 'value'],
+					    				data : [['资产归属'],['回收科室'],['无']]
+					    			}),
+					    		  editable : false,
+					    		  forceSelection : true,
+					    		  allowBlank : false,
+					    		  value : '无',
+					    		  mode : 'local',
+					    		  triggerAction : 'all',
+					    		  anchor : '100%'
+					    	  }]
+					      },{
+		    		    	  layout : 'form',
+		    		    	  columnWidth : .25,
+		    				  labelWidth : 180,
+		    		    	  items:[{
+		    		    		  xtype : 'numberfield',
+		    		    		  fieldLabel : "打印份数",
+		    		    		  allowBlank : false,
+		    		    		  allowNegative:false,
+		    		    		  minValue: 1,
+		    		    		  name : 'ftPrintAmount',
+		    		    		  id : 'ftPrintAmount',
+		    		    		  anchor : '100%'
+		    		    	  }]
+		    		      }
+		             	  
 					]
                 },
                 {
@@ -2513,6 +2552,10 @@
             		var dptCodeOfForeignTousse = Ext.getCmp("dptCodeOfForeignTousse").getValue();
             		var dptNameOfForeignTousse = Ext.getCmp("dptNameOfForeignTousse").getValue();
             		var ftDefaultSterilingMethod = Ext.getCmp("ftDefaultSterilingMethod").getValue();
+            		
+            		var ftPrintOrgSource = Ext.getCmp("ftPrintOrgSource").getValue();
+            		var ftPrintAmount = Ext.getCmp("ftPrintAmount").getValue();
+            		
             		//外来器械默认申请科室
             		var ftApplyDepartment = '';
             		var ftApplyDepartmentCode = '';
@@ -2574,6 +2617,8 @@
 	                    	foreignTousseCleanedEntirely:foreignTousseCleanedEntirely,//
 	                    	foreignTousseNeedReview:foreignTousseNeedReview,//
 	                    	ftDefaultSterilingMethod:ftDefaultSterilingMethod,//
+	                    	ftPrintOrgSource:ftPrintOrgSource,
+	                    	ftPrintAmount:ftPrintAmount,
 	                    	ftApplyDepartment:ftApplyDepartment,//
 	                    	ftApplyDepartmentCode:ftApplyDepartmentCode,//
 	                    	ftDefaultPackageType:ftDefaultPackageType,//
@@ -2802,6 +2847,8 @@
 			Ext.getCmp('isCustomTousseCleanEntirely').setValue(supplyRoomConfig.isCustomTousseCleanEntirely);
 			Ext.getCmp('foreignTousseCleanedEntirely').setValue(supplyRoomConfig.foreignTousseCleanedEntirely);
 			Ext.getCmp('foreignTousseNeedReview').setValue(supplyRoomConfig.foreignTousseNeedReview);
+			Ext.getCmp('ftPrintOrgSource').setValue(supplyRoomConfig.ftPrintOrgSource);
+			Ext.getCmp('ftPrintAmount').setValue(supplyRoomConfig.ftPrintAmount);
   		}
   });
   	
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java
===================================================================
diff -u -r21914 -r22092
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 21914)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/action/SupplyRoomConfigAction.java	(.../SupplyRoomConfigAction.java)	(revision 22092)
@@ -141,6 +141,17 @@
 	
 	private Integer mergeTousseRuleForInvoiceBatchPrint = 0;
 	
+	/**
+	 * 打印科室来源,默认为无
+	 * 有资产归属、回收科室、无三个选择可选,对应之前的是否打印科室字段是和否
+	 */
+	private String ftPrintOrgSource = TousseDefinition.PRINGORGSOURCE_NONE;
+
+	/**
+	 * 打印份数，默认为1
+	 */
+	private Integer ftPrintAmount = 1;
+	
 	public void setObjectDao(ObjectDao objectDao) {
 		this.objectDao = objectDao;
 	}
@@ -859,6 +870,8 @@
 		String ftDefaultSterilingMethod = rq.getParameter("ftDefaultSterilingMethod");
 		supplyRoomConfig.setFtDefaultSterilingMethod(ftDefaultSterilingMethod);
 		
+		supplyRoomConfig.setFtPrintAmount(ftPrintAmount);
+		supplyRoomConfig.setFtPrintOrgSource(ftPrintOrgSource);
 		//外来器械默认申请科室
 		String ftApplyDepartment = rq.getParameter("ftApplyDepartment");
 		String ftApplyDepartmentCode = rq.getParameter("ftApplyDepartmentCode");
@@ -1686,5 +1699,13 @@
 			Integer expensiveGoodsBillWarningTime) {
 		this.expensiveGoodsBillWarningTime = expensiveGoodsBillWarningTime;
 	}
+
+	public void setFtPrintOrgSource(String ftPrintOrgSource) {
+		this.ftPrintOrgSource = ftPrintOrgSource;
+	}
+
+	public void setFtPrintAmount(Integer ftPrintAmount) {
+		this.ftPrintAmount = ftPrintAmount;
+	}
 	
 }