Index: ssts-web/src/main/webapp/disinfectsystem/config/szslgqdermyy/config.js
===================================================================
diff -u -r32379 -r38282
--- ssts-web/src/main/webapp/disinfectsystem/config/szslgqdermyy/config.js	(.../config.js)	(revision 32379)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szslgqdermyy/config.js	(.../config.js)	(revision 38282)
@@ -80,7 +80,7 @@
   //科室申领打开申请单，是否显示回收数量列
   isShowRecyclingAmount:true,
   //使用记录审核方式
-  useRecordAuditMode:3,
+  useRecordAuditMode:1,
   //是否根据科室加载模板
   isOpenLoadTemplateByUnit:true,
   //使用记录合并，根据科室进行合并
@@ -107,6 +107,45 @@
   desktopShortcutIconsConfig:["外部代理灭菌","外来器械申请"],
   //领用单是否显示库存为0的批次
   notShowZeroStorage:true,
+  //启用外来器械默认申请科室配置
+  enableForeignTousseApplyDepartment:true,
+  //PDA签收模式
+  signModeOfPDASignModule:2,
+  //PDA按器械包进行科室签收的版本,该版本有按日期过滤
+  departmentSignByTousseVersionForPDA:2,
+  //培训管理
+  hideTrainingManage:false,
+  //回收时录入质量监测功能
+  recycleAddQualityMonitoring:true,
+  //允许部分回收
+  enablePartRecycle:true,
+  //加急功能
+  enableUrgentFunction:true,
+  //收费记录管理
+  isEnableChargeFunction:true,
+  //监测包
+  enableScanSterilizationMonitoringPackage:true,
+  //登录后检测是否符合强密码要求，needBeStrongPwdWhenModifyPwd配置的规则
+  forceUserChangePwdWhenNotMeetPwdComplexityReq:true,
+  //minPwdLength:密码长度，'containLetter':包含字母,'containUppercaseLetter':包含大写,'containLowerCaseLetter':包含小写,
+  //'containSpecialChar':包含特殊字符,'containNumber':包含数字,'passwordNotContainLoginName':不含登录名,
+  //'passwordComplexityReq1':以下三选二，1:英文字母,2:数字，3:特殊字符
+  //'windowsPasswordComplexityReq':以下四选三，1:大写英文字母,2:小写英文字母3:数字，4:特殊字符
+  needBeStrongPwdWhenModifyPwd:
+  {'minPwdLength':8,
+  'containLetter':true,
+  'containUppercaseLetter':true,
+  'containLowerCaseLetter':true,
+  'containSpecialChar':true,
+  'containNumber':true,
+  'passwordNotContainLoginName':false,
+  'passwordComplexityReq1':false,
+  'windowsPasswordComplexityReq':true},
+  //是否隐藏“一键入炉”按钮
+  'isHideBtnBatchAddTousse':true,
   //消毒物品是否显示材料明细
-  hideMaterialsListOfDisinfectionGoodsApplyEntire:true
+  hideMaterialsListOfDisinfectionGoodsApplyEntire:true,
+  //灭菌炉接口，是否采用灭菌开始时间来匹配接口文件的数据
+  sterilizaMatchPatternForDate : true
+
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/szslgqdermyy/spring/timer.xml
===================================================================
diff -u -r36883 -r38282
--- ssts-web/src/main/webapp/disinfectsystem/config/szslgqdermyy/spring/timer.xml	(.../timer.xml)	(revision 36883)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szslgqdermyy/spring/timer.xml	(.../timer.xml)	(revision 38282)
@@ -3,13 +3,36 @@
 
 <beans>
 
+    <!-- 定时处理灭菌炉，清洗机等设备的数据 -->
+<bean id="deviceInterfaceDataInvokingTask"
+    class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+    <property name="targetObject">
+        <ref bean="deviceInterfaceDataProcess" />
+    </property>
+    <property name="targetMethod">
+        <value>processDeviceInterfaceData</value>
+    </property>
+    <property name="concurrent" value="false"/>
+</bean>
+ 
+<bean id="deviceInterfaceDataProcessTimerTask"
+    class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+    <property name="jobDetail">
+        <ref bean="deviceInterfaceDataInvokingTask" />
+    </property>
+    <property name="cronExpression">
+        <value>0 0/2 * * * ?</value>
+    </property>
+</bean>
+    
 	<!-- 任务调度配置 -->
     <bean id="schedulerFactoryBean" class = "org.springframework.scheduling.quartz.SchedulerFactoryBean">
         <property name="triggers">
             <list>
-            	<ref bean="deviceInterfaceDataProcessTimerTask"/>
+             	<!-- 设备接口处理任务 -->
+                <ref bean="deviceInterfaceDataProcessTimerTask"/>
+
             </list>
         </property>
     </bean>
-    
 </beans>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/szslgqdermyy/print/printConfig.js
===================================================================
diff -u -r32379 -r38282
--- ssts-web/src/main/webapp/disinfectsystem/config/szslgqdermyy/print/printConfig.js	(.../printConfig.js)	(revision 32379)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szslgqdermyy/print/printConfig.js	(.../printConfig.js)	(revision 38282)
@@ -162,6 +162,8 @@
     isMergePrintTousseAndDisposable : false, // 器械包和一次性物品是否合并打印
     printByOriginalApplications : true, //不合并打印情况下是否按原始单据逐份打印
 	printApplyInfo : false,
+	mergeSameGoods:true,
+	isMergePrintMultipleSelectedApplications:true,
 	print2column:true,//是否打印2列
     printOrder : 1, // 1:优先打印一次性物品， 2：优先打印器械包
     // 在器械包和一次性物品不合并打印的情况下，消毒物品打印方式：
@@ -551,54 +553,6 @@
     	            ]
     	        }
 }
-var recyclingInvoiceTotalConfig_bjdxzlyy = {
-	customPrint:printRecyclingInvoiceTotalConfig_bjdxzlyy,
-	amountType:true//true表示取回收数量；false或空表示取申请数量
-}
-
-function printRecyclingInvoiceTotalConfig_bjdxzlyy(time,obj){
-	if(obj.data.length > 0){
-		var headHtml = "<div style='font-size:22px;text-align: center;height:50px;line-height:50px;'><b>科室申领物品汇总单</b></div>";
-		var tableHtml ="<table border ='1' cellspacing='0' style='width:100%;'>";
-		tableHtml += "<tr height='20px' style='width:100%;font-size: 15px;text-align:center;'>";
-		tableHtml += "<td style='width:20%;font-size: 15px;'>名称</td>";
-		tableHtml += "<td style='width:4%;font-size: 15px;'>数量</td>";
-		tableHtml += "<td style='width:20%;font-size: 15px;'>名称</td>";
-		tableHtml += "<td style='width:4%;font-size: 15px;'>数量</td>";
-		tableHtml += "</tr>";
-		for(var i=0;i < obj.data.length;){
-			var num = obj.data[i+1];
-			var tosseName;
-			var amount;
-			if(num == "" || num == undefined || num == null){
-				tosseName = "";
-				amount = "";
-			}else{
-				tosseName = num.tosseName;
-				amount = num.amount;
-			}
-			
-			tableHtml += "<tr height='20px' style='width:100%;font-size: 15px;text-align:center;'>";
-			tableHtml += "<td style='width:20%;font-size: 15px;'>"+obj.data[i].tosseName+"</td>";
-			tableHtml += "<td style='width:4%;font-size: 15px;'>"+obj.data[i].amount+"</td>";
-			tableHtml += "<td style='width:20%;font-size: 15px;'>"+tosseName+"</td>";
-			tableHtml += "<td style='width:4%;font-size: 15px;'>"+amount+"</td>";
-			tableHtml += "</tr>";
-			i = i+2;
-		}
-		tableHtml += "</table>";
-		var printTimeHtml = "<div style='width:100%;font-size: 15px;height:40px;'>打印日期：&nbsp;"+time+"</div>";
-		//打印设置
-		var LODOP = getLodop(document.getElementById('LODOP'),document.getElementById('LODOP_EM'));
-		//打印日期
-		LODOP.ADD_PRINT_HTM(80,"5%","90%","100%",printTimeHtml);
-		//项目内容
-		LODOP.ADD_PRINT_TABLE(106,"5%","90%","100%",tableHtml);
-		//标题
-		LODOP.ADD_PRINT_HTM(20,20,"95%",30,headHtml);
-		LODOP.PRINT();
-	}
-}
 // 一次性物品盘盈盘亏单
 var godownStockTakeConfig = {
         headerFooter : [
@@ -1156,6 +1110,151 @@
 
 	LODOP.ADD_PRINT_HTM(0,0,"95%","100%","<body leftmargin='8px' topmargin=0>"+tableHtml+"</body>");
 }
+//满意度调查表
+var printSatisfactionSurveyConfig = {
+	customPrint:printSatisfactionSurvey
+}
+function satisfactionSurveycheckInput(htmls,satisfactionObj){
+	htmls += "<label style='font-family:\"Tahoma\";vertical-align:middle;display:inline-block;margin:0;'>满意</label>";
+	if(satisfactionObj == "SATISFACTION"){
+		htmls += "<input type='checkbox' name='' value='' checked='checked' style='width:11px;height:12px;line-height:12px;vertical-align:middle;padding:0;margin:0;'/>&nbsp;";
+	}else{
+		htmls += "<input type='checkbox' name='' value='' style='width:11px;height:12px;line-height:12px;vertical-align:middle;padding:0;margin:0;'/>&nbsp;";
+	}
+	
+	htmls += "<label style='font-family:\"Tahoma\";vertical-align:middle;display:inline-block;margin:0;'>较满意</label>";
+	if(satisfactionObj == "MORESATISFACTION"){
+		htmls += "<input type='checkbox' name='' value='' checked='checked' style='width:11px;height:12px;line-height:12px;vertical-align:middle;padding:0;margin:0;'/>&nbsp;";
+	}else{
+		htmls += "<input type='checkbox' name='' value=''style='width:11px;height:12px;line-height:12px;vertical-align:middle;padding:0;margin:0;'/>&nbsp;";
+	}
+	
+	htmls += "<label style='font-family:\"Tahoma\";vertical-align:middle;display:inline-block;margin:0;'>基本满意</label>";
+	if(satisfactionObj == "BASICSATISFACTION"){
+		htmls += "<input type='checkbox' name='' value='' checked='checked'style='width:11px;height:12px;line-height:12px;vertical-align:middle;padding:0;margin:0;'/>&nbsp;";
+	}else{
+		htmls += "<input type='checkbox' name='' value=''style='width:11px;height:12px;line-height:12px;vertical-align:middle;padding:0;margin:0;'/>&nbsp;";
+	}
+	
+	htmls += "<label style='font-family:\"Tahoma\";vertical-align:middle;display:inline-block;margin:0;'>不太满意</label>";
+	if(satisfactionObj == "NOTVERYSATISFACTION"){
+		htmls += "<input type='checkbox' name='' value='' checked='checked'style='width:11px;height:12px;line-height:12px;vertical-align:middle;padding:0;margin:0;'/>&nbsp;";
+	}else{
+		htmls += "<input type='checkbox' name='' value=''style='width:11px;height:12px;line-height:12px;vertical-align:middle;padding:0;margin:0;'/>&nbsp;";
+	}
+	
+	htmls += "<label style='font-family:\"Tahoma\";vertical-align:middle;display:inline-block;margin:0;'>不满意</label>";
+	if(satisfactionObj == "NOSATISFACTION"){
+		htmls += "<input type='checkbox' name='' value='' checked='checked'style='width:11px;height:12px;line-height:12px;vertical-align:middle;padding:0;margin:0;'/>&nbsp;";
+	}else{
+		htmls += "<input type='checkbox' name='' value=''style='width:11px;height:12px;line-height:12px;vertical-align:middle;padding:0;margin:0;'/>&nbsp;";
+	}
+	htmls +="</td>"
+	htmls +="</tr>";
+	return htmls;
+}
+
+function printSatisfactionSurvey(data){
+	var headHtml = "<div style='font-size:22px;text-align: center;height:50px;line-height:50px;'><b>"+data.satisfactionSurveyTemplateName+"</b></div>";
+	//调查内容1
+	var surveyItemHtml = "<table border ='1' cellspacing='0' style='width:100%;'>";		
+	surveyItemHtml += "<tr style='font-size:14px;text-align:center;'>" +
+			"<td width='7%' style='padding:2px 4px;'>序号</td>" +
+			"<td width='45%' style='padding:2px 4px;'>项目内容</td>"+
+			"<td width='50%' style='padding:2px 0px 2px 3px;'>评价</td>"+
+			"</tr>";
+		for(var i = 0; i < data.answerItems.length;i++){
+			surveyItemHtml += "<tr style='font-size:14px;'>" +
+				"<td width='7%' style='text-align:center;padding:2px 4px;'>"+(i+1)+"</td>" +
+				"<td width='45%' style='text-align:left;padding:2px 4px;'>"+data.answerItems[i].content+"</td>";
+				
+			if(data.answerItems[i].children != undefined && data.answerItems[i].children.length > 0){//有子级
+				surveyItemHtml += "<td width='50%' style='text-align:left;padding:2px 0px 2px 3px;'></td></tr>";
+				var childrens = data.answerItems[i].children;
+				for(var j = 0;j < childrens.length;j++){
+					surveyItemHtml += "<tr style='font-size:14px;'>" +
+					"<td width='7%' style='text-align:center;padding:2px 4px;'>"+(i+1)+"."+(j+1)+"</td>" +
+					"<td width='45%' style='text-align:left;padding:2px 4px;'>"+childrens[j].content+"</td>"+
+					"<td width='50%' style='text-align:left;padding:2px 0px 2px 3px;'>";
+					surveyItemHtml = satisfactionSurveycheckInput(surveyItemHtml,childrens[j].satisfaction);
+				}
+			}else{
+				surveyItemHtml += "<td width='50%' style='text-align:left;padding:2px 0px 2px 3px;'>";
+				surveyItemHtml = satisfactionSurveycheckInput(surveyItemHtml,data.answerItems[i].satisfaction);
+			}
+		}
+/* 	surveyItemHtml += "<tr style='font-size:14px;'>" +
+			"<td width='7%' style='text-align:center;padding:2px 4px;'>20</td>" +
+			"<td width='46%' style='text-align:left;padding:2px 4px;'>"+data.remark+"</td>"+
+			"<td width='49%' style='text-align:left;padding:2px 4px;'>"+
+			"<label>满意</label><input type='checkbox' name='' value='' checked='checked'/>、"+
+			"<label>较满意</label><input type='checkbox' name='' value='' checked='checked'/>、"+
+			"<label>基本满意</label><input type='checkbox' name='' value='' checked='checked'/>、"+
+			"<label>不太满意</label><input type='checkbox' name='' value='' checked='checked'/>、"+
+			"<label>不满意</label><input type='checkbox' name='' value='' checked='checked'/>"+
+			"</td>"+
+			"</tr>"; */
+	surveyItemHtml += "</table>";
+	//调查内容2
+	var surveyCustomHtml = "<table border ='1' cellspacing='0' style='width:100%;margin-top:10px;'>";
+	surveyCustomHtml += "<tr style='font-size:14px;text-align:center;width:100%;'>" +
+			"<td width='50%' style='padding:2px 4px;'>调查内容</td>"+
+			"<td width='50%'  style='padding:2px 4px;'>评价</td>"+
+			"</tr>";
+		var formInstanceItems = data.formInstanceItems;
+		if(formInstanceItems != undefined && formInstanceItems.length > 0){
+			for(var k = 0;k < formInstanceItems.length;k++){
+				surveyCustomHtml += "<tr style='font-size:14px;'>" +
+				"<td width='60%' style='text-align:left;padding:2px 4px;'>"+formInstanceItems[k].name+"</td>";
+				surveyCustomHtml += "<td width='40%' style='text-align:left;padding:2px 4px;'>";
+				if(formInstanceItems[k].answer != undefined && formInstanceItems[k].answer.length > 0){
+					var answers = formInstanceItems[k].answer;
+					if(formInstanceItems[k].options != undefined && formInstanceItems[k].options.length > 0){
+						var options =  formInstanceItems[k].options;
+						for(var m = 0;m < options.length;m++){
+							surveyCustomHtml += "<label style='font-family:\"Tahoma\";vertical-align:middle;display:inline-block;margin:0;'>"+options[m]+"&nbsp;</label>";
+							if(answers.indexOf(options[m]) != -1){//存在
+								surveyCustomHtml += "<input type='checkbox' name='' value='' checked='checked' style='height:15px;line-height:15px;vertical-align:middle;padding:0;margin:0;'/>&nbsp;&nbsp;";
+							}else{
+								surveyCustomHtml += "<input type='checkbox' name='' value=''  style='height:15px;line-height:15px;vertical-align:middle;padding:0;margin:0;'/>&nbsp;&nbsp;";
+							}
+						}
+					}else{
+						surveyCustomHtml += "<span>"+answers+"</span>";
+					}
+				}
+				surveyCustomHtml += "</td>";
+				surveyCustomHtml += "</tr>";
+			}
+		}
+/* 	surveyCustomHtml += "<tr style='font-size:14px;'>" +
+			"<td width='60%' style='text-align:left;padding:2px 4px;'>"+data.remark+"</td>" +
+			"<td width='40%' style='text-align:left;padding:2px 4px;'>"+
+			"<label style='font-family:\"Tahoma\";vertical-align:middle;display:inline-block;margin:0;'>很好&nbsp;</label><input type='checkbox' name='' value='' checked='checked' style='height:15px;line-height:15px;vertical-align:middle;padding:0;margin:0;'/>&nbsp;"+
+			"<label style='font-family:\"Tahoma\";vertical-align:middle;display:inline-block;margin:0;'>较好&nbsp;</label><input type='checkbox' name='' value='' checked='checked' style='height:15px;line-height:15px;vertical-align:middle;padding:0;margin:0;'/>&nbsp;"+
+			"<label style='font-family:\"Tahoma\";vertical-align:middle;display:inline-block;margin:0;'>一般&nbsp;</label><input type='checkbox' name='' value='' checked='checked' style='height:15px;line-height:15px;vertical-align:middle;padding:0;margin:0;'/>&nbsp;"+
+			"<label style='font-family:\"Tahoma\";vertical-align:middle;display:inline-block;margin:0;'>差&nbsp;</label><input type='checkbox' name='' value='' checked='checked' style='height:15px;line-height:15px;vertical-align:middle;padding:0;margin:0;'/>"+
+			"</td>"+
+			"</tr>"; */
+	surveyCustomHtml += "<tr style='font-size:14px;'>" +
+			"<td  style='width:100%;text-align:left;min-height:110px;padding:2px 0px 2px 3px;' colspan='2' valign='top'>意见及建议:&nbsp;"+(data.remark || '')+"</td></tr>";
+	surveyCustomHtml += "<tr style='font-size:14px;'>" +
+			"<td width='60%' style='text-align:left;padding:2px 4px;'>科室:&nbsp;"+data.depart+"</td>" +		
+			"<td width='40%' style='text-align:lcenter;padding:2px 4px;'>日期:&nbsp;"+data.surveyDate+"</td>"+
+			"</tr>";
+			
+	surveyCustomHtml += "</table>";	
+	var surveyAllHtml = "<table border='0' style='width:100%;'>"
+		surveyAllHtml += "<tr style='width:60%;'><td>"+surveyItemHtml+"</td></tr>";
+		surveyAllHtml += " <tr style='width:40%;'><td>"+surveyCustomHtml+"</td></tr>";
+		surveyAllHtml += "</table>";
+	//打印设置
+	var LODOP = getLodop(document.getElementById('LODOP'),document.getElementById('LODOP_EM'));
+	//项目内容
+	LODOP.ADD_PRINT_TABLE(80,"5%","90%","100%",surveyAllHtml);
+	//标题
+	LODOP.ADD_PRINT_HTM(30,20,"95%",30,headHtml);
+}
 var printConfig = {
     //发货计划单
     invoicePlan : invoicePlanPrintConfig,
@@ -1211,9 +1310,11 @@
     //调拨入库单
     appropriationInList : appropriationInListConfig,
 	//回收汇总单
-    recyclingInvoiceTotal:recyclingInvoiceTotalConfig_bjdxzlyy,
+    //recyclingInvoiceTotal:recyclingInvoiceTotalConfig_bjdxzlyy,
     //调拨出库单
     appropriationOutList : appropriationOutListConfig,
+	//打印满意度调查表
+	printSatisfactionSurveyData:printSatisfactionSurveyConfig,
     //打印器械包明细单
     tousseDefinitionMaterials:tousseDefinitionMaterialsConfig_qifuyy
 };
@@ -1227,10 +1328,12 @@
 // 加大标签:100x100规格
 exLargeLabel : 'Microsoft XPS Document Writer',
 //  自定义模板-小标签
-'模板-明细标签': 'ZDesigner GT800 (EPL)',
+'模板-明细标签1': 'ZDesigner GT800 (EPL)',
 '灭菌篮筐': 'ZDesigner GT800 (EPL)1',
 '模板-普通小标签': 'ZDesigner GT800 (EPL)1',
 '模板-消毒物品': 'ZDesigner GT800 (EPL)1',
+'模板-外来器械中标签': '192.168.104.73GT800',
+'模板-明细标签2': '192.168.104.73GT800',
+'模板-明细标签3': '192.168.104.73GT800'
 //'模板-手术室标签': '192.168.104.73ZDesigner GT800(大标签)',
-'模板-明细标签2': 'ZDesigner GT800 (EPL)'
 };
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/szslgqdermyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r28905 -r38282
--- ssts-web/src/main/webapp/disinfectsystem/config/szslgqdermyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 28905)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szslgqdermyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 38282)
@@ -14,9 +14,12 @@
 	        h.patientIDCard patientIDCard,
 	        h.doctorName doctorName,
 	        h.operation operation,
-	        convert(varchar,h.operationTime,120) operationTime
+	        convert(varchar,h.operationTime,120) operationTime,
+			h.patientArea patientArea,
+			h.bedNumber bedNumber
 	FROM CSSD_HospitalNumber h
 	WHERE h.hospitalNumber = #{hospitalNum}
+	order by operationtime desc
 	]]>
   </select>
   
@@ -30,9 +33,12 @@
 	        h.patientIDCard patientIDCard,
 	        h.doctorName doctorName,
 	        h.operation operation,
-	        convert(varchar,h.operationTime,120) operationTime
+	        convert(varchar,h.operationTime,120) operationTime,
+			h.patientArea patientArea,
+			h.bedNumber bedNumber
 	FROM CSSD_HospitalNumber h
 	WHERE h.hospitalNumber = #{hospitalNum}
+	order by operationtime desc
 	]]>
   </select>
   
Index: ssts-web/src/main/webapp/disinfectsystem/config/szslgqdermyy/menu/menuconfigure.js
===================================================================
diff -u -r35830 -r38282
--- ssts-web/src/main/webapp/disinfectsystem/config/szslgqdermyy/menu/menuconfigure.js	(.../menuconfigure.js)	(revision 35830)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szslgqdermyy/menu/menuconfigure.js	(.../menuconfigure.js)	(revision 38282)
@@ -141,8 +141,7 @@
 	children:[
         {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查表定义",href:WWWROOT+'/disinfectsystem/satisfactionsurvey/satisfactionSurveyTemplateView.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :SSTS_SatisfactionSurveyTable_Menu,text:"满意度调查表",href:WWWROOT+'/disinfectsystem/satisfactionsurvey/satisfactionSurveyTableView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查汇总报表",href:WWWROOT+'/disinfectsystem/reportforms/departSatisfyView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查明细报表",href:WWWROOT+'/disinfectsystem/reportforms/departSatisfyDetailView.jsp',hrefTarget:linkTarget,leaf:true}
+        {hidden :SSTS_SatisfactionSurveyTemplate_Menu,text:"满意度调查报表",href:WWWROOT+'/disinfectsystem/reportforms/departSatisfyView.jsp',hrefTarget:linkTarget,leaf:true}
     ]
 };
 DisinfectsystemTreeData[11] = {
@@ -171,7 +170,14 @@
 	        {hidden :SSTS_TrainingManage_Menu,text:"培训管理",href:WWWROOT+'/knowledge/view.do?moduleId=trainingManage',hrefTarget:linkTarget,leaf:true}
 	    ]
 	};
-
+DisinfectsystemTreeData.push({
+	text:"收费记录管理",
+	singleClickExpand:singleClickExpandTree,
+	hidden:SSTS_chargeRecordManage_MENU,
+	children:[
+	    {hidden :SSTS_chargeRecordManage_MENU,text:"收费记录管理",href:WWWROOT+'/disinfectsystem/chargeRecord/chargeRecord.jsp',hrefTarget:linkTarget,leaf:true}
+	]
+});
 DWREngine.setAsync(false);
 PackingTableManager.getAllTaskGroup(setTaskGroup);
 function setTaskGroup(taskGroup){
@@ -548,14 +554,15 @@
 	singleClickExpand:singleClickExpandTree,
 	hidden:SSTS_WorkLoad_Menu,
 	children:[
-	    {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 :!(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_USERECORD_TOTAL,text:"使用记录录入统计报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordTotalView.jsp',hrefTarget:linkTarget,leaf:true},
 	  	//{hidden :SSTS_USERECORD_Item,text:"使用记录录入明细报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordItemView.jsp',hrefTarget:linkTarget,leaf:true},
 	  	//{hidden :SSTS_USERECORD_OperatorTotal,text:"使用记录人员汇总报表",href:WWWROOT+'/disinfectsystem/reportforms/useRecordOperatorTotalView.jsp',hrefTarget:linkTarget,leaf:true},
 	  	//{hidden :SSTS_USERECORD_ForGoods,text:"使用记录物品分类汇总表",href:WWWROOT+'/disinfectsystem/reportforms/summaryUseRecordForGoodsView.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_TousseWorkLoadTotalReport,text:(sstsConfig.tousseWorkLoadName ? sstsConfig.tousseWorkLoadName : "器械包工作量统计报表"),href:WWWROOT+'/disinfectsystem/reportforms/tousseWorkLoadView.jsp',hrefTarget:linkTarget,leaf:true}
 	  	//{hidden :SSTS_CleaningAreaWorkloadForUser,text:'清洗区人员工作量统计报表',href:WWWROOT+'/disinfectsystem/reportforms/cleaningAreaWorkloadForUser.jsp',hrefTarget:linkTarget,leaf:true},
 	  	//{hidden :SSTS_WaitPackingTaskReport,text:'待装配任务工作表',href:WWWROOT+'/disinfectsystem/reportforms/waitPackingTaskReport.jsp',hrefTarget:linkTarget,leaf:true}
@@ -570,12 +577,12 @@
 	    //{hidden :true,text:"临床护理质量管理与控制指标",href:WWWROOT+'/disinfectsystem/reportforms/qualityControlOfClinic.jsp',hrefTarget:linkTarget,leaf:true},
 	    {hidden :SSTS_QualityControlOfClinic,text:"供应室护理质量指标统计表",href:WWWROOT+'/disinfectsystem/reportforms/supplyRoomQualityQuota.jsp',hrefTarget:linkTarget,leaf:true},
 	    {hidden :SSTS_QuotaReport,text:"十八项指标分析报表",href:WWWROOT+'/disinfectsystem/reportforms/quotaReportView.jsp',hrefTarget:linkTarget,leaf:true},
-	    //{hidden :SSTS_WorkQualityCountReport,text:"工作质量持续收集统计报表",href:WWWROOT+'/disinfectsystem/reportforms/workQualityCollectionView.jsp',hrefTarget:linkTarget,leaf:true},
-	    //{hidden :SSTS_RecycleMaterialDetailReport,text:"回收器械材料明细报表",href:WWWROOT+'/disinfectsystem/reportforms/recycleMaterialDetailView.jsp',hrefTarget:linkTarget,leaf:true},
-	    //{hidden :SSTS_WashWorkloadReport,text:"清洗区工作量及不合格率月报",href:WWWROOT+'/disinfectsystem/reportforms/washWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true},
-	    //{hidden :SSTS_WashMaterialTypeWorkloadReport,text:"清洗区材料类型工作量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialTypeWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true},
-	    //{hidden :SSTS_PackingUnqualifieReport,text:"包装区工作量及不合格率月报",href:WWWROOT+'/disinfectsystem/reportforms/packingUnqualifieReportView.jsp',hrefTarget:linkTarget,leaf:true},
-	    //{hidden :SSTS_SterilizationWorkloadReport,text:"灭菌区工作量及不合格率月报",href:WWWROOT+'/disinfectsystem/reportforms/sterilizationWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true},
+	    {hidden :SSTS_WorkQualityCountReport,text:"工作质量持续收集统计报表",href:WWWROOT+'/disinfectsystem/reportforms/workQualityCollectionView.jsp',hrefTarget:linkTarget,leaf:true},
+	    {hidden :SSTS_RecycleMaterialDetailReport,text:"回收器械材料明细报表",href:WWWROOT+'/disinfectsystem/reportforms/recycleMaterialDetailView.jsp',hrefTarget:linkTarget,leaf:true},
+	    {hidden :SSTS_WashWorkloadReport,text:"清洗区工作量及不合格率月报",href:WWWROOT+'/disinfectsystem/reportforms/washWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true},
+	    {hidden :SSTS_WashMaterialTypeWorkloadReport,text:"清洗区材料类型工作量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialTypeWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true},
+	    {hidden :SSTS_PackingUnqualifieReport,text:"包装区工作量及不合格率月报",href:WWWROOT+'/disinfectsystem/reportforms/packingUnqualifieReportView.jsp',hrefTarget:linkTarget,leaf:true},
+	    {hidden :SSTS_SterilizationWorkloadReport,text:"灭菌区工作量及不合格率月报",href:WWWROOT+'/disinfectsystem/reportforms/sterilizationWorkloadReportView.jsp',hrefTarget:linkTarget,leaf:true},
 	    //{hidden :SSTS_sterilizationAreaWorkLoadReport,text:"灭菌区工作量统计报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizationAreaWorkLoadView.jsp',hrefTarget:linkTarget,leaf:true},
 	    //{hidden :SSTS_tousseSterilizationInspectSituation,text:"器械消毒灭菌检查情况报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseSterilizationInspectSituation.jsp',hrefTarget:linkTarget,leaf:true},
         //{hidden :hideDeviceMaintenaceReport,text:"设备维护报表",href:WWWROOT+'/disinfectsystem/reportforms/deviceMaintenanceView.jsp',hrefTarget:linkTarget,leaf:true},
@@ -595,7 +602,7 @@
         //{hidden :SSTS_WashAndDisinfectRecordInfoReport,text:"清洗情况报表",href:WWWROOT+'/disinfectsystem/reportforms/washAndDisinfectRecordInfoView.jsp',hrefTarget:linkTarget,leaf:true},
         //{hidden :!sstsConfig.enableTousseOverloadReport,text:"器械包实际负载组合统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseOverLoad.jsp',hrefTarget:linkTarget,leaf:true},
         //{hidden :!sstsConfig.enableTousseMorrowSend,text:"器械包次日下送率统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseMorrowSend.jsp',hrefTarget:linkTarget,leaf:true},
-        //{hidden :!sstsConfig.enableNurseWorkload,text:"护理工作质量指标报表",href:WWWROOT+'/disinfectsystem/reportforms/nurseWorkload.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :!sstsConfig.enableNurseWorkload,text:"护理工作质量指标报表",href:WWWROOT+'/disinfectsystem/reportforms/nurseWorkload.jsp',hrefTarget:linkTarget,leaf:true},
         {hidden :!sstsConfig.showSterilizerQualityReport,text:"灭菌物品质量监测统计报表",href:WWWROOT+'/disinfectsystem/reportforms/sterilizerQuality.jsp',hrefTarget:linkTarget,leaf:true}
         //{hidden :!sstsConfig.showUnqualifiedPretreatmentReport,text:"预处理不合格报表",href:WWWROOT+'/disinfectsystem/reportforms/unqualifiedPretreatmentReport.jsp',hrefTarget:linkTarget,leaf:true},
         //{hidden :SSTS_SterilizationOmitReport,text:'灭菌遗漏检查表',href:WWWROOT+'/disinfectsystem/reportforms/sterilizationOmitReport.jsp',hrefTarget:linkTarget,leaf:true}
@@ -610,16 +617,16 @@
     	//{hidden :SSTS_EOGoodsDetailReport,text:"发货物品统计月报(按灭菌程序)",href:WWWROOT+'/disinfectsystem/reportforms/EOGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true},
     	//{hidden :SSTS_GodownEntryStatistic,text:"消耗物品月盘点统计报表",href:WWWROOT+'/disinfectsystem/reportforms/disposableGoodsInventoryView.jsp',hrefTarget:linkTarget,leaf:true},
         //{hidden :SSTS_GodownEntryStatistic,text:"一次性物品三类查询报表",href:WWWROOT+'/disinfectsystem/reportforms/goodsAmountSummaryByGradeView.jsp',hrefTarget:linkTarget,leaf:true},
-        //{hidden :SSTS_GodownEntryStatistic,text:"入库物品统计报表",href:WWWROOT+'/disinfectsystem/reportforms/godownEntryStatisticView.jsp',hrefTarget:linkTarget,leaf:true},
+        //{hidden :SSTS_GodownEntryStatistic,text:"入（退）库物品统计报表",href:WWWROOT+'/disinfectsystem/reportforms/godownEntryStatisticView.jsp',hrefTarget:linkTarget,leaf:true},
         //{hidden :SSTS_GodownEntryStatistic,text:"入/退库物品统计报表(按供应商)",href:WWWROOT+'/disinfectsystem/reportforms/godownEntrySummaryView.jsp',hrefTarget:linkTarget,leaf:true},
-        //{hidden :SSTS_GodownEntryStatistic,text:"入库物品明细统计报表",href:WWWROOT+'/disinfectsystem/reportforms/godownEntryDetailStatisticView.jsp',hrefTarget:linkTarget,leaf:true},
+        //{hidden :SSTS_GodownEntryStatistic,text:"入（退）库物品明细统计报表",href:WWWROOT+'/disinfectsystem/reportforms/godownEntryDetailStatisticView.jsp',hrefTarget:linkTarget,leaf:true},
         //{hidden :SSTS_GodownEntryStatistic,text:"一次性物品发货量对比报表",href:WWWROOT+'/disinfectsystem/reportforms/invoiceAmountContrastChartView.jsp',hrefTarget:linkTarget,leaf:true},
-        {hidden :SSTS_MaterialStockReport,text:"材料库存统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialStockReportView.jsp',hrefTarget:linkTarget,leaf:true}
+        {hidden :SSTS_MaterialStockReport,text:"材料库存统计报表",href:WWWROOT+'/disinfectsystem/reportforms/materialStockReportView.jsp',hrefTarget:linkTarget,leaf:true},
         //{hidden :SSTS_ReturnGoodsDetailReport,text:"签收统计报表",href:WWWROOT+'/disinfectsystem/reportforms/signGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true},
     	//{hidden :SSTS_ReturnGoodsDetailReport,text:"退货统计报表",href:WWWROOT+'/disinfectsystem/reportforms/returnGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true},
     	//{hidden :SSTS_GoodsDistributeReportChart,text:"物品发放分布饼图",href:WWWROOT+'/disinfectsystem/reportforms/goodsDistributeReportChartView.jsp',hrefTarget:linkTarget,leaf:true},
     	//{hidden :SSTS_TousseDeliverReport,text:"器械包发货统计报表",href:WWWROOT+'/disinfectsystem/reportforms/tousseDeliverStatisticsView.jsp',hrefTarget:linkTarget,leaf:true}
-        //{hidden :SSTS_ForeignTousseReport,text:"外来器械申请单统计报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseApplicationReport.jsp',hrefTarget:linkTarget,leaf:true},
+        {hidden :SSTS_ForeignTousseReport,text:"外来器械申请单统计报表",href:WWWROOT+'/disinfectsystem/reportforms/foreignTousseApplicationReport.jsp',hrefTarget:linkTarget,leaf:true}
         //{hidden :SSTS_ApparatusInfusionisType,text:"各类型输液器报表",href:WWWROOT+'/disinfectsystem/reportforms/apparatusInfusionisTypeView.jsp',hrefTarget:linkTarget,leaf:true},
         //{hidden :SSTS_TousseMaterialMonthCheckReport,text:"消毒供应中心器械月盘点统计报表",href:WWWROOT+'/disinfectsystem/reportforms/supplyRoomApplianceMonthStatisticsView.jsp',hrefTarget:linkTarget,leaf:true},
         //{hidden :SSTS_BorrowReport,text:"借还物品统计报表",href:WWWROOT+'/disinfectsystem/reportforms/borrowReportView.jsp',hrefTarget:linkTarget,leaf:true},
@@ -662,6 +669,7 @@
         hidden :System_Manage_Menu,
         children:[
             {hidden :System_Orgunit_Select,text:"组织机构",href:WWWROOT+'/systemmanage/orgUnitExtView.jsp',hrefTarget:linkTarget,leaf:true,icon:WWWROOT+'/images/icon_org.gif'},
+	    {hidden :System_Orgunit_Select,text:"停用的组织机构",href:WWWROOT+'/systemmanage/disabledOrgUnitExtView.jsp',hrefTarget:linkTarget,leaf:true,icon:WWWROOT+'/images/icon_org.gif'},
             {hidden :System_User_Select,text:"用户管理",href:WWWROOT+'/systemmanage/userExtView.jsp',hrefTarget:linkTarget,leaf:true,icon:WWWROOT+'/images/icon_user.gif'},
             {hidden :System_Role_Select,text:"权限管理",href:WWWROOT+'/systemmanage/roleList.jsp',hrefTarget:linkTarget,leaf:true,icon:WWWROOT+'/images/icon_role.gif'},
             {hidden :System_Log_Menu,text:"日志管理",href:WWWROOT+'/log/loggrid.jsp',hrefTarget:linkTarget,leaf:true},
@@ -715,7 +723,7 @@
             //{hidden :!((sstsConfig.hasOwnProperty('haveRinserPosition')) && sstsConfig.haveRinserPosition),text:"位置管理",href:WWWROOT+'/disinfectsystem/basedatamanager/position/positionView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_CleanMethod,text:"清洗程序管理",href:WWWROOT+'/disinfectsystem/basedatamanager/cleanmethod/cleanMethodView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Rinser,text:"清洗机管理",href:WWWROOT+'/disinfectsystem/basedatamanager/rinser/rinserView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
-            {hidden :SSTS_SterilerGroup_manager,text:"灭菌炉分组设置",href:WWWROOT+'/disinfectsystem/basedatamanager/sterilerGroup/sterilerGroupView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_SterilerGroup_manager,text:"灭菌炉分组设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=sterilerGroup',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_Sterilizer,text:"灭菌炉管理",href:WWWROOT+'/disinfectsystem/basedatamanager/sterilizer/sterilizerView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SterilizationPurpose_manager,text:"灭菌目的设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=sterilizationPurpose',hrefTarget:linkTarget,leaf:true},
             //{hidden :SSTS_SterilizationMode_manager,text:"灭菌方式设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=sterilizationMode',hrefTarget:linkTarget,leaf:true},
@@ -732,7 +740,7 @@
             //{hidden :SSTS_GoodsBindingConfig,text:"物品绑定",href:WWWROOT+ '/disinfectsystem/goodsBindingConfig/goodsBindingConfigView.jsp',hrefTarget:linkTarget,leaf:true},
             //{hidden :SSTS_ForeignTousseApplication_Combo,text:"外来器械包组合",href:WWWROOT+'/disinfectsystem/CombinationKits/CombinationKitsView.jsp',hrefTarget:linkTarget,leaf:true},
             //{hidden :SSTS_GoodsFilterConfig,text:"物品黑白名单过滤设置",href:WWWROOT+'/disinfectsystem/goodFilterConfig/goodFilterTemplate.jsp',hrefTarget:linkTarget,leaf:true},
-            //{hidden :SSTS_UrgentLevel_manager,text:"加急级别管理",href:WWWROOT+'/disinfectsystem/basedatamanager/urgentLevel/urgentLevelView.jsp',hrefTarget:linkTarget,leaf:true},
+            {hidden :SSTS_UrgentLevel_manager,text:"加急级别管理",href:WWWROOT+'/disinfectsystem/basedatamanager/urgentLevel/urgentLevelView.jsp',hrefTarget:linkTarget,leaf:true},
             //{hidden :SSTS_OperationRoom_manager,text:"手术间管理",href:WWWROOT+'/disinfectsystem/basedatamanager/operationRoom/operationRoom.jsp',hrefTarget:linkTarget,leaf:true},
             //{hidden :SSTS_ExpensiveGoods_Hidden_Menu || SSTS_ExpensiveGoodsWorkFlow_Hidden_Manager,text:"流程定义管理",href:WWWROOT+'/systemmanage/workFlow/workFlow.jsp',hrefTarget:linkTarget,leaf:true},
             //{hidden :SSTS_ExpensiveGoods_Hidden_Menu || SSTS_ExpensiveGoodsWorkFloAuthorization_Hidden_Manager,text:"流程审批权限代理配置",href:WWWROOT+'/systemmanage/workFlow/workFlowAuthorize/workFlowApprovalAuthorization.jsp',hrefTarget:linkTarget,leaf:true},
@@ -741,6 +749,7 @@
             //{hidden :SSTS_ResponsibilityPart_manager,text:"责任环节",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=responsibilityPart',hrefTarget:linkTarget,leaf:true},
             //{hidden :SSTS_DefectiveMessageRegisterType_manager,text:"缺陷信息登记类型分组",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=defectiveMessageRegisterType',hrefTarget:linkTarget,leaf:true},
             {hidden :(!sstsConfig.hasOwnProperty('hideStaffArchive')) || sstsConfig.hideStaffArchive,text:"职称设置",href:WWWROOT+'/systemmanage/httpOption.mhtml?listId=positionalTitle',hrefTarget:linkTarget,leaf:true},
+	    {hidden :SSTS_chargeRecordManage_MENU,text:"收费项目设置",href:encodeURI(WWWROOT+'/systemmanage/httpOption.mhtml?listId=chargeItem&optionName=收费项目设置'),hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SupplyRoomType_manager,text:"供应室处理器械包配置",href:WWWROOT+'/disinfectsystem/basedatamanager/supplyroomtype/cssdHandleToussesView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SupplyRoomType_manager,text:"供应室服务临床科室配置",href:WWWROOT+'/disinfectsystem/basedatamanager/supplyroomtype/cssdServiceDeptsView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
             {hidden :SSTS_SupplyRoomType_manager,text:"科室供应室设置",href:WWWROOT+'/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeView.jsp?editMode=true',hrefTarget:linkTarget,leaf:true}