Index: ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/print/printConfig.js
===================================================================
diff -u -r29706 -r30529
--- ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/print/printConfig.js	(.../printConfig.js)	(revision 29706)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/print/printConfig.js	(.../printConfig.js)	(revision 30529)
@@ -160,6 +160,9 @@
 	isPrintDisinfectGoods : true,
     isPrintDisposableGoods : true, // 打印申请单是否打印一次性物品
     isMergePrintTousseAndDisposable : false, // 器械包和一次性物品是否合并打印
+	isMergePrintMultipleSelectedApplications : true,   //是否合并打印在科室申领视图选择的多张申请单
+	isMergePrintTousseAndDisposable : true, // 器械包和一次性物品是否合并打印
+	mergeSameGoods : true,  //同一物品合并打印
     printByOriginalApplications : true, //不合并打印情况下是否按原始单据逐份打印
     printApplyInfo : false,
     printOrder : 1, // 1:优先打印一次性物品， 2：优先打印器械包
@@ -267,7 +270,7 @@
             	    {label : "接收人:___________", dataIndex : '', fontSize : 11, position : ["10cm","30%","90%",5]},
             	    {label : "发货人:", dataIndex : 'sender', fontSize : 11, position : ["10cm","5%","90%",5]},
         	    	{barcodes : [
-        				{codeType : "128Auto", dataIndex : 'departBarcode', position : ["3mm","74%","40mm","8mm"],
+        				{codeType : "128Auto", dataIndex : 'serialNumber2', position : ["3mm","74%","40mm","8mm"],
         					styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true},
         				          {itemNameID: 0, styleName: 'FontSize', styleValue: 6},
         				          {itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true}
Index: ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r29706 -r30529
--- ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 29706)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 30529)
@@ -20,6 +20,7 @@
 		doctorname,
 		patientarea,
         ZYH,
+        tsgr as specialInfection,  
         WDTM as hospitalnumber
   FROM bsoft.CSSD_HospitalNumber INNER JOIN bsoft.BQ_BRWD ON searialNumber=ZYH
 	WHERE (hospitalnumber = #{hospitalnumber} or WDTM = #{hospitalnumber})
@@ -32,18 +33,21 @@
   <![CDATA[
    SELECT 
     patientidcard,
-	patientname,
-	bednumber,
-	oproomid,
-	patientsex,
-	searialnumber,
-	hospitalnumber,
-	operation,
-	patientage,
-	doctorname,
-	patientarea
-	FROM bsoft.CSSD_HospitalNumber h
-	WHERE hospitalnumber = #{hospitalnumber}
+		patientname,
+		bednumber,
+		oproomid,
+		patientsex,
+		searialnumber,
+		hospitalnumber,
+		operation,
+		patientage,
+		doctorname,
+		patientarea,
+        ZYH,
+        tsgr as specialInfection,  
+        WDTM as hospitalnumber
+  FROM bsoft.CSSD_HospitalNumber INNER JOIN bsoft.BQ_BRWD ON searialNumber=ZYH
+	WHERE (hospitalnumber = #{hospitalnumber} or WDTM = #{hospitalnumber})
 	order by searialnumber desc
 	]]>
   </select>
Index: ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
===================================================================
diff -u -r28865 -r30529
--- ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 28865)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 30529)
@@ -8,15 +8,8 @@
   <select id="findPatientInfoByTreatmentNum" resultType="PatientInfoVO">
   <![CDATA[
 SELECT 
-	CLINICNUMBER,
-	PATIENTIDCARD,
-	PATIENTNAME,
-	SERIALNUMBER,
-	OPROOMID,
-	CIRCUITNURSE,
-	OPERATION,
-	DOCTORNAME 
-	from  bsoft.CSSD_ClinicNumber h
+	CLINICNUMBER,PATIENTIDCARD,PATIENTNAME,SERIALNUMBER,OPROOMID,CIRCUITNURSE,PATIENTSEX,WASHHANDNURSE,OPERATION,DOCTORNAME,OPERATIONTIME  
+from  bsoft.CSSD_ClinicNumber h
 	WHERE  h.clinicNumber = #{clinicNumber} 
 	order by clinicnumber desc
 	]]>
Index: ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/menu/menuconfigure.js
===================================================================
diff -u -r29706 -r30529
--- ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/menu/menuconfigure.js	(.../menuconfigure.js)	(revision 29706)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/menu/menuconfigure.js	(.../menuconfigure.js)	(revision 30529)
@@ -413,8 +413,8 @@
 		{hidden :SSTS_ForeignTousse_Manage,text:"外来器械包管理",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
 		{hidden :SSTS_ForeignTousse_Manage,text:"停用的外来器械包",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/foreignTousseView.jsp?editMode=true&onlyShowDisable=yes',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_TousseInstanceManager_ViewMenu,text:"器械包信息",href:WWWROOT+'/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_TousseInstanceManager_ViewMenu,text:"标识牌信息",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/idCardInstanceView.jsp',hrefTarget:linkTarget,leaf:true}
-       // {hidden :SSTS_Tousse,text:"器械包库存",href:WWWROOT+'/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_TousseInstanceManager_ViewMenu,text:"标识牌信息",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/idCardInstanceView.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_Tousse,text:"器械包库存",href:WWWROOT+'/disinfectsystem/toussemanager/toussegoodsstock/tousseGoodsStockView.jsp',hrefTarget:linkTarget,leaf:true}
        // {hidden :SSTS_TousseMaintain_Manager,text:"器械包保养",href:WWWROOT+'/disinfectsystem/toussemanager/toussemaintain/tousseMaintainView.jsp',hrefTarget:linkTarget,leaf:true},
        // {hidden :!sstsConfig.hasOwnProperty('enableComboTousse') || sstsConfig.enableComboTousse == false || SSTS_ComboTousseManager,text:"聚合包定义管理",href:WWWROOT+'/disinfectsystem/basedatamanager/tousse/comboTousse.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
       // {hidden :SSTS_DepartMentTousseManager,text:"基数管理",href:WWWROOT+'/disinfectsystem/departmentStock/departmentStockInputView.jsp',hrefTarget:linkTarget,leaf:true},
@@ -557,7 +557,8 @@
 	    {hidden :!(sstsConfig.enableNewYearWorkloadReport) || SSTS_YearWorkload,text:"年度消毒中心指标工作量统计(新)",href:WWWROOT+'/disinfectsystem/report/cssdWorkloadCountByDate/cssdWorkloadMainReport.jsp',hrefTarget:linkTarget,leaf:true},
 	    {hidden :SSTS_YearWorkload,text:"年度消毒中心指标工作量统计",href:WWWROOT+'/disinfectsystem/reportforms/yearWorkloadReportView2.jsp',hrefTarget:linkTarget,leaf:true},
 	    {hidden :SSTS_StatisticalWorkload,text:(sstsConfig.strengthenStatisticalWorkload ? "消毒供应中心工作人员绩效评分表" : (sstsConfig.statisticalWorkloadName ? sstsConfig.statisticalWorkloadName : "消毒供应中心工作量统计报表")),href:WWWROOT+'/disinfectsystem/reportforms/statisticalWorkloadView.jsp',hrefTarget:linkTarget,leaf:true},
-	  	{hidden :SSTS_SterilizingStoveUseCountReport,text:"灭菌炉使用次数统计报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizingStoveUseCountView.jsp',hrefTarget:linkTarget,leaf:true},
+	  	{hidden :SSTS_WashingMachineStoveUseCountReport,text:"清洗机使用次数统计报表",href:WWWROOT+'/disinfectsystem/reportforms/washingMachineStoveUseCountView.jsp',hrefTarget:linkTarget,leaf:true}, 
+	    {hidden :SSTS_SterilizingStoveUseCountReport,text:"灭菌炉使用次数统计报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizingStoveUseCountView.jsp',hrefTarget:linkTarget,leaf:true},
 	  	{hidden :SSTS_TousseWorkLoadTotalReport,text:(sstsConfig.tousseWorkLoadName ? sstsConfig.tousseWorkLoadName : "器械包工作量统计报表"),href:WWWROOT+'/disinfectsystem/reportforms/tousseWorkLoadView.jsp',hrefTarget:linkTarget,leaf:true}
 	]