Index: ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
===================================================================
diff -u -r31601 -r33240
--- ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 31601)
+++ ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 33240)
@@ -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,15 +7,9 @@
   <!-- 按门诊号查找病人信息 -->
   <select id="findPatientInfoByTreatmentNum" resultType="PatientInfoVO">
   <![CDATA[
-	SELECT 门诊号 as patientNumber,
-        	姓名 as patientName,
-	        年龄 as patientAge,
-	        性别 as patientSex,
-	        身份证号 as patientIDCard,
-	        手术医生 as doctorName,
-	        手术名称 as operation
-	FROM gzyhis.xdgyxtbrjk_mz
-	WHERE 门诊号 = #{treatmentNum}
+	SELECT *
+	FROM CSSD_ClinicNumber
+	WHERE clinicNumber = #{treatmentNum}
 	]]>
   </select>
 
Index: ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/print/printConfig.js
===================================================================
diff -u -r32351 -r33240
--- ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/print/printConfig.js	(.../printConfig.js)	(revision 32351)
+++ ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/print/printConfig.js	(.../printConfig.js)	(revision 33240)
@@ -349,7 +349,7 @@
             	    //{label : "复核人:", dataIndex : '', fontSize : 11, position : ["11cm","5%","90%",5]},
             	    {label : "审核人:", dataIndex : '', fontSize : 11, position : ["8.4cm","80%","90%",5]},
         	    	{barcodes : [
-        				{codeType : "128Auto", dataIndex : 'invoiceSerialNumbers', position : ["3mm","74%","40mm","8mm"],
+        				{codeType : "128Auto", dataIndex : 'departBarcode', position : ["15","74%","40mm","8mm"],
         					styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true},
         				          {itemNameID: 0, styleName: 'FontSize', styleValue: 6},
         				          {itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true}
@@ -367,7 +367,6 @@
     	        	style:'"border-left:0px;border-right:0px;border-top:#000000 1px solid;border-bottom:#000000 1px solid;"',
     	        	columns : [
     	        	    {header : "序号", dataIndex : 'serialNumber', width : '5%', align : 'center', fontSize : 11},
-						{header : "材料编码", dataIndex : 'inventorySerialNumber', width : '9%', align : 'center', fontSize : 11},
     	                {header : "名称", dataIndex : 'name', width : '265', align : 'center', fontSize : 11},
     	                //{header : "规格", dataIndex : 'specification', width : '9%', align : 'center', fontSize : 11},
     	                //{header : "包装规格", dataIndex : 'packageSpec', width : '9%', align : 'center', fontSize : 11},
@@ -418,7 +417,6 @@
         	        	style:'"border-left:0px;border-right:0px;border-top:#000000 1px solid;border-bottom:#000000 1px solid;"',
         	        	columns : [
         	        	    {header : "序号", dataIndex : 'serialNumber', width : '5%', align : 'center', fontSize : 11},
-        	        	    {header : "材料编码", dataIndex : 'inventorySerialNumber', width : '9%', align : 'center', fontSize : 11},
         	                {header : "名称", dataIndex : 'name', width : 145, align : 'center', fontSize : 11},
         	                {header : "规格", dataIndex : 'specification', width : '9%', align : 'center', fontSize : 11},
         	                {header : "包装规格", dataIndex : 'packageSpec', width : '9%', align : 'center', fontSize : 11},
@@ -464,7 +462,7 @@
 	        	position : ["100","1%","97%","7cm"],
 	        	headRepeat : true,
 	        	columns : [
-					{header : "名称", dataIndex : 'name', width : 220, align : 'left', fontSize : 11},
+	                {header : "名称", dataIndex : 'name', width : 220, align : 'left', fontSize : 11},
 	                {header : "数量", dataIndex : 'count', width : 40, align : 'right', fontSize : 11},
 	                {header : "单位", dataIndex : 'unit', width : 40, align : 'center', fontSize : 11},
 	                {header : "规格", dataIndex : 'specification', width : 110, align : 'center', fontSize : 11},
Index: ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/config.js
===================================================================
diff -u -r32102 -r33240
--- ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/config.js	(.../config.js)	(revision 32102)
+++ ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/config.js	(.../config.js)	(revision 33240)
@@ -14,6 +14,13 @@
   barcodeType : 1,
   // 申请器械包时是否自动归还待归还物品
   autoReturnTousse : false,
+ companyName:"dingxiang",
+  //桌面显示外部代理灭菌
+  showForeignProxySterilizationDesktopIcon:true,
+  // 一次性物品库存不足不允许申请
+  allowApplyDisposableGoodsWhenUnderstock:false,
+//辅助发货
+showAuxiliaryInvoiceBtn:true,
 
  //是否隐藏包装规格	
  hidePackageSpec : false, 
@@ -31,6 +38,16 @@
   showAppliedGoodsBeforeSubmit : false,
   //隐藏申请科室
   hideApplyDepartColumn : false,
+  //核对人取消限制
+  showInvoiceAssistantSender:false,
+//篮筐内有物品也允许回收
+  recycleClassifyBasketAfterPacked:false,
+//自动加载上一次回收的篮筐
+ loadWashBasketsAfterSaveAndCreateNewRecyclingRecord:true,
+//使用记录转换配置
+enableUseRecordConvertConfig:true,
+//只 转换已审核单据
+onlyConvertAuditedUseRecord:true,
 
   //隐藏结算科室
   hideSettleDepartColumn : true,
@@ -52,6 +69,7 @@
  recyclingUserDefault:false,
  //允许洗手护士为空
    useRecordWashHandNurseAllowBlank : true,
+    useRecordCircuitNurseAllowBlank:true,
    //打印发货单的版本,如果为2,则表示批量打印使用分组打印方式,并有下拉菜单,目前除配置为2以外的其他值都使用以前的单科室的多单打印
   printInvoiceVersion:2,
   //回收人默认用登录用户
@@ -70,6 +88,6 @@
   timeSearchFmt : 'Y-m-d H:i',
   //是否显示按照时间查询
   showTimeSearch : true,
-  //开发【发货单号集合码】查询功能
-  enableInvoiceSerialNumberCollectionCodeFunction:true
+   //禁用整筐发货,默认为允许.true表示禁用,false表示允许
+  disableScanBasketInvoice : true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/spring/HIS.xml
===================================================================
diff -u -r31602 -r33240
--- ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/spring/HIS.xml	(.../HIS.xml)	(revision 31602)
+++ ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/spring/HIS.xml	(.../HIS.xml)	(revision 33240)
@@ -68,6 +68,30 @@
        </property>
     </bean>
     
+    <bean id="findPatientInfoByHospitalNumDao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
+       <property name="mapperInterface"  
+           value="com.forgon.disinfectsystem.datasynchronization.dao.FindPatientInfoByHospitalNumDao" />  
+       <property name="sqlSessionFactory">
+            <bean class="org.mybatis.spring.SqlSessionFactoryBean">
+                <property name="dataSource" ref="hisDataSource" />
+                <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/jmrmyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml" />
+                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
+            </bean>
+       </property>
+    </bean>
+    
+    <bean id="findPatientInfoByTreatmentNumDao" class="org.mybatis.spring.mapper.MapperFactoryBean">
+       <property name="mapperInterface"  
+           value="com.forgon.disinfectsystem.datasynchronization.dao.FindPatientInfoByTreatmentNumDao" />  
+        <property name="sqlSessionFactory">
+            <bean class="org.mybatis.spring.SqlSessionFactoryBean">
+                <property name="dataSource" ref="hisDataSource" />
+                <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/jmrmyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml" />
+                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
+            </bean>
+       </property>
+    </bean>
+  
         
     
 </beans>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml
===================================================================
diff -u -r31601 -r33240
--- ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml	(.../SyncOrgUnitAndUserMapper.xml)	(revision 31601)
+++ ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/interfaces/mybatis/SyncOrgUnitAndUserMapper.xml	(.../SyncOrgUnitAndUserMapper.xml)	(revision 33240)
@@ -7,11 +7,17 @@
   <!-- 获取所有部门 -->
   <select id="getAllOrgUnit" resultType="OrgUnitVo">
   <![CDATA[
-	 SELECT MC AS name, BM AS coding,
-	   SJBM AS parentCoding
-           FROM ZD_KS  where ISNULL(BM, '')<>'' and BM<>'1' and BM<>'0'
+	 select * from CSSD_Department  where ISNULL(BM, '')<>'' and BM<>'1' and BM<>'0'
 	]]>
   </select>
   
+   <!-- 获取所有用户 -->
+  <select id="getAllUser" resultType="UserVo">
+  <![CDATA[
+	select * from CSSD_User
+	where coding is not null and name is not null
+	]]>
+  </select>
   
+  
 </mapper>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r31601 -r33240
--- ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 31601)
+++ ssts-web/src/main/webapp/disinfectsystem/config/jmrmyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 33240)
@@ -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,36 +7,16 @@
   <!-- 按住院号查找病人信息:提供给使用记录页面的按住院号查询 -->
   <select id="findPatientInfoByHospitalNum" resultType="PatientInfoVO">
   <![CDATA[
-	SELECT 住院号 as patientNumber,
-        	姓名 as patientName,
-	        年龄 as patientAge,
-	        性别 as patientSex,
-	        身份证号 as patientIDCard,
-	        手术医生 as doctorName,
-	        手术名称 as operation,
-	   床号 as bedNumber,
-	        病区 as patientArea,
-	        住院科室 as ascriptionDepartment 
- 	FROM gzyhis.xdgyxtbrjk_zy
-	WHERE 住院号 = #{hospitalNum}
+	select * from CSSD_HospitalNumber
+	WHERE hospitalNumber = #{hospitalNum}
 	]]>
   </select>
   
   <!-- 按住院号查找病人信息:提供给外来器械申请单页面的按住院号查询 -->
   <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
   <![CDATA[
-	SELECT 住院号 as patientNumber,
-        	姓名 as patientName,
-	        年龄 as patientAge,
-	        性别 as patientSex,
-	        身份证号 as patientIDCard,
-	        手术医生 as doctorName,
-	        手术名称 as operation,
-	   床号 as bedNumber,
-	        病区 as patientArea,
-	        住院科室 as ascriptionDepartment 
- 	FROM gzyhis.xdgyxtbrjk_zy
-	WHERE 住院号 = #{hospitalNum}
+	select * from CSSD_HospitalNumber
+	WHERE hospitalNumber = #{hospitalNum}
 	]]>
   </select>