Index: ssts-web/src/main/webapp/disinfectsystem/config/lcxzyy/spring/HIS.xml
===================================================================
diff -u -r31259 -r39679
--- ssts-web/src/main/webapp/disinfectsystem/config/lcxzyy/spring/HIS.xml	(.../HIS.xml)	(revision 31259)
+++ ssts-web/src/main/webapp/disinfectsystem/config/lcxzyy/spring/HIS.xml	(.../HIS.xml)	(revision 39679)
@@ -86,13 +86,14 @@
   
   
     <!-- his数据源 -->
-    <bean id="hisDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">
-    	<property name="driverClass" value="oracle.jdbc.OracleDriver" />  
-      <property name="jdbcUrl" value="jdbc:oracle:thin:@//192.168.90.250:1521/xjklmy" />
-        <property name="user" value="thirdparts" />  
-        <property name="password" value="thirdparts"  />
-    </bean>
-    
+
+    <bean id="hisDataSource"
+        class="com.mchange.v2.c3p0.ComboPooledDataSource"
+		destroy-method="close">
+        <property name="driverClass" value="sun.jdbc.odbc.JdbcOdbcDriver" />  
+        <property name="jdbcUrl" value="jdbc:odbc:cache" />
+        </bean>
+
    <bean id="inventoryManagerTarget"
 		class="com.forgon.disinfectsystem.inventorymanagement.service.InventoryManagerImpl">
 	</bean>
@@ -104,6 +105,7 @@
 		</property>
 	</bean>
 	
+	
 	<!-- InventoryDao接口的实现， 由MyBatis实现-->
     <bean id="inventoryDao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
        <property name="mapperInterface"  
Index: ssts-web/src/main/webapp/disinfectsystem/config/lcxzyy/config.js
===================================================================
diff -u -r33153 -r39679
--- ssts-web/src/main/webapp/disinfectsystem/config/lcxzyy/config.js	(.../config.js)	(revision 33153)
+++ ssts-web/src/main/webapp/disinfectsystem/config/lcxzyy/config.js	(.../config.js)	(revision 39679)
@@ -1,4 +1,4 @@
-var sstsConfig = {
+var sstsConfig = {
   // 回收时科室显示结算科室
   showSettleAccountsDepartInRecycling : false,
   // 审核器械包必须入篮筐（一级供应室）
@@ -90,7 +90,7 @@
   //对申请单的物品申请数量是否启用干预功能
   enableInterfereApplyAmount : true,
 
-  //是否是加强版的“消毒供应中心员工工作量统计报表”（即：增加了评分功能），为true时是加强版的，没配或者为false则不是
+  //是否是加强版的“消毒供应中心工作量统计报表”（即：增加了评分功能），为true时是加强版的，没配或者为false则不是
   strengthenStatisticalWorkload : true,
   //是否禁用整筐发货
   disableScanBasketInvoice : false,
@@ -143,5 +143,21 @@
   //包装区工作量及不合格率月报，按包统计并显示消毒物品
   showDisinfectionByPackage:true,
   //是否允许部分回收
-  enablePartRecycle:true
-}
\ No newline at end of file
+  enablePartRecycle:true,
+  //发货汇总
+  enableInvoiceItemSummary:true,
+  //是否启用加急功能
+  enableUrgentFunction:true,
+  //外来器械图标
+  desktopShortcutIconsConfig:["外来器械申请"], 
+ //同时申请多个外来器械
+ allowApplyMultipleForeignTousse:true,
+ //多个外来器械入统一篮筐
+  multiForeignTousseIntoSameBasket:true,
+ //科室使用记录申请单合并
+ //useRecordConvertRecyclingApplicationMergeRegular:"depart",
+  //合并打印发货单
+  mergePrintInvoiceGoods:true,
+  //辅助发货
+  showAuxiliaryInvoiceBtn:true
+} 
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/lcxzyy/menu/menuconfigure.js
===================================================================
diff -u -r35830 -r39679
--- ssts-web/src/main/webapp/disinfectsystem/config/lcxzyy/menu/menuconfigure.js	(.../menuconfigure.js)	(revision 35830)
+++ ssts-web/src/main/webapp/disinfectsystem/config/lcxzyy/menu/menuconfigure.js	(.../menuconfigure.js)	(revision 39679)
@@ -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] = {
@@ -583,9 +582,9 @@
 	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},
@@ -646,9 +645,9 @@
     	{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_ReturnGoodsDetailReport,text:"签收统计报表",href:WWWROOT+'/disinfectsystem/reportforms/signGoodsDetailView.jsp',hrefTarget:linkTarget,leaf:true},
@@ -755,7 +754,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},
Index: ssts-web/src/main/webapp/disinfectsystem/config/lcxzyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r31259 -r39679
--- ssts-web/src/main/webapp/disinfectsystem/config/lcxzyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 31259)
+++ ssts-web/src/main/webapp/disinfectsystem/config/lcxzyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 39679)
@@ -7,48 +7,40 @@
   <!-- 按住院号查找病人信息:提供给使用记录页面的按住院号查询 -->
   <select id="findPatientInfoByHospitalNum" resultType="PatientInfoVO">
   <![CDATA[
-	SELECT h.hospitalNumber,
-	        h.searialNumber,
-        	h.patientName,
-	        h.patientAge,
-	        h.patientSex,
-	        h.patientIDCard,
-	        h.doctorName,
-	        h.oper_name operation,
-			TO_CHAR(h.oper_at,'YYYY-MM-DD HH24:MI:SS') operationTime,
-	        h.patientArea,
-			h.roomNumber,
-			h.bedNumber,
-			h.remark,
-			h.washHandNurse,
-			h.circuitNurse,
-			h.opRoomId
-	FROM CSSD_HospitalNumber h
-	WHERE h.hospitalNumber = #{hospitalNum} order by h.oper_at desc
+SELECT hospitalNumber,
+	        serialNumber AS searialNumber ,
+            patientName ,
+	        patientAge ,
+	        patientSex,
+	        patientIDCard,
+	        doctorName,
+	        operation ,
+			TO_CHAR(operationTime,'YYYY-MM-DD HH24:MI:SS') ,
+	        patientArea,
+			roomNumber ,
+			bedNumber,
+			remark
+	FROM web_DHCENS_BLL_DingXiang_Method.Interface_IAdmList(#{hospitalNum})  order BY searialNumber DESC
 	]]>
   </select>
   
   <!-- 按住院号查找病人信息:提供给外来器械申请单页面的按住院号查询 -->
   <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
   <![CDATA[
-	SELECT h.hospitalNumber,
-	        h.searialNumber,
-        	h.patientName,
-	        h.patientAge,
-	        h.patientSex,
-	        h.patientIDCard,
-	        h.doctorName,
-	        h.oper_name operation,
-			TO_CHAR(h.oper_at,'YYYY-MM-DD HH24:MI:SS') operationTime,
-	        h.patientArea,
-			h.roomNumber,
-			h.bedNumber,
-			h.remark,
-			h.washHandNurse,
-			h.circuitNurse,
-			h.opRoomId
-	FROM CSSD_HospitalNumber h
-	WHERE h.hospitalNumber = #{hospitalNum} order by h.oper_at desc
+SELECT hospitalNumber,
+	        serialNumber AS searialNumber ,
+            patientName ,
+	        patientAge ,
+	        patientSex,
+	        patientIDCard,
+	        doctorName,
+	        operation ,
+			TO_CHAR(operationTime,'YYYY-MM-DD HH24:MI:SS') ,
+	        patientArea,
+			roomNumber ,
+			bedNumber,
+			remark
+	FROM web_DHCENS_BLL_DingXiang_Method.Interface_IAdmList(#{hospitalNum})  order BY searialNumber DESC
 	]]>
   </select>
   
Index: ssts-web/src/main/webapp/disinfectsystem/config/lcxzyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
===================================================================
diff -u -r31259 -r39679
--- ssts-web/src/main/webapp/disinfectsystem/config/lcxzyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml	(.../SyncOrgUnitAndUserMapper.xml)	(revision 31259)
+++ ssts-web/src/main/webapp/disinfectsystem/config/lcxzyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml	(.../SyncOrgUnitAndUserMapper.xml)	(revision 39679)
@@ -7,14 +7,14 @@
   <!-- 获取所有部门 -->
   <select id="getAllOrgUnit" resultType="OrgUnitVo">
   <![CDATA[
-	SELECT  dept_name name,dept_under parentcoding,dept_code coding FROM CSSD_Department where dept_code != '0'
+	SELECT  name,coding,parentCoding FROM web_DHCENS_BLL_DingXiang_Method.Interface_LocInfo()
 	]]>
   </select>
   
   <!-- 获取所有用户 -->
   <select id="getAllUser" resultType="UserVo">
   <![CDATA[
-	SELECT dept_code orgunitcoding,employe_no coding,name FROM CSSD_User where employe_no != '0'
+	SELECT name,coding,orgUnitCoding FROM web_DHCENS_BLL_DingXiang_Method.Interface_UserInfo()
 	]]>
   </select>
 </mapper>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/lcxzyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
===================================================================
diff -u -r31259 -r39679
--- ssts-web/src/main/webapp/disinfectsystem/config/lcxzyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 31259)
+++ ssts-web/src/main/webapp/disinfectsystem/config/lcxzyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 39679)
@@ -7,20 +7,19 @@
   <!-- 按门诊号查找病人信息 -->
   <select id="findPatientInfoByTreatmentNum" resultType="PatientInfoVO">
   <![CDATA[
-	SELECT  c.clinicNumber,
-	        c.serialNumber,
-        	c.patientName,
-	        c.patientAge,
-	        c.patientSex,
-	        c.patientIDCard,
-	        c.doctorName,
-	        c.operation,
-            TO_CHAR(c.operationTime,'YYYY-MM-DD HH24:MI:SS') operationTime,
-			c.patientArea,
-			c.roomNumber,
-			c.bedNumber
-	FROM CSSD_ClinicNumber c
-	WHERE c.clinicNumber = #{treatmentNum} order by c.operationTime desc
+	SELECT  clinicNumber,
+	        serialNumber,
+        	patientName,
+	        patientAge,
+	        patientSex,
+	        patientIDCard,
+	        operation,
+            TO_CHAR(operationTime,'YYYY-MM-DD HH24:MI:SS') operationTime,
+			patientArea,
+			roomNumber,
+			bedNumber
+	FROM web_DHCENS_BLL_DingXiang_Method.Interface_OAdmList(#{treatmentNum}) order by serialNumber desc
+	
 	]]>
   </select>