Index: ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js
===================================================================
diff -u -r23660 -r23898
--- ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js	(.../config.js)	(revision 23660)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/config.js	(.../config.js)	(revision 23898)
@@ -120,5 +120,7 @@
   //是否显示核对人
   showInvoiceAssistantSender:false,
   //手术间管理配置
-  enableOperationRoomManagerViwe: true
+  enableOperationRoomManagerViwe: true,
+  //高值耗材申请单打印：true--只要入库后即可打印，false默认为有使用才可打印
+  isPrintExpensiveGoodsApplicationByStatus:true
 }
\ No newline at end of file
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java
===================================================================
diff -u -r23825 -r23898
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java	(.../ExpensiveGoodsApplicationManagerImpl.java)	(revision 23825)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/expensivegoodsapplication/service/ExpensiveGoodsApplicationManagerImpl.java	(.../ExpensiveGoodsApplicationManagerImpl.java)	(revision 23898)
@@ -431,13 +431,16 @@
 			Set<Long> formIds = apps.stream().map(p->p.getId()).collect(Collectors.toSet());
 			Map<Long,List<WorkFlowApprovalTaskVO>> mapVos = workFlowApprovalTaskManager.getForPrint(formIds);
 			String instanceSql = SqlUtils.getNonStringFieldInLargeCollectionsPredicate("invoicePlanId", formIds);
-			instanceSql = String.format("%s and useRecord is not null", instanceSql);//获取已使用高值耗材实例
+			//simon-delete:针对于需求注释此行代码：高值耗材已入库即可打印申请单。
+			if(!CssdUtils.getSystemSetConfigByNameBool("isPrintExpensiveGoodsApplicationByStatus",false)){
+				instanceSql = String.format("%s and useRecord is not null  and status='已入库'", instanceSql);//获取已使用高值耗材实例
+			}	
 			List<ExpensiveGoodsInstance> instances = expensiveGoodsInstanceManager.getByHql(instanceSql);
 			Map<Long,List<Long>> invoicePlanUseedExpensiveGoods = new HashMap<>();
 			if(CollectionUtils.isNotEmpty(instances)){
 				for(ExpensiveGoodsInstance instance : instances){
 					List<Long> list = invoicePlanUseedExpensiveGoods.get(instance.getInvoicePlanId());
-					if(list == null){
+					if(list == null){ 
 						list = new ArrayList<>();
 						invoicePlanUseedExpensiveGoods.put(instance.getInvoicePlanId(), list);
 					}
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js
===================================================================
diff -u -r23813 -r23898
--- ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js	(.../printConfig.js)	(revision 23813)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js	(.../printConfig.js)	(revision 23898)
@@ -1429,6 +1429,20 @@
     		printHtml += "<td>" + (gds.invalidDate?new Date(gds.invalidDate.time).Format('yyyy-MM-dd hh:mm'):"&nbsp;") + "</td>";
     		printHtml += "</tr>";
     	}
+    	//simon-add:对应JR--GZSZYYGZHC-17需求
+    	if((9-goods.length)>0){
+    	for(var j = 0; j <(9-goods.length); ++j){
+    		printHtml += "<tr>";
+    		printHtml += "<td></td>";
+    		printHtml += "<td></td>";
+    		printHtml += "<td></td>";
+    		printHtml += "<td></td>";
+    		printHtml += "<td></td>";
+    		printHtml += "<td></td>";
+    		printHtml += "<td></td>";
+    		printHtml += "</tr>";
+    	}
+    	}
     	printHtml += "<tr>";
     	printHtml += "<td class='left' colspan='2'>验收结论：</td>";
     	printHtml += "<td class='left' colspan='2'>科室验收日期：</td>";