Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r31929 -r31951
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 31929)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 31951)
@@ -6033,7 +6033,9 @@
 			InvoicePlan ip = recyclingRecord.getRecyclingApplication();
 			//回收打印的内容(1:外来器械包明细 2:发货计划),默认为1
 			int recyclingPrintContent = CssdUtils.getSystemSetConfigByNameInt("recyclingPrintContent", 1);
-			if(ip != null && ip instanceof ForeignTousseApplication && recyclingPrintContent == 1){
+			//DGSETYY-7 固定使用else里的数据
+			boolean showRecyclingSaveAndPrintActionButton = CssdUtils.getSystemSetConfigByNameBool("showRecyclingSaveAndPrintActionButton", false);
+			if(!showRecyclingSaveAndPrintActionButton && ip != null && ip instanceof ForeignTousseApplication && recyclingPrintContent == 1){
 				ForeignTousseApplication fa = (ForeignTousseApplication)ip;
 				if(fa.isSecondRecycleForForeignTousse()){
 					//外来器械二次回收,不打印