Index: ssts-web/src/main/webapp/disinfectsystem/config/stdxyxyfszlyy/interfaces/dataSyncConfig.json
===================================================================
diff -u -r29293 -r29457
--- ssts-web/src/main/webapp/disinfectsystem/config/stdxyxyfszlyy/interfaces/dataSyncConfig.json	(.../dataSyncConfig.json)	(revision 29293)
+++ ssts-web/src/main/webapp/disinfectsystem/config/stdxyxyfszlyy/interfaces/dataSyncConfig.json	(.../dataSyncConfig.json)	(revision 29457)
@@ -9,7 +9,7 @@
 		"更新交集数据" : true,
 		"移除差集数据" : false,
 		"默认角色ID":[
-			"ROLE_1_0"
+			"sly"
 		]
 	}
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/stdxyxyfszlyy/config.js
===================================================================
diff -u -r29290 -r29457
--- ssts-web/src/main/webapp/disinfectsystem/config/stdxyxyfszlyy/config.js	(.../config.js)	(revision 29290)
+++ ssts-web/src/main/webapp/disinfectsystem/config/stdxyxyfszlyy/config.js	(.../config.js)	(revision 29457)
@@ -48,9 +48,9 @@
 		  //是否显示打印过滤选择框
 		  showPrintFilter: true,
 		  //清洗筐是否装配完成才能回收
-		  recycleClassifyBasketAfterPacked:false,
+		  recycleClassifyBasketAfterPacked:true,
 		  //自定义装配后是否保留装配数量
-		  packAmountProcessTypeInDirectPackingView: true,
+		  packAmountProcessTypeInDirectPackingView: false,
 		  //自定义装配后是否保留灭菌日期
 		  disinfectionDateProcessTypeInDirectPackingView: true,
 		  //是否显示辅助发货按钮
@@ -78,17 +78,31 @@
 		  //是否显示科室分组选择框
 		  isShowDeptGroup : true,
 		  //只有装配完成才能使用清洗篮筐回收.默认为true
-		  recycleClassifyBasketAfterPacked:false,
+		  recycleClassifyBasketAfterPacked:true,
 		  //巡回护士是否允许为空
 		  useRecordCircuitNurseAllowBlank:true,
 		  //洗手护士是否允许为空
 		  useRecordWashHandNurseAllowBlank:true,
 		  // 是否显示装配界面的打印按钮
 		  packingView_currentTaskGroup_showPrintBtn: true,
+		  //是否显示核对人
+		   showInvoiceAssistantSender : true,
+		  //是否显示发货计划下送责任人
+		  showInvoicePersonInCharge : false,
+		  //发货界面，是否启用保存并打印按钮。
+		  enableSaveAndPrintWhenInvoice: true,
 		  //显示报表导出方式 1:仅显示pdf报表 2:仅显示html报表  3:同时显示pdf和html报表 ,默认EXCEL显示,不显示pdf,html
 		  reportExportExtraFormats : 3,
-		  //禁用基数限制
-		  disableCardinalNumLimit:true,
-		  //不启用扫码登录
-		  enableScanBarcodeLogin:false
+		  //在灭菌视图界面是否显示生物监测状态属性
+		  showBiologicalMonitoringStatus:true,
+			  //物资系统编码字段
+		  disposableGoodsInventorySerialNumber:false,
+			  //一次性物品固定条码
+           isInitiateDisposableGoodsFixedBarcode:true,
+		  //发货单是否合并打印
+          mergePrintInvoiceGoods:true,
+			   //启用PDA扫描一次物品固定条码
+oneKeyScanDisposableGoodsForPDA:true,
+          //打印发货单，发货单合并方式
+		  batchPrintInvoiceMergeType:"科室"
 		}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/stdxyxyfszlyy/interfaces/mybatis/syncFromHERP_Mapper.xml
===================================================================
diff -u -r29293 -r29457
--- ssts-web/src/main/webapp/disinfectsystem/config/stdxyxyfszlyy/interfaces/mybatis/syncFromHERP_Mapper.xml	(.../syncFromHERP_Mapper.xml)	(revision 29293)
+++ ssts-web/src/main/webapp/disinfectsystem/config/stdxyxyfszlyy/interfaces/mybatis/syncFromHERP_Mapper.xml	(.../syncFromHERP_Mapper.xml)	(revision 29457)
@@ -36,12 +36,13 @@
 	        supplierName,
 	        amount,
 	        expDate,
-	        cost AS unitPrice
-	FROM  CSSD_MaterialEntry t1
-	INNER JOIN CSSD_MaterialEntryItem t2 on t1.id = t2.materialEntryId
-	WHERE t1.SERIALNUMBER = #{inEntrySerialNumber}
+            cost as unitprice
+	FROM  CSSD_MaterialEntryItem 
+
+	WHERE SERIALNUMBER = #{inEntrySerialNumber}
 	]]>
 </select> 
+
 <!-- 按物资编码查找物资信息 -->
 <select id="getInventory" resultType="Inventory">
 	<![CDATA[
@@ -103,9 +104,9 @@
 	        amount,
 	        EXPDATE,
 	        cost AS unitPrice
-	FROM  CSSD_GodownEntry t1
-	INNER JOIN CSSD_MaterialEntryItem t2 on t1.id = t2.materialEntryId
-	WHERE t1.SERIALNUMBER = #{inEntrySerialNumber}
+	FROM  CSSD_GodownEntryitem
+	
+	WHERE SERIALNUMBER = #{inEntrySerialNumber}
 	]]>
 </select> 
 </mapper> 
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/stdxyxyfszlyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
===================================================================
diff -u -r29293 -r29457
--- ssts-web/src/main/webapp/disinfectsystem/config/stdxyxyfszlyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 29293)
+++ ssts-web/src/main/webapp/disinfectsystem/config/stdxyxyfszlyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 29457)
@@ -7,15 +7,15 @@
   <!-- 按门诊号查找病人信息 -->
   <select id="findPatientInfoByTreatmentNum" resultType="PatientInfoVO">
   <![CDATA[
-	SELECT h.clinicNumber patientNumber,
-        	h.patientName patientName,
-	        h.patientAge patientAge,
-	        h.patientSex patientSex,
-	        h.patientIDCard patientIDCard,
-	        '' doctorName,
-	        '' operation
-	FROM CSSD_ClinicNumber h
-	WHERE h.clinicNumber = #{treatmentNum}
+select 
+		PATIENTIDCARD,
+		PATIENTNAME,
+		PATIENTSEX,
+		CLINICNUMBER,
+		PATIENTAGE,
+		PATIENTAREA 
+      from hisdb.cssd_clinicnumber
+	WHERE CLINICNUMBER = #{treatmentNum}
 	]]>
   </select>
 
Index: ssts-web/src/main/webapp/disinfectsystem/config/stdxyxyfszlyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r29293 -r29457
--- ssts-web/src/main/webapp/disinfectsystem/config/stdxyxyfszlyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 29293)
+++ ssts-web/src/main/webapp/disinfectsystem/config/stdxyxyfszlyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 29457)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper
   PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
   "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
@@ -7,32 +7,36 @@
   <!-- 按住院号查找病人信息:提供给使用记录页面的按住院号查询 -->
   <select id="findPatientInfoByHospitalNum" resultType="PatientInfoVO">
   <![CDATA[
-	SELECT h.hospitalNumber patientNumber,
-        	h.patientName patientName,
-	        h.patientAge patientAge,
-	        h.patientSex patientSex,
-	        h.patientIDCard patientIDCard,
-	        h.doctorName doctorName,
-	        h.operation operation,
-	        convert(varchar,h.operationTime,120) operationTime
-	FROM CSSD_HospitalNumber h
-	WHERE h.hospitalNumber = #{hospitalNum}
+     select 
+		PATIENTIDCARD,
+		PATIENTNAME,
+		BEDNUMBER,
+		ROOMNUMBER,
+		PATIENTSEX,
+		SEARIALNUMBER,
+		HOSPITALNUMBER,
+		PATIENTAGE,
+		PATIENTAREA 
+      from interface.cssd_hospitanumber
+	WHERE HOSPITALNUMBER = #{hospitalNum}
 	]]>
   </select>
   
   <!-- 按住院号查找病人信息:提供给外来器械申请单页面的按住院号查询 -->
   <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
   <![CDATA[
-	SELECT h.hospitalNumber patientNumber,
-        	h.patientName patientName,
-	        h.patientAge patientAge,
-	        h.patientSex patientSex,
-	        h.patientIDCard patientIDCard,
-	        h.doctorName doctorName,
-	        h.operation operation,
-	        convert(varchar,h.operationTime,120) operationTime
-	FROM CSSD_HospitalNumber h
-	WHERE h.hospitalNumber = #{hospitalNum}
+      select 
+		PATIENTIDCARD,
+		PATIENTNAME,
+		BEDNUMBER,
+		ROOMNUMBER,
+		PATIENTSEX,
+		SEARIALNUMBER,
+		HOSPITALNUMBER,
+		PATIENTAGE,
+		PATIENTAREA 
+      from interface.cssd_hospitanumber
+	WHERE HOSPITALNUMBER = #{hospitalNum}
 	]]>
   </select>
   
Index: ssts-web/src/main/webapp/disinfectsystem/config/stdxyxyfszlyy/spring/HIS.xml
===================================================================
diff -u -r29293 -r29457
--- ssts-web/src/main/webapp/disinfectsystem/config/stdxyxyfszlyy/spring/HIS.xml	(.../HIS.xml)	(revision 29293)
+++ ssts-web/src/main/webapp/disinfectsystem/config/stdxyxyfszlyy/spring/HIS.xml	(.../HIS.xml)	(revision 29457)
@@ -77,21 +77,40 @@
            value="com.forgon.disinfectsystem.datasynchronization.dao.FindPatientInfoByTreatmentNumDao" />  
         <property name="sqlSessionFactory">
             <bean class="org.mybatis.spring.SqlSessionFactoryBean">
-                <property name="dataSource" ref="hisDataSource" />
+                <property name="dataSource" ref="hisDataSource2" />
                 <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/stdxyxyfszlyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml" />
                 <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
             </bean>
        </property>
     </bean>
   
+
   
-    <!-- his数据源 -->
+    <!-- his数据源门诊 -->
+    <bean id="hisDataSource2" class="com.mchange.v2.c3p0.ComboPooledDataSource">
+    	<property name="driverClass" value="oracle.jdbc.OracleDriver" />  
+      <property name="jdbcUrl" value="jdbc:oracle:thin:@//199.199.197.250:1521/sthis" />
+        <property name="user" value="hisdb" />  
+        <property name="password" value="h3c%admin" />
+    </bean>
+	
+		<!-- 一次性物品数据源 -->
+    <bean id="inventoryDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">
+    	<property name="driverClass" value="oracle.jdbc.OracleDriver" />  
+        <property name="jdbcUrl" value="jdbc:oracle:thin:@//199.199.197.110:1521/stzlpdbORCL" />
+        <property name="user" value="XDGYS_user" />  
+        <property name="password" value="xdgys_user123456" />
+    </bean>
+	
+
+	<!-- his数据源住院 -->
     <bean id="hisDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">
-    	<property name="driverClass" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" />  
-      <property name="jdbcUrl" value="jdbc:sqlserver://10.0.0.4:1433;databaseName=cx" />
-        <property name="user" value="cx" />  
-        <property name="password" value="" />
+    	<property name="driverClass" value="oracle.jdbc.OracleDriver" />  
+        <property name="jdbcUrl" value="jdbc:oracle:thin:@//199.199.197.250:1521/sthis" />
+        <property name="user" value="interface" />  
+        <property name="password" value="interface" />
     </bean>
+	
     
    <bean id="inventoryManagerTarget"
 		class="com.forgon.disinfectsystem.inventorymanagement.service.InventoryManagerImpl">
@@ -110,7 +129,7 @@
            value="com.forgon.disinfectsystem.inventorymanagement.dao.InventoryDao" />  
        <property name="sqlSessionFactory">
             <bean class="org.mybatis.spring.SqlSessionFactoryBean">
-                <property name="dataSource" ref="hisDataSource" />
+                <property name="dataSource" ref="inventoryDataSource" />
                 <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/stdxyxyfszlyy/interfaces/mybatis/syncFromHERP_Mapper.xml" />
                 <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.inventorymanagement.model" />
             </bean>