Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java
===================================================================
diff -u -r22966 -r23082
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 22966)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java	(.../ForeignTousseApplicationManagerImpl.java)	(revision 23082)
@@ -597,8 +597,12 @@
 				barcodePaperType = ancestorTD.getBarcodePaperType();
 			}
 			tousseDefinition.setBarcodePaperType(barcodePaperType);
-			tousseDefinition.setPrintAmount(ancestorTD.getPrintAmount());
-			tousseDefinition.setPrintOrgSource(ancestorTD.getPrintOrgSource());
+			
+			
+			if(!tousseDefinition.isForeignOrSplitTousse()){
+				tousseDefinition.setPrintOrgSource(ancestorTD.getPrintOrgSource());
+			}
+
 			tousseDefinitionManager.saveOrUpdate(tousseDefinition);
 			
 			obj.put("tousseDefinitionId", tousseDefinition.getId());
@@ -676,6 +680,14 @@
 
 		tousseDefinition.setPackageSize(obj.optString("packageSize"));  //包大小
 		tousseDefinition.setForeignToussePrintAmount(obj.optInt("foreignToussePrintAmount"));  //打印数量
+		
+		if(config != null){
+			tousseDefinition.setPrintAmount(config.getFtPrintAmount());
+			tousseDefinition.setPrintOrgSource(config.getFtPrintOrgSource());
+			tousseDefinition.setPrintAmountSource(config.getFtPrintAmountSource());
+		}
+		
+		
 		tousseDefinition.setSplitNumber(obj.optInt("splitNumber"));  //拆包数量
 		
 		if(forDisplay){
Index: ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js
===================================================================
diff -u -r22663 -r23082
--- ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 22663)
+++ ssts-web/src/main/webapp/disinfectsystem/common/cssdUtils.js	(.../cssdUtils.js)	(revision 23082)
@@ -232,7 +232,7 @@
             				'foreignPackageObjectArray':applicationItems,'sterilizer':sterilizer,'frequency':frequency,'markTousse':markTousse,'hospitalName':hospitalName,'total':total,
             				pageType:tousseObj.pageType,'labelType':tousseObj.pageType,'doctor':foreignTousseAppInfo.doctor,'patient':foreignTousseAppInfo.patient,'surgery':foreignTousseAppInfo.surgery,'operationTime':foreignTousseAppInfo.operationTime,
             				'implantAmount':implantAmount,'supplierName':foreignTousseAppInfo.supplierName,'splitPackagesAmount':foreignTousseAppInfo.splitPackagesAmount,'patientArea':foreignTousseAppInfo.patientArea,
-            				'bedNumber':foreignTousseAppInfo.bedNumber,'depart':foreignTousseAppInfo.ascriptionDepartment,'hospitalNumber': foreignTousseAppInfo.hospitalNumber,'clinicNumber': foreignTousseAppInfo.clinicNumber,'ascriptionDepartment':foreignTousseAppInfo.ascriptionDepartment,
+            				'bedNumber':foreignTousseAppInfo.bedNumber,'hospitalNumber': foreignTousseAppInfo.hospitalNumber,'clinicNumber': foreignTousseAppInfo.clinicNumber,'ascriptionDepartment':foreignTousseAppInfo.ascriptionDepartment,
             				'packageTypeAbbreviation':packageTypeAbbreviation,'applicationItemTotal':foreignTousseAppInfo.applicationItemTotal,'operationRoom':foreignTousseAppInfo.operationRoom,
             				'remark':foreignTousseAppInfo.remark
             		};