Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/img/logo_gdszyy.png
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/webservice-cxf.xml
===================================================================
diff -u -r28878 -r28951
--- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/webservice-cxf.xml	(.../webservice-cxf.xml)	(revision 28878)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/webservice-cxf.xml	(.../webservice-cxf.xml)	(revision 28951)
@@ -11,10 +11,20 @@
     <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
     
 	<!-- 入库单同步webservice接口bean定义及部署,start -->
-	<bean id="inventoryStockWebService" class="com.forgon.disinfectsystem.webservice.Inventory.service.InventoryStockWebServiceImpl">
+	<bean id="inventoryStockWebService" class="com.forgon.disinfectsystem.inventorymanagement.dao.gdszyy.InventoryStockWebServiceImpl">
 	</bean>
     <jaxws:endpoint
         address="/inventoryStockWebService"
         implementor="#inventoryStockWebService" />
 	<!-- 入库单同步webservice接口bean定义及部署,end -->
+	
+	<!-- 深圳禾正医院集成平台获取科室人员、病人信息接口,start -->
+    <bean id="syncServiceManager"
+        class="com.forgon.disinfectsystem.webservice.datasync.szhzyy.OrgUserDataWebServiceManagerImpl">
+    </bean>
+    <jaxws:endpoint
+        address="/syncServiceManager"
+        implementor="#syncServiceManager" />
+	<!-- 深圳禾正医院集成平台获取科室人员、病人信息接口,end -->
+	
 </beans>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/printConfig.js
===================================================================
diff -u -r25243 -r28951
--- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/printConfig.js	(.../printConfig.js)	(revision 25243)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/print/printConfig.js	(.../printConfig.js)	(revision 28951)
@@ -156,6 +156,7 @@
 }
 
 var invoicePlanPrintConfig = {
+	mergeSameGoods:true,
 	isPrintTousse : true,
 	isPrintDisinfectGoods : true,
     isPrintDisposableGoods : true, // 打印申请单是否打印一次性物品
@@ -181,16 +182,16 @@
         ],
         goodsTable :{
         	rowHeight : 24,
-        	position : ["100","1%","97%","2000"],
+        	position : ["100","1%","97%","14.0cm"],
         	content : [
                 {header : "序号", dataIndex : 'serialNumber', width : 60, align : 'center', fontSize : 11},
-                {header : "名称", dataIndex : 'goodsName', width : 340, align : 'left', fontSize : 11},
-                {header : "规格", dataIndex : 'sp', width : 185, align : 'center', fontSize : 11},
-                {header : "包装规格", dataIndex : 'packageSpec', width : 100, align : 'center', fontSize : 11},
+                {header : "名称", dataIndex : 'goodsName', width : 280, align : 'left', fontSize : 11},
+                {header : "规格", dataIndex : 'sp', width : 245, align : 'center', fontSize : 11},
+                // {header : "包装规格", dataIndex : 'packageSpec', width : 100, align : 'center', fontSize : 11},
                 {header : "单位", dataIndex : 'unit', width : 60, align : 'center', fontSize : 11},
-                {header : "数量", dataIndex : 'goodsAmount', width : 60, align : 'right', fontSize : 11},
-                {header : "单价", dataIndex : 'price', width : 60, align : 'right', fontSize : 11}
-                //header : "金额", dataIndex : 'rowPrice', width : 75, align : 'right', fontSize : 11}
+                {header : "数量", dataIndex : 'goodsAmount', width : 60, align : 'center', fontSize : 11},
+                {header : "单价", dataIndex : 'price', width : 60, align : 'center', fontSize : 11},
+                {header : "金额", dataIndex : 'rowPrice', width : 75, align : 'center', fontSize : 11}
             ]
         },
         footer: {
@@ -211,6 +212,62 @@
 				}
     	]
 }
+
+var invoiceToussePlanPrintConfig = {
+	mergeSameGoods:true,
+	isPrintTousse : true,
+	isPrintDisinfectGoods : true,
+    isPrintDisposableGoods : true, // 打印申请单是否打印一次性物品
+    isMergePrintTousseAndDisposable : false, // 器械包和一次性物品是否合并打印
+    printByOriginalApplications : true, //不合并打印情况下是否按原始单据逐份打印
+    printApplyInfo : false,
+    printOrder : 1, // 1:优先打印一次性物品， 2：优先打印器械包
+    // 在器械包和一次性物品不合并打印的情况下，消毒物品打印方式：
+    // 1：优先与一次性物品合并打印，如果无一次性物品则与器械包合并打印， 2：优先与器械包一起合并打印，如果没有器械包则与一次性物品合并打印 ，3：单独打印
+    disinfectGoodsPrintMode : 2,
+    rowsPerPage : 9,
+        headerContent : [
+            // 页眉名称
+            {label : "广东省中医院", dataIndex : '', fontSize : 12, position : ["5","1%","90%",5]},
+            // 标题
+            {label : "无菌物品出库单", dataIndex : '', fontSize : 15, position : ["20","40%","99%",5]},
+            {label : "部门：", dataIndex : 'depart', fontSize : 12, position : ["55","2%","90%",5]},
+        	{label : "单号：", dataIndex : 'serialNum', fontSize : 11, position : ["55","35%","90%",5]},
+        	{label : "仓库:消毒供应中心", dataIndex : '', fontSize : 11, position : ["55","75%","90%",5]},
+        	{label : "制单人:", dataIndex : 'printUser', fontSize : 11, position : ["80","75%","90%",5]},
+        	{label : "提交时间:", dataIndex : 'applicationTime', fontSize : 11, position : ["80","35%","90%",5]},
+        	{label : "备注:", dataIndex : 'remark', fontSize : 11, position : ["80","2%","90%",5]}
+        ],
+        goodsTable :{
+        	rowHeight : 24,
+        	position : ["100","1%","97%","14.0cm"],
+        	content : [
+                {header : "序号", dataIndex : 'serialNumber', width : 60, align : 'center', fontSize : 11},
+                {header : "名称", dataIndex : 'goodsName', width : 260, align : 'center', fontSize : 11},
+                {header : "数量", dataIndex : 'goodsAmount', width : 100, align : 'center', fontSize : 11},
+                {header : "单价", dataIndex : 'price', width : 100, align : 'center', fontSize : 11},
+                {header : "金额", dataIndex : 'rowPrice', width : 100, align : 'center', fontSize : 11}
+            ]
+        },
+        footer: {
+        	fontSize : 12,
+        	content : [
+        	    {label : "<br>主管:      ", dataIndex : ''},
+        	    {label : "   领料人:      ", dataIndex : ''},
+        	    {label : "   发料人: ", dataIndex : 'printUser'},
+        	    {label : "   发货日期:", dataIndex : 'printTime'}
+        	]
+        },
+    	barcodes : [
+				{codeType : "128Auto", dataIndex : 'departBarcode', position : ["3mm","74%","40mm","8mm"],
+					styles : [{itemNameID: 0, styleName: 'ShowBarText', styleValue: true},
+					          {itemNameID: 0, styleName: 'FontSize', styleValue: 6},
+					          {itemNameID: 0, styleName: 'NotOnlyHighPrecision', styleValue: true}
+					]
+				}
+    	]
+}
+
 var batchPrintMaterialInvoicesConfig = {
         headerFooter : [
     	            // 页眉名称
@@ -1124,8 +1181,10 @@
     invoiceTousse : invoiceComboPrintConfig,
     // 发货单（消毒物品）
     invoiceDisinfectGoods : invoiceComboPrintConfig,
-    // 申请单
-    application : applicationPrintConfig,
+    // 申请单（一次性物品）
+    application : invoicePlanPrintConfig, //invoicePlanPrintConfig applicationPrintConfig
+    // 器械包申请单
+    application_tousse:invoiceToussePlanPrintConfig,
     // 消毒物品申请单
     disinfectGoodsApplication : applicationPrintConfig,
     // 借物单
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js
===================================================================
diff -u -r27538 -r28951
--- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js	(.../config.js)	(revision 27538)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/config.js	(.../config.js)	(revision 28951)
@@ -104,6 +104,17 @@
   //是否启用器械包定义所属科室过滤(默认为false不启用,需要先启用器械包定义所属科室)
   enableTousseDefinitionBelongDepartFilter: true,
   //禁用基数限制
-  disableCardinalNumLimit:true
+  disableCardinalNumLimit:true,
+  //启动一次性物品固定条码功能
+  isInitiateDisposableGoodsFixedBarcode:true,
+  // 器械包定义可以批量修改
+  tousseDefinitionCanBatchEdit:true,
+  // 第一次登陆是否需要强制修改密码
+  needForceModifyPwdWhenFirstTime:true,
+  // 修改密码时是否需要强密码
+  needBeStrongPwdWhenModifyPwd:true,
+  externalCodeConfig:{"text":"物资编码","hidden":false},
+  externalCode2Config:{"text":"收费项目编码","hidden":false}
+  
 
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/mybatis/syncFromHERP_Mapper.xml
===================================================================
diff -u -r28878 -r28951
--- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/mybatis/syncFromHERP_Mapper.xml	(.../syncFromHERP_Mapper.xml)	(revision 28878)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/interfaces/mybatis/syncFromHERP_Mapper.xml	(.../syncFromHERP_Mapper.xml)	(revision 28951)
@@ -45,16 +45,16 @@
 <!-- 按物资编码查找物资信息 -->
 <select id="getInventory" resultType="Inventory">
 	<![CDATA[
-		SELECT serialNumber,
+		SELECT inventorySerialNumber as serialNumber,
 	    name,specification,unit
 		FROM CSSD_MaterialDefinition
-		WHERE serialNumber = #{inventorySerialNumber}
+		WHERE inventorySerialNumber = #{inventorySerialNumber}
 	]]>
 </select> 
 <!-- 按名称规格查找物资信息 -->
 <select id="findInventory" resultType="Inventory">
 	<![CDATA[
-		SELECT serialNumber AS serialNumber,
+		SELECT inventorySerialNumber AS serialNumber,
 	       name,specification,unit
 	FROM CSSD_MaterialDefinition
 	WHERE name = #{name}
@@ -122,7 +122,7 @@
 	
 	FROM CSSD_MaterialDefinition
 	
-	where isCssdMaterial = 1
+	where InventorySerialNumber = '33990100071'
 
 	]]>
   </select>
Index: ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/HIS.xml
===================================================================
diff -u -r28823 -r28951
--- ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/HIS.xml	(.../HIS.xml)	(revision 28823)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gdszyy/spring/HIS.xml	(.../HIS.xml)	(revision 28951)
@@ -88,7 +88,7 @@
     <!-- 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://192.9.199.59;databaseName=OES" />
+      	<property name="jdbcUrl" value="jdbc:sqlserver://192.9.199.59;databaseName=OES" />
         <property name="user" value="GZDX" />  
         <property name="password" value="123" />
     </bean>
@@ -104,16 +104,21 @@
 		</property>
 	</bean>
 	
-	<!-- InventoryDao接口的实现， 由MyBatis实现-->
-    <bean id="inventoryDao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
-       <property name="mapperInterface"  
-           value="com.forgon.disinfectsystem.inventorymanagement.dao.InventoryDao" />  
-       <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/gdszyy/interfaces/mybatis/syncFromHERP_Mapper.xml" />
-                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.inventorymanagement.model" />
-            </bean>
-       </property>
-    </bean>  
+    <bean id="inventoryDao" class="com.forgon.disinfectsystem.inventorymanagement.dao.gdszyy.InventoryDaoImpl">  
+    </bean>
+    
+    <bean id="hisJdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate">
+        <property name="dataSource" ref="hisDataSource"/>
+    </bean>
+
+	<bean id="hisDataSource1" class="com.mchange.v2.c3p0.ComboPooledDataSource"
+		destroy-method="close">
+		<property name="driverClass" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" />
+		<!-- 本地测试环境配置 -->
+		<property name="jdbcUrl"
+			value="jdbc:sqlserver://localhost:1433;databaseName=dgzyytmzs" />
+		<property name="user" value="sa" />
+		<property name="password" value="p2ssword" />
+		<property name="CheckoutTimeout" value="20000" />
+	</bean>
 </beans>
\ No newline at end of file