Index: ssts-web/src/main/webapp/disinfectsystem/config/szszyy/config.js
===================================================================
diff -u -r23237 -r25194
--- ssts-web/src/main/webapp/disinfectsystem/config/szszyy/config.js	(.../config.js)	(revision 23237)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szszyy/config.js	(.../config.js)	(revision 25194)
@@ -29,7 +29,7 @@
   //提交申请单前显示申请的物品清单
   showAppliedGoodsBeforeSubmit : false,
   // 使用记录审核方式， 1: 审核和转换按钮分开； 2：审核和转换按钮合并为1个
-  useRecordAuditMode : 2,
+  useRecordAuditMode : 3,
   hideApplyDepartColumn : true, // 隐藏申请科室
   hideSettleDepartColumn : false, // 隐藏结算科室
   //回收时，申请数量与回收数量不一致，是否要确认
@@ -52,8 +52,34 @@
   printInvoiceVersion:2,
   //回收是否显示打印清点按钮
   showRecyclingPrintDetail:true,
-  //是否审核时打印标签
-  printLabelWhenReviewing:true,
   //一次性物品库存不足时，是否允许申领
-  allowApplyDisposableGoodsWhenUnderstock : false
+  allowApplyDisposableGoodsWhenUnderstock : false,
+  //审核页面是否需要显示“病人姓名”字段
+  showReviewPatientName:true,
+  //审核页面是否需要显示“住院号”字段
+  showReviewHospitalNum:true,
+  //是否显示发货计划下送责任人。默认值为true,表示显示。
+  showInvoicePersonInCharge : false,
+  //发货计划核对人，是否必填。默认为true,表示必填。
+  invoiceAssistantSenderRequired : false,
+  //是否启用自定义回收的篮筐序号。目前就外来器械拆包有用
+  enableClassifyBasketSequence:true,
+  //装配界面扫描篮筐后，是否自动勾选该篮筐下的第一个包
+  packingView_autoSelectTousseWhenScanBasket:true,
+  //是否启用标识牌跟篮筐绑定。如果启用，在回收的时候，扫描标识牌自动带出跟标识牌绑定的篮筐并将包实例入到篮筐中
+  enableIdCardBasketBinding:true,
+  //是否启用聚合包功能
+  enableComboTousse:true,
+  //只有装配完成才能使用清洗篮筐
+  recycleClassifyBasketAfterPacked : false,
+  //待回收列表,扫描没有待回收申请单的科室，是否新建回收申请单
+  newRecyclingApplicationWhenScanNoApplicationDepart:true,
+  //装配时自动设置标识牌条码（前提是一个包实例只能装一个篮筐而且是整包清洗）
+  autoSetIDCardBarcodeForPacking : true,
+  //公司名称 "dingxiang"显示主页显示丁香的logo,不配置或者配为"forgon",显示孚峻的logo
+  companyName : "dingxiang",
+  //是否允许回收数量减小的部分超过待装配数量
+  allowDecreaseRecyclingAmountGreatUnPackingAmount: true,
+  //是否在个人桌面显示外部代理灭菌的图标
+  showForeignProxySterilizationDesktopIcon:true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/szszyy/print/printConfig.js
===================================================================
diff -u -r23557 -r25194
--- ssts-web/src/main/webapp/disinfectsystem/config/szszyy/print/printConfig.js	(.../printConfig.js)	(revision 23557)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szszyy/print/printConfig.js	(.../printConfig.js)	(revision 25194)
@@ -1175,14 +1175,52 @@
     	        }
 }
 var idCardLargeLabelConfig = {
-		customPrint:printIDCardLargeLabel_szszyy
+		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 printIDCardLargeLabel_szszyy(idCardInstance){
-	if(isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition)){
+function buildTousseDefinitionMeterialTable_zsyy(idCardInstance,tousseDefinition,unit){
+	if(isUndefinedOrNullOrEmpty(tousseDefinition)){
 		alert('包定义不能为空!');
-		return;
+		return null;
 	}
-	
 	setDisposableGoodsItemsToMaterialInstances(idCardInstance);
 	doGetLodop();
 	
@@ -1209,8 +1247,8 @@
 	tableHtml += "</tr>";
 	
 	var materials = [];
-	if(!isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition) && !isUndefinedOrNullOrEmpty(idCardInstance.tousseDefinition.materialInstances)){
-		materials = idCardInstance.tousseDefinition.materialInstances;
+	if(!isUndefinedOrNullOrEmpty(tousseDefinition) && !isUndefinedOrNullOrEmpty(tousseDefinition.materialInstances)){
+		materials = tousseDefinition.materialInstances;
 	}
 	var total = materials.length;
 	var isEven = true;  //判断材料的数量是奇数还是偶数
@@ -1236,12 +1274,12 @@
 		}
 		
 		tableHtml += "<tr>";
-		tableHtml += "<td style='font-size: 15px;' align='left'>"+materialName;
-		tableHtml += "</td><td style='font-size: 15px;' align='center'><center>"+count+"</center></td>";
+		tableHtml += "<td style='font-family:黑体;font-weight:bold;font-size: 15px;' align='left' width='100px'>"+materialName;
+		tableHtml += "</td><td style='font-family:黑体;font-weight:bold;font-size: 15px;' align='center' width='33px'><center>"+count+"</center></td>";
 		
 		if(i==total-1 && !isEven){
-			tableHtml += "<td style='font-size: 15px' align='left'></td>";
-			tableHtml += "<td style='font-size: 15px' align='center'><center></center></td>";
+			tableHtml += "<td style='font-family:黑体;font-weight:bold;font-size: 15px' align='left' width='100px'></td>";
+			tableHtml += "<td style='font-family:黑体;font-weight:bold;font-size: 15px' align='center' width='33px'><center></center></td>";
 		}else{
 			var record2 = materials[i+total];
 			var materialName2 = record2.materialDefinition.name;
@@ -1254,44 +1292,130 @@
 			if(type2 != '一次性物品'){
 				amount += parseInt(count2);
 			}
-			tableHtml += "<td style='font-size: 15px;' align='left'>"+materialName2;
-			tableHtml += "</td><td style='font-size: 15px;' align='center'><center>"+count2+"</center>";
+			tableHtml += "<td style='font-family:黑体;font-weight:bold;font-size: 15px;' align='left' width='100px'>"+materialName2;
+			tableHtml += "</td><td style='font-family:黑体;font-weight:bold;font-size: 15px;' align='center' width='33px'><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-size: 12px;' height='80px' align='center' border='0' >";
+		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-size: 15px;' height='30px' align='center' border='0'>器械总数量:"+amount+"件";
+		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-size: 20px;' height='70px' align='center' border='0'>器械总数量:"+amount+"件";
+		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-size: 20px;' border='0'><center>***需要回收，切勿丢失***</center></td>";
+	tableHtml += "<td colspan='4' style='font-family:黑体;font-weight:bold;font-size: 20px;' border='0'><center>***需要回收，切勿丢失***</center></td>";
 	tableHtml += "</tr>";
-	tableHtml += "</table>";
+	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,