Index: ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r33073 -r37537
--- ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 33073)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 37537)
@@ -36,6 +36,8 @@
 	        手术名称 as operation,
 	   床号 as bedNumber,
 	        病区 as patientArea,
+			手术医生核算科室 as DOCTORACCOUNTDEPART,
+手术医生核算科室编码 as DOCTORACCOUNTDEPARTCODE,
 	        住院科室 as ascriptionDepartment 
  	FROM gzyhis.xdgyxtbrjk_zy
 	WHERE 住院号 = #{hospitalNum}
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/interfaces/mybatis/syncFromHERP_Mapper.xml.bak
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/interfaces/mybatis/syncFromHERP_Mapper.xml.bak	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/interfaces/mybatis/syncFromHERP_Mapper.xml.bak	(revision 37537)
@@ -0,0 +1,108 @@
+<?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">
+<mapper namespace="com.forgon.disinfectsystem.inventorymanagement.dao.InventoryDao"> 
+ <!-- 按单号查找入库单 -->
+ <select id="findInEntryBySerialNumber" resultType="StorageEntry">
+  	<![CDATA[
+	SELECT serialNumber,time,remark 
+	FROM xi_sf.CSSD_MATERIALENTRY
+	WHERE SERIALNUMBER  = #{inEntrySerialNumber}
+	]]>
+ </select>
+<!-- 按时间查找入库单 -->
+ <select id="findInEntryByTime" resultType="StorageEntry">
+  	<![CDATA[
+	SELECT serialNumber,time,remark
+	FROM xi_sf.CSSD_MATERIALENTRY
+	where 1=1
+	]]> 
+	<if test="startDate != null">
+		and  to_date(time, 'yyyy-MM-dd') >= #{startDate}
+	</if>
+	<if test="endDate != null">
+		<![CDATA[
+		and to_date(time, 'yyyy-MM-dd') <= #{endDate}
+		]]>
+	</if>
+	ORDER BY time	 
+  </select>
+
+<!-- 按单号查找入库单明细 -->
+<select id="findInEntryItem" resultType="StorageEntryItem">
+  	<![CDATA[
+	SELECT  inventorySerialNumber,BATCH_NUM AS batchNumber,amount,expDate,name,specification,cost unitPrice
+	FROM  xi_sf.CSSD_MaterialEntryItem
+	WHERE SERIALNUMBER = #{inEntrySerialNumber}
+	]]>
+</select> 
+
+<!-- 按物资编码查找物资信息 -->
+<select id="getInventory" resultType="Inventory">
+	<![CDATA[
+		SELECT serialNumber,name,specification,unit
+		FROM xi_sf.CSSD_MATERIALDEFINITION
+		WHERE serialNumber = #{inventorySerialNumber}
+		and rownum = 1
+	]]>
+</select> 
+<!-- 按名称规格查找物资信息 -->
+<select id="findInventory" resultType="Inventory">
+	<![CDATA[
+		SELECT serialNumber,name,specification,unit
+	FROM  xi_sf.CSSD_MATERIALDEFINITION
+	WHERE name = #{name}
+	<choose>
+		<when test="specification != null">
+			AND specification = #{specification}
+		</when >
+		<otherwise>
+			AND ((specification is null) OR (specification =''))
+		</otherwise>
+	</choose>
+	]]<name />
+</select> 
+<!-- 按单号查找退库单 -->
+<select id="findOutEntryBySerialNumber" resultType="StorageEntry">
+	<![CDATA[
+	SELECT serialNumber,time,remark
+	FROM  xi_sf.CSSD_GodownEntry
+	WHERE serialNumber = #{inEntrySerialNumber}
+	]]>
+</select>
+
+<!-- 按时间查找退库单 -->
+<select id="findOutEntryByTime" resultType="StorageEntry">
+  	<![CDATA[
+	SELECT serialNumber,time,remark
+	FROM xi_sf.CSSD_GodownEntry
+	WHERE 1=1
+	]]> 
+	<if test="startDate != null">
+		and  to_date(time, 'yyyy-MM-dd') >= #{startDate}
+	</if>
+	<if test="endDate != null">
+		<![CDATA[
+		and to_date(time, 'yyyy-MM-dd') <= #{endDate}
+		]]>
+	</if>
+	ORDER BY time
+ </select> 
+
+<!-- 按单号查找退库单明细 -->
+<select id="findOutEntryItem" resultType="StorageEntryItem">
+	<![CDATA[
+    SELECT inventorySerialNumber,
+	BATCH_NUM AS batchNumber,
+	expDate,
+	amount,
+	name,
+	cost unitPrice,
+	specification
+	FROM xi_sf.CSSD_GodownEntryItem t1
+    inner join xi_sf.CSSD_GodownEntry t2 on t2.id = t1.godownEntryId
+	WHERE SERIALNUMBER = #{inEntrySerialNumber}
+	]]>
+</select> 
+</mapper> 
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml.bak
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml.bak	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml.bak	(revision 37537)
@@ -0,0 +1,45 @@
+<?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">
+<mapper namespace="com.forgon.disinfectsystem.datasynchronization.dao.FindPatientInfoByHospitalNumDao">
+  
+  <!-- 按住院号查找病人信息:提供给使用记录页面的按住院号查询 -->
+  <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 DOCTORACCOUNTDEPART,
+手术医生核算科室编码 as DOCTORACCOUNTDEPARTCODE,
+	        住院科室 as ascriptionDepartment 
+ 	FROM gzyhis.xdgyxtbrjk_zy
+	WHERE 住院号 = #{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>
+  
+</mapper>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/interfaces/mybatis/syncFromHERP_Mapper.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/interfaces/mybatis/syncFromHERP_Mapper.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzzyyfs/interfaces/mybatis/syncFromHERP_Mapper.xml	(revision 37537)
@@ -0,0 +1,117 @@
+<?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">
+<mapper namespace="com.forgon.disinfectsystem.inventorymanagement.dao.InventoryDao"> 
+ <!-- 按单号查找入库单 -->
+ <select id="findInEntryBySerialNumber" resultType="StorageEntry">
+  	<![CDATA[
+	SELECT serialNumber,time,remark 
+	FROM xi_sf.CSSD_MATERIALENTRY
+	WHERE SERIALNUMBER  = #{inEntrySerialNumber}
+	]]>
+ </select>
+<!-- 按时间查找入库单 -->
+ <select id="findInEntryByTime" resultType="StorageEntry">
+  	<![CDATA[
+	SELECT serialNumber,time,remark
+	FROM xi_sf.CSSD_MATERIALENTRY
+	where 1=1
+	]]> 
+	<if test="startDate != null">
+		and  to_date(time, 'yyyy-MM-dd') >= #{startDate}
+	</if>
+	<if test="endDate != null">
+		<![CDATA[
+		and to_date(time, 'yyyy-MM-dd') <= #{endDate}
+		]]>
+	</if>
+	ORDER BY time	 
+  </select>
+
+<!-- 按单号查找入库单明细 -->
+<select id="findInEntryItem" resultType="StorageEntryItem">
+  	<![CDATA[
+	SELECT  
+	inventorySerialNumber,
+	BATCH_NUM AS batchNumber,
+	amount,
+	expDate,
+	name,
+	specification,
+	cost unitPrice,
+	XFREE5 sterialBatchNumber
+	FROM  xi_sf.CSSD_MaterialEntryItem
+	WHERE SERIALNUMBER = #{inEntrySerialNumber}
+	]]>
+</select> 
+
+<!-- 按物资编码查找物资信息 -->
+<select id="getInventory" resultType="Inventory">
+	<![CDATA[
+		SELECT serialNumber,name,specification,unit
+		FROM xi_sf.CSSD_MATERIALDEFINITION
+		WHERE serialNumber = #{inventorySerialNumber}
+		and rownum = 1
+	]]>
+</select> 
+<!-- 按名称规格查找物资信息 -->
+<select id="findInventory" resultType="Inventory">
+	<![CDATA[
+		SELECT serialNumber,name,specification,unit
+	FROM  xi_sf.CSSD_MATERIALDEFINITION
+	WHERE name = #{name}
+	<choose>
+		<when test="specification != null">
+			AND specification = #{specification}
+		</when >
+		<otherwise>
+			AND ((specification is null) OR (specification =''))
+		</otherwise>
+	</choose>
+	]]<name />
+</select> 
+<!-- 按单号查找退库单 -->
+<select id="findOutEntryBySerialNumber" resultType="StorageEntry">
+	<![CDATA[
+	SELECT serialNumber,time,remark
+	FROM  xi_sf.CSSD_GodownEntry
+	WHERE serialNumber = #{inEntrySerialNumber}
+	]]>
+</select>
+
+<!-- 按时间查找退库单 -->
+<select id="findOutEntryByTime" resultType="StorageEntry">
+  	<![CDATA[
+	SELECT serialNumber,time,remark
+	FROM xi_sf.CSSD_GodownEntry
+	WHERE 1=1
+	]]> 
+	<if test="startDate != null">
+		and  to_date(time, 'yyyy-MM-dd') >= #{startDate}
+	</if>
+	<if test="endDate != null">
+		<![CDATA[
+		and to_date(time, 'yyyy-MM-dd') <= #{endDate}
+		]]>
+	</if>
+	ORDER BY time
+ </select> 
+
+<!-- 按单号查找退库单明细 -->
+<select id="findOutEntryItem" resultType="StorageEntryItem">
+	<![CDATA[
+    SELECT inventorySerialNumber,
+	BATCH_NUM AS batchNumber,
+	expDate,
+	amount,
+	name,
+	cost unitPrice,
+	specification,
+	XFREE5 sterialBatchNumber
+	FROM xi_sf.CSSD_GodownEntryItem t1
+    inner join xi_sf.CSSD_GodownEntry t2 on t2.id = t1.godownEntryId
+	WHERE SERIALNUMBER = #{inEntrySerialNumber}
+	]]>
+</select> 
+</mapper> 
\ No newline at end of file