Index: ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/config.js
===================================================================
diff -u -r23104 -r24069
--- ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/config.js	(.../config.js)	(revision 23104)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/config.js	(.../config.js)	(revision 24069)
@@ -1,14 +1,14 @@
-var sstsConfig = {
+var sstsConfig = {
   // 禁用标识牌功能
-  disableIdCard : true,
+  disableIdCard : false,
   // 回收时科室显示结算科室
-  showSettleAccountsDepartInRecycling : true,
+  showSettleAccountsDepartInRecycling : false,
   // 审核器械包必须入篮筐（一级供应室）
   mustScanBasketForTousseReview : false,
   // 审核器械包必须入篮筐（二级供应室）
   mustScanBasketForTousseReviewOf2ndSupplyRoom : false,
   // 申请表单的类型：1 ： 通用申请单（组合申请单），2：分开的申请单
-  applicationFormType : 1,
+  applicationFormType : 2,
   hidePackageSpec : false,
   // 申请界面是否显示器械包或消毒物品的的单位
   showTousseUnitColumn : true,		
@@ -29,14 +29,12 @@
   //提交申请单前显示申请的物品清单
   showAppliedGoodsBeforeSubmit : false,
   //是否启用聚合包功能
- // enableComboTousse : true,
+  enableComboTousse : true,
   // 使用记录审核方式， 1: 审核和转换按钮分开； 2：审核和转换按钮合并为1个
   useRecordAuditMode : 2,
   hideApplyDepartColumn : false, // 隐藏申请科室
   hideSettleDepartColumn : true, // 隐藏结算科室
   companyName : "dingxiang",
-  // 是否启用高值耗材功能，默认为否
-  enableExpensiveGoods: true,
   //回收一键入筐
   recycleAllTousseIntoBasket : true,
   //是否显示按照时间查询
@@ -47,8 +45,6 @@
   isShowDeptGroup : true,
   //不覆盖发货计划的打印时间
   overWriteInvoicePlanPrintTime:false,
-  //装配界面显示包装人字段
-  showWrapperField : true,
   //打印发货计划设置页的版本:2
   printRecyclingConfigFormVersion : 2,
   //安卓上,录入灭菌及查看灭菌记录界面,单独添加的器械包组默认展开
@@ -57,8 +53,6 @@
   showPrintFilter: true,
   //清洗筐是否装配完成才能回收
   recycleClassifyBasketAfterPacked:false,
-  //是否禁用人员同步
-  hiddenUserSyncButton: true,
   //自定义装配后是否保留装配数量
   packAmountProcessTypeInDirectPackingView: true,
   //自定义装配后是否保留灭菌日期
@@ -83,12 +77,6 @@
   allowDecreaseRecyclingAmountGreatUnPackingAmount: true,
   //回收时，申请数量与回收数量不一致，是否要确认
   confirmRecyclingAmount:false,
-  //回收时是否可以修改申请单备注
-  modifyRemarkInRecycling:true,
-  //申请器械包时是否自动归还待归还物品
-  autoReturnTousse:true,
-  //外来器械申请时显示原始包定义还是显示最近一次申请的包定义
-  isShowForeignTousseAncestorDefinitionForApply:true,
   //是否启用外来器械默认申请科室配置
   enableForeignTousseApplyDepartment:true,
   // 外来器械拆包名字样式
@@ -97,6 +85,32 @@
   enableClassifyBasketSequence:true,
   //是否隐藏灭菌管理-外部代理灭菌里的申请人
   hideCssdForeignProxyDisinfectionApplicant:true,
-  // 高值耗材自助入库验收后是否发货，默认为否
-  checkedAfterSubmitInvoice : false
+  //装配时自动设置标识牌条码（前提是一个包实例只能装一个篮筐而且是整包清洗）
+  autoSetIDCardBarcodeForPacking : true,
+  //是否启用标识牌跟篮筐绑定。如果启用，在回收的时候，扫描标识牌自动带出跟标识牌绑定的篮筐并将包实例入到篮筐中。
+  enableIdCardBasketBinding:true,
+  //是否显示按照时间查询
+  showTimeSearch : true,
+  //是否显示科室分组选择框
+  isShowDeptGroup : true,
+  //科室申领时间过滤,开始日期是否为当天
+  startDateIsToday : true,
+  //支持部分终止物品
+  enableTerminatePartOfApplication : true,
+  //只有装配完成才能使用清洗篮筐回收.默认为true
+  recycleClassifyBasketAfterPacked:false,
+  //是否显示核对人
+  showInvoiceAssistantSender:false,
+  //允许外来器械部分装配，需要开启篮筐序号
+  allowForeignToussePartiallyPacking: true,
+  //自定义入筐是否启用输入装载数量进行入筐操作
+  enableCustomIntoBasketWithCustomAmount:true,
+  //巡回护士是否允许为空
+  useRecordCircuitNurseAllowBlank:true,
+  //洗手护士是否允许为空
+  useRecordWashHandNurseAllowBlank:true,
+  //添加回收申请单是否加载申领模板,默认为false
+  isLoadApplyTemplateForAddRecycleRecord : true,
+  // 是否显示装配界面的打印按钮
+  packingView_currentTaskGroup_showPrintBtn: true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/print/printConfig.js
===================================================================
diff -u -r23889 -r24069
--- ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/print/printConfig.js	(.../printConfig.js)	(revision 23889)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfy/print/printConfig.js	(.../printConfig.js)	(revision 24069)
@@ -1,4 +1,4 @@
-var appropriationInListConfig = {
+var appropriationInListConfig = {
 		headerFooter : [
 	    	            // 页眉名称
 	    	            {label : "广州中医药附一医院调拨入库单", dataIndex : '', fontSize : 15, position : ["0.3cm","37%","99%",5]},
@@ -1259,6 +1259,242 @@
     LODOP.ADD_PRINT_HTM(0,0,"100%","100%",tableHtml);
 //    LODOP.SET_PRINT_MODE("PRINT_PAGE_PERCENT","Full-Page");
 }
+
+
+var idCardLargeLabelConfig = {
+		customPrint:printIDCardLargeLabel_zsyy
+	}
+var idCardSmallLabelConfig = {
+		customPrint:printIDCardLargeSmall_zsyy
+	}
+var idCardAndTousseImageConfig = {
+		customPrint:printIDCardAndTousseImage_zsyy
+	}
+function printIDCardLargeSmall_zsyy(obj){
+	doGetLodop();
+	
+	// 设置默认字体
+	setDefaultFontNameSizeBold('宋体',12,1);
+	// 默认条码属性
+	LODOP.SET_PRINT_STYLE('ShowBarText', true);
+	LODOP.SET_PRINT_STYLE('FontSize', 6);
+	LODOP.SET_PRINT_STYLE('NotOnlyHighPrecision', true);
+	
+	var name = obj.tousseDefinition.name
+	var fontSize = getFontSizeByStr(name,[
+		                                        {maxLen:8,fontSize:16},
+		                                        {maxLen:10,fontSize:12},
+                                                {maxLen:12,fontSize:10},
+		                                  		{maxLen:20,fontSize:8},
+		                                		{maxLen:1000,fontSize:8}
+		                                  		]);
+	LODOP.ADD_PRINT_TEXT("3mm","1mm","RightMargin:0mm","10mm", name);
+	setFontSizeBold(fontSize,1);// 设置字体
+	setAlignment('center');// 对齐
+
+	var idNumber = "编号：";
+	if(!isUndefinedOrNull(obj.idNumber)){
+		idNumber += obj.idNumber;
+	}
+	LODOP.ADD_PRINT_TEXT("10mm","1mm","RightMargin:0mm","6mm", idNumber);
+	setFontSizeBold(14,0);// 设置字体
+	setAlignment('center');// 对齐
+	
+	LODOP.ADD_PRINT_BARCODE("17mm","13mm","30mm","10mm","128Auto", obj.barcode);// 条码1
+	LODOP.PRINT();
+}
+function buildTousseDefinitionMeterialTable_zsyy(idCardInstance,tousseDefinition,unit){
+	if(isUndefinedOrNullOrEmpty(tousseDefinition)){
+		alert('包定义不能为空!');
+		return null;
+	}
+	var name = tousseDefinition.name;
+	
+	var tableHtml = "<table border ='0' align='center' cellspacing=0>";
+	tableHtml += "<tr>";
+	tableHtml += "<td colspan='6' style='font-size: 17px;' border='0'><center>"+unit+"</center></td>";
+	tableHtml += "</tr>";
+	tableHtml += "<tr>";
+	tableHtml += "<td colspan='6' style='font-size: 25px;' border='0'><center><B>"+name+"</B></center></td>";
+	tableHtml += "</tr>";
+	tableHtml += "</table>";
+	tableHtml += "<table border ='1' align='center' cellspacing=0 style='word-break:break-all;'>";
+	tableHtml += "<tr>";
+	tableHtml += "<td style='font-family:黑体;font-weight:bold;font-size: 15px;' width='100px'><center>器械名称</center></td>";
+	tableHtml += "<td style='font-family:黑体;font-weight:bold;font-size: 15px;' width='33px' align='center'>数量</td>";
+	tableHtml += "<td style='font-family:黑体;font-weight:bold;font-size: 15px;' width='100px'><center>器械名称</center></td>";
+	tableHtml += "<td style='font-family:黑体;font-weight:bold;font-size: 15px;' width='33px' align='center'>数量</td>";
+	tableHtml += "</tr>";
+	
+	var materials = [];
+	if(!isUndefinedOrNullOrEmpty(tousseDefinition) && !isUndefinedOrNullOrEmpty(tousseDefinition.materialInstances)){
+		materials = tousseDefinition.materialInstances;
+	}
+	var total = materials.length;
+	var isEven = true;  //判断材料的数量是奇数还是偶数
+	if(total%2 != 0){
+		isEven = false;
+		total++;
+	}
+	total /= 2;
+	var amount = 0;
+	//之所以用这种方式是因为用户习惯从上往下清点材料，而不是从左往右
+	for(var i=0;i<total;i++){
+		var materialInstance = materials[i];
+		var materialDefinition = materials[i].materialDefinition;
+		var materialName = materialDefinition.name;
+		var specification = materialDefinition.specification;
+		var type = materialDefinition.type;
+		if(specification != 'null' && specification != ""){
+			materialName += "["+specification+"]";
+		}
+		var count = materialInstance.count;
+		if(type != '一次性物品'){
+			amount += parseInt(count);
+		}
+		
+		tableHtml += "<tr>";
+		tableHtml += "<td style='font-family:黑体;font-weight:bold;font-size: 15px;' align='left'>"+materialName;
+		tableHtml += "</td><td style='font-family:黑体;font-weight:bold;font-size: 15px;' align='center'><center>"+count+"</center></td>";
+		
+		if(i==total-1 && !isEven){
+			tableHtml += "<td style='font-family:黑体;font-weight:bold;font-size: 15px' align='left'></td>";
+			tableHtml += "<td style='font-family:黑体;font-weight:bold;font-size: 15px' align='center'><center></center></td>";
+		}else{
+			var record2 = materials[i+total];
+			var materialName2 = record2.materialDefinition.name;
+			var specification2 = record2.materialDefinition.specification;
+			var type2 = record2.materialDefinition.type;
+			if(specification2 != 'null' && specification2 != ""){
+				materialName2 += "["+specification2+"]";
+			}
+			var count2 = record2.count;
+			if(type2 != '一次性物品'){
+				amount += parseInt(count2);
+			}
+			tableHtml += "<td style='font-family:黑体;font-weight:bold;font-size: 15px;' align='left'>"+materialName2;
+			tableHtml += "</td><td style='font-family:黑体;font-weight:bold;font-size: 15px;' align='center'><center>"+count2+"</center>";
+			tableHtml += "</td>";
+		}
+		
+		tableHtml += "</tr>";
+	}
+	// 描述
+	var description = idCardInstance.description;
+	if(!isUndefinedOrNullOrEmpty(description)){
+		tableHtml += "<tr>";
+		tableHtml += "<td colspan='4' style='font-family:黑体;font-weight:bold;font-size: 15px;' >"+description+"</td>";
+		tableHtml += "</tr>";
+	}
+	
+	tableHtml += "</table>";
+	
+	var ret = {};
+	ret.tableHtml = tableHtml;
+	ret.amount = amount;
+	return ret;
+}
+function printIDCardLargeLabel_zsyy(idCardInstance){
+	if(isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition)){
+		alert('包定义不能为空!');
+		return;
+	}
+	doGetLodop();
+	var barcode = idCardInstance.barcode;
+	var date = idCardInstance.printDate;
+	var userName = idCardInstance.userName;
+	var unit = idCardInstance.unit;
+	
+	var ret = buildTousseDefinitionMeterialTable_zsyy(idCardInstance,idCardInstance.tousseDefinition,unit);
+	var tableHtml = ret.tableHtml + "<table border ='0' align='center' cellspacing=0>";
+	//条码，打印人和时间和器械数量
+	if(barcode != '' && userName != '' && date != ''){
+		tableHtml += "<tr>";
+		tableHtml += "<td colspan='2' style='font-family:黑体;font-weight:bold;font-size: 12px;' height='80px' align='center' border='0' >";
+		tableHtml += "<img src='" + WWWROOT + "/disinfectSystem/printBarcodeAction!printBarcodeImage.do?barcode=" + barcode + "'/>";
+		tableHtml += "</br><center>"+barcode;
+		tableHtml += "</center></td>";
+		tableHtml += "</td>";
+		tableHtml += "<td colspan='2' style='font-family:黑体;font-weight:bold;font-size: 15px;' height='30px' align='center' border='0'>器械总数量:"+ret.amount+"件";
+		tableHtml += "</td>";
+		tableHtml += "</tr>";
+	}else{
+		tableHtml += "<tr>";
+		tableHtml += "<td colspan='4' style='font-family:黑体;font-weight:bold;font-size: 20px;' height='70px' align='center' border='0'>器械总数量:"+ret.amount+"件";
+		tableHtml += "</td>";
+		tableHtml += "</tr>";
+	}
+	
+	//告警语(已注释不打印,经省医护长与封枫、关总确认 since 2016-01-25 SYF)
+	tableHtml += "<tr>";
+	tableHtml += "<td colspan='4' style='font-family:黑体;font-weight:bold;font-size: 20px;' border='0'><center>***需要回收，切勿丢失***</center></td>";
+	tableHtml += "</tr>";
+	tableHtml += "</table><hr width='100%' height='3' />";
+
+	LODOP.ADD_PRINT_HTM(0,0,"95%","100%","<body leftmargin='8px' topmargin=0>"+tableHtml+"</body>");
+	LODOP.PRINT();
+}
+function printIDCardAndTousseImage_zsyy(idCardInstance){
+	if(isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition)){
+		alert('包定义不能为空!');
+		return;
+	}
+	doGetLodop();
+	var barcode = idCardInstance.barcode;
+	var date = idCardInstance.printDate;
+	var userName = idCardInstance.userName;
+	var unit = idCardInstance.unit;
+	
+	var ret = buildTousseDefinitionMeterialTable_zsyy(idCardInstance,idCardInstance.tousseDefinition,unit);
+	var tableHtml = ret.tableHtml ;
+	// 打印图片
+	if(idCardInstance.tousseDefinition.imagesCount > 0){
+		// 空行
+		tableHtml += "<table border ='0' align='center' width='100%' cellspacing=0>";
+		tableHtml += "<tr height='25px'>";
+		tableHtml += "<td style='font-family:黑体;font-weight:bold;font-size: 20px;' width='100%' height='100%' align='center' border='0'>";
+		tableHtml += "</td>";
+		tableHtml += "</tr>";
+		tableHtml += "</table>";
+		
+		var url = WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getToussePic.do?id=' + idCardInstance.tousseDefinition.id + '&page=' + 1 +'&time='+new Date();
+		tableHtml += "<table border ='0' align='center' cellspacing=0>";
+		tableHtml += "<tr >";
+		tableHtml += "<td colspan='4' style='font-family:黑体;font-weight:bold;font-size: 20px;' width='350px' height='350px' align='center' border='0'>";
+		tableHtml += "<img src='" + url + "' width='100%' height='100%'/>";
+		tableHtml += "</td>";
+		tableHtml += "</tr>";
+		tableHtml += "</table>";
+	}
+	tableHtml += "<table border ='0' align='center' cellspacing=0>";
+	//条码，打印人和时间和器械数量
+	if(barcode != '' && userName != '' && date != ''){
+		tableHtml += "<tr>";
+		tableHtml += "<td colspan='2' style='font-family:黑体;font-weight:bold;font-size: 12px;' height='80px' align='center' border='0' >";
+		tableHtml += "<img src='" + WWWROOT + "/disinfectSystem/printBarcodeAction!printBarcodeImage.do?barcode=" + barcode + "'/>";
+		tableHtml += "</br><center>"+barcode;
+		tableHtml += "</center></td>";
+		tableHtml += "</td>";
+		tableHtml += "<td colspan='2' style='font-family:黑体;font-weight:bold;font-size: 15px;' height='30px' align='center' border='0'>器械总数量:"+ret.amount+"件";
+		tableHtml += "</td>";
+		tableHtml += "</tr>";
+	}else{
+		tableHtml += "<tr>";
+		tableHtml += "<td colspan='4' style='font-family:黑体;font-weight:bold;font-size: 20px;' height='70px' align='center' border='0'>器械总数量:"+ret.amount+"件";
+		tableHtml += "</td>";
+		tableHtml += "</tr>";
+	}
+	
+	//告警语(已注释不打印,经省医护长与封枫、关总确认 since 2016-01-25 SYF)
+	tableHtml += "<tr>";
+	tableHtml += "<td colspan='4' style='font-family:黑体;font-weight:bold;font-size: 20px;' border='0'><center>***需要回收，切勿丢失***</center></td>";
+	tableHtml += "</tr>";
+	tableHtml += "</table><hr width='100%' height='3' />";
+
+	LODOP.ADD_PRINT_HTM(0,0,"95%","100%","<body leftmargin='8px' topmargin=0>"+tableHtml+"</body>");
+	LODOP.PRINT();
+}
+
 var printConfig = {
     //发货计划单
     invoicePlan : invoicePlanPrintConfig,
@@ -1287,7 +1523,10 @@
     appropriation : appropriationConfig,
     
     purchasePlan : purchasePlanConfig,
-    
+     // 标识牌
+    idCardLargeLabel:idCardLargeLabelConfig,
+    idCardSmallLabel:idCardSmallLabelConfig,// 小标签
+    idCardAndTousseImage: idCardAndTousseImageConfig,
     // 小标签:50x30规格
     smallLabel : smallLabelConfig,
     // 中标签:60x80规格