Index: ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/spring/timer.xml
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/spring/timer.xml	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/spring/timer.xml	(revision 35800)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+
+<beans>
+	
+    <bean id="schedulerFactoryBean" class = "org.springframework.scheduling.quartz.SchedulerFactoryBean">
+        <property name="triggers">
+            <list>
+                   <ref bean="deviceInterfaceDataProcessTimerTask"/>
+            </list>
+        </property>
+    </bean>
+    
+</beans>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r28562 -r35800
--- ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 28562)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 35800)
@@ -7,32 +7,27 @@
   <!-- 按住院号查找病人信息:提供给使用记录页面的按住院号查询 -->
   <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  
+         SEQNOTEXT AS hospitalNumber,
+         patientName,
+		 SEXFLAG AS patientSex,
+         floor(months_between(sysdate, BIRTHTIME)/12) AS patientAge,
+         ID_NO AS patientIDCard
+      from apps.v_inpatient_gongyingshi
+	  WHERE ENCOUNTERID = #{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  
+         CODE_IP AS hospitalNumber,
+         NAME_PI AS patientName,
+         TRUNC(months_between(sysdate, BIRTH_DATE)/12) AS patientAge,
+         ID_NO AS patientIDCard
+      from apps.v_inpatient_gongyingshi
+	  WHERE CODE_IP = #{hospitalNum}
 	]]>
   </select>
   
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/print/printConfig.js
===================================================================
diff -u -r32799 -r35800
--- ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/print/printConfig.js	(.../printConfig.js)	(revision 32799)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/print/printConfig.js	(.../printConfig.js)	(revision 35800)
@@ -169,13 +169,13 @@
 	rowsPerPage: 9,
 	headerContent: [
 		// 页眉名称
-		{ label: "中山大学附属第二医院", dataIndex: '', fontSize: 12, position: ["5", "1%", "90%", 5] },
+		{ 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: '', 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: '', fontSize: 11, position: ["55", "75%", "90%", 5] },
+		{ label: "申领人:", dataIndex: 'applicant', 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] }
 	],
@@ -184,22 +184,22 @@
 		position: ["100", "1%", "97%", "2000"],
 		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: '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: 'goodsName', width: 340, align: 'center', fontSize: 11 },
+			//{ header: "规格", dataIndex: 'sp', width: 185, 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: 'center', fontSize: 11 },
+			{ header: "签名", dataIndex: '', width: 60, align: 'center', fontSize: 11 }
 			//header : "金额", dataIndex : 'rowPrice', width : 75, align : 'right', fontSize : 11}
 		]
 	},
 	footer: {
 		fontSize: 12,
 		content: [
-			{ label: "<br>主管:      ", dataIndex: '' },
-			{ label: "   领料人:      ", dataIndex: '' },
-			{ label: "   发料人: ", dataIndex: 'printUser' },
-			{ label: "   发货日期:", dataIndex: 'printTime' }
+			//{ label: "<br>主管:      ", dataIndex: '' },
+			//{ label: "   领料人:      ", dataIndex: '' },
+			//{ label: "   发料人: ", dataIndex: 'printUser' },
+			//{ label: "   发货日期:", dataIndex: 'printTime' }
 		]
 	},
 	barcodes: [
@@ -236,17 +236,18 @@
 		position: ["50", "1%", "99%", "6.0cm"],
 		headRepeat: true,
 		columns: [
-			{ header: "序号", dataIndex: 'serialNumber', width: '100', align: 'center', fontSize: 11 },
-			{ header: "编码", dataIndex: 'externalCode', width: '150', align: 'center', fontSize: 11 },
+			{ header: "序号", dataIndex: 'serialNumber', width: '50', align: 'center', fontSize: 11 },
+			//{ header: "编码", dataIndex: 'externalCode', width: '150', align: 'center', fontSize: 11 },
 			{ header: "名称", dataIndex: 'name', width: '150', align: 'center', fontSize: 11 },
-			{ header: "规格", dataIndex: 'specification', width: '150', align: 'center', fontSize: 11 },
+			
+			//{ header: "规格", dataIndex: 'specification', width: '150', align: 'center', fontSize: 11 },
 			//    	                {header : "包装规格", dataIndex : 'packageSpec', width : '15%', align : 'center', fontSize : 11},
-			{ header: "单位", dataIndex: 'unit', width: '100', align: 'center', fontSize: 11 },
-			{ header: "数量", dataIndex: 'amount', width: '100', align: 'center', fontSize: 11 }
+			{ header: "单位", dataIndex: 'unit', width: '30', align: 'center', fontSize: 11 },
+			{ header: "数量", dataIndex: 'amount', width: '30', align: 'center', fontSize: 11 },
 			//{header : "有效日期", dataIndex : 'expireDate', width : 85, align : 'center', fontSize : 11},
 			//{header : "批号", dataIndex : 'batchNumber', width : 105, align : 'center', fontSize : 11}
-			//    	                {header : "单价", dataIndex : 'price', width : '10%', align : 'right', fontSize : 11},
-			//    	                {header : "金额", dataIndex : 'totalPrice', width : '10%', align : 'right', fontSize : 11}
+			 {header : "单价", dataIndex : 'price', width : '10%', align : 'right', fontSize : 11},
+			{header : "金额", dataIndex : 'totalPrice', width : '15%', align : 'right', fontSize : 11}
 		]
 	}
 };
@@ -285,11 +286,11 @@
 		headRepeat: true,
 		columns: [
 			{ header: "序号", dataIndex: 'serialNumber', width: '10%', align: 'center', fontSize: 11 },
-			{ header: "名称", dataIndex: 'name', width: '30%', align: 'left', fontSize: 11 },
-			{ header: "规格", dataIndex: 'specification', width: '15%', align: 'center', fontSize: 11 },
-			{ header: "包装规格", dataIndex: 'packageSpec', width: '15%', align: 'center', fontSize: 11 },
-			{ header: "单位", dataIndex: 'unit', width: '5%', align: 'center', fontSize: 11 },
-			{ header: "数量", dataIndex: 'amount', width: '5%', align: 'right', fontSize: 11 },
+			{ header: "名称", dataIndex: 'name', width: '50%', align: 'left', fontSize: 11 },
+			//{ header: "规格", dataIndex: 'specification', width: '15%', align: 'center', fontSize: 11 },
+			//{ header: "包装规格", dataIndex: 'packageSpec', width: '15%', align: 'center', fontSize: 11 },
+			//{ header: "单位", dataIndex: 'unit', width: '5%', align: 'center', fontSize: 11 },
+			{ header: "数量", dataIndex: 'amount', width: '10%', align: 'right', fontSize: 11 },
 			//    	                {header : "批次/灭菌日期", dataIndex : 'batchNumber', width : 105, align : 'center', fontSize : 11},
 			//    	                {header : "失效日期", dataIndex : 'expireDate', width : 85, align : 'center', fontSize : 11},
 			{ header: "单价", dataIndex: 'price', width: '10%', align: 'right', fontSize: 11 },
@@ -1431,7 +1432,27 @@
 		]
 	}
 }
-
+var invoiceItemSummaryConfig = {
+		headerFooter : [
+	            // 页眉名称
+	            {label : "中山大学附属第二医院发货物品汇总", dataIndex : '', fontSize : 15, position : ["0.3cm","20%","99%",5]}
+	        ],
+	        currentPageNumber : {label : "第#页", fontSize : 11, position : ["0.4cm","80%","90%",5]},
+	        totalPageAmount : {label : "共&页", fontSize : 11, position : ["0.4cm","85%","90%",5]},
+	        goodsTable :{
+	        	rowHeight : 20,
+	        	//position : ["50","1%","96%","6.0cm"],
+	        	fontSize:16,
+	        	position : ["1.0cm","0.2cm","99%","28cm"],
+	        	headRepeat : true,
+	        	columns : [
+    	            {header : "物品名称", dataIndex : 'displayName', width : 200, align : 'center'},
+    	            //{header : "批次", dataIndex : 'batchNumber', width : 160, align : 'center'},
+    	            //{header : "出库仓库", dataIndex : 'warehouseName', width : 60, align : 'center'},
+    	            {header : "数量", dataIndex : 'amount', width : 60, align : 'center'}
+	    	    ]
+	    }
+};
 var foreignTousseAppliationPrintConfig = {
 	isPrintTousse: true,
 	isPrintDisinfectGoods: false,
@@ -1574,6 +1595,8 @@
 	invoiceDisinfectGoods: invoiceComboPrintConfig,
 	// 申请单
 	application: applicationPrintConfig,
+    //发货物品统计
+    invoiceItemSummary : invoiceItemSummaryConfig,
 	// 消毒物品申请单
 	disinfectGoodsApplication: applicationPrintConfig,
 	// 借物单
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/img/logo_zsdxfsdeyy.png
===================================================================
diff -u -r31781 -r35800
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/spring/HIS.xml
===================================================================
diff -u -r30717 -r35800
--- ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/spring/HIS.xml	(.../HIS.xml)	(revision 30717)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/spring/HIS.xml	(.../HIS.xml)	(revision 35800)
@@ -65,7 +65,7 @@
            value="com.forgon.disinfectsystem.datasynchronization.dao.FindPatientInfoByHospitalNumDao" />  
        <property name="sqlSessionFactory">
             <bean class="org.mybatis.spring.SqlSessionFactoryBean">
-                <property name="dataSource" ref="hisDataSource" />
+                <property name="dataSource" ref="orclDataSource" />
                 <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/zsdxfsdeyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml" />
                 <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
             </bean>
@@ -77,7 +77,7 @@
            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="orclDataSource" />
                 <property name="mapperLocations" value="file:///#{T(com.forgon.tools.Path).webROOT}/disinfectsystem/config/zsdxfsdeyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml" />
                 <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
             </bean>
@@ -92,7 +92,15 @@
         <property name="user" value="dingxiang" />  
         <property name="password" value="Dingxiang" />
     </bean>
-    
+
+	<!-- 住院病人信息数据源 -->
+      <bean id="orclDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">
+    	<property name="driverClass" value="oracle.jdbc.OracleDriver" />  
+        <property name="jdbcUrl" value="jdbc:oracle:thin:@//192.168.10.117:1521/clinicdb" />
+        <property name="user" value="dingxiang" />  
+        <property name="password" value="Dingxiang" />
+    </bean>
+     
    <bean id="inventoryManagerTarget"
 		class="com.forgon.disinfectsystem.inventorymanagement.service.InventoryManagerImpl">
 	</bean>
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/config.js
===================================================================
diff -u -r35611 -r35800
--- ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/config.js	(.../config.js)	(revision 35611)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/config.js	(.../config.js)	(revision 35800)
@@ -6,11 +6,11 @@
   // 审核器械包必须入篮筐（二级供应室）
   mustScanBasketForTousseReviewOf2ndSupplyRoom : false,
   // 申请表单的类型：1 ： 通用申请单（组合申请单），2：分开的申请单
-  applicationFormType : 1,
+  applicationFormType : 2,
   //在界面上是否隐藏一次性物品的包装规格信息
   hidePackageSpec : false,
   // 申请界面是否显示器械包或消毒物品的的单位
-  showTousseUnitColumn : true,		
+  showTousseUnitColumn : true,    
   // 条码类型：1：一维码， 2：二维码
   barcodeType : 1,
   // 申请器械包时是否自动归还待归还物品
@@ -34,7 +34,7 @@
   //提交申请单前显示申请的物品清单
   showAppliedGoodsBeforeSubmit : false,
   //是否审核时打印标签，为true时点审核按钮才打印标签；否则在装配时打印标签
-  printLabelWhenReviewing : true,
+  printLabelWhenReviewing : false,
   //在材料管理界面是否启用“是否统计工作量”属性
   enableStatisticWorkLoad : true,
   //使用记录模块的使用记录登记表单，巡回护士输入框是否为空
@@ -48,11 +48,11 @@
   //自定义装配后是否保留灭菌日期
   disinfectionDateProcessTypeInDirectPackingView : true,
   // 使用记录审核方式， 1: 审核和转换按钮分开； 2：审核和转换按钮合并为1个
-  useRecordAuditMode : 1,
+  useRecordAuditMode : 2,
   hideApplyDepartColumn : false, // 隐藏申请科室
   hideSettleDepartColumn : true,// 隐藏结算科室
   //回收界面回收人是否强制不能为空
-  recyclePageRecyclingUserNotNull : false,
+  recyclePageRecyclingUserNotNull : true,
   //回收一键入筐
   recycleAllTousseIntoBasket : true,
   //是否显示按照时间查询
@@ -77,12 +77,16 @@
   notNeedMinApplyAmountBeforeUnit : true,
   //科室申领列表自动刷新间隔时间(单位:秒)
   autoRefreshApplicationDataIntervalSeconds : 600,
+  //回收时允许修改申请单备注
+  modifyRemarkInRecycling: true,
   //在灭菌视图界面是否显示“生物监测的状态”属性
   showBiologicalMonitoringStatus : true,
   //是否显示辅助发货按钮
   showAuxiliaryInvoiceBtn : true,
-  //公司名称 "dingxiang"显示主页显示丁香的logo
-  companyName : "dingxiang",
+  //医院名称 "zsdxfsdeyy"显示主页显示丁香的logo
+  companyName : "zsdxfsdeyy",
+  //医院LOGO大小
+  logoSetting : { "width" : 370, "height" : 59 },
   //是否显示包实例科室(待灭菌与待灭菌装载的表格)
   showDepartOfTousseInstanceSterile : true,
   //对申请单的物品申请数量是否启用干预功能
@@ -134,7 +138,7 @@
   //禁用一次性物品
   //disableDisposableGoods:true,
   //禁用自定义表单
-  closeFormDefinition:true,
+  closeFormDefinition:false,
   //启用培训管理
   hideTrainingManage:false,
   //清洗机硬件接口
@@ -173,10 +177,104 @@
   toussePicturesShow:true,
   //显示炉号炉次
   showSterilizer : true,
+  //发货管理界面,是否启用发货物品汇总功能
+  enableInvoiceItemSummary : true,
+  //“在右下角弹窗提醒”更改为“强制在屏幕中间弹窗”
+  showTousseNoteOnClickTousse:true,
+ //使用记录模块的使用记录登记表单，手术间输入框是否允许为空
+  useRecordOperationRoomAllowBlank:true,
+  //只允许选择已存在的手术间
+  onlySelectExistedOperationRoom : true,
+  //是否启用手术间管理界面
+  enableOperationRoomManagerViwe : true,
+  expandFieldsOfForeignTousseApplicationForm : ["sterilizationMethodWrapper"],
+  //外来器械拆分小包名称带总拆包数量
+  nameIncludeSplitTotalAmountForSplitForeignTousse : true,
+  //自定义入筐是否启用输入装载数量进行入筐操作
+  enableCustomIntoBasketWithCustomAmount : true,
+  //灭菌装载是否启用首尾条码机制
+  enableBeginEndBarcodeScan : true,
+  //启用器械包定义中的【是否发货】的属性
+  enableIsInvoice : true,
+  //是否启用急用物品处理周期统计报表
+  enableUrgentNeedGoodsProcessingCycleReport : true,
+  //急用物品处理周期统计报表启用对手工添加的回收单上的已装配物品的查询
+  enableQueryOfPackedToussesInRecyclingRecordWhichManuallyAdded : true,
+  //是否隐藏加急数量
+  isHideUrgentAmount : true,
+  //是否隐藏灭菌管理-外部代理灭菌里的申请人
+  hideCssdForeignProxyDisinfectionApplicant : true,
+  //回收人默认用登录用户
+  recyclingUserDefault : true,
+  //回收界面清点人默认是否为当前登录人
+  recyclePageCheckUserDefaultCurrentUser:false,
+  enableOperationReservation : true,
+  //器械包信息，进度条功能
+  enableTousseStatusProgressBar : true,
+  //是否在个人桌面显示外部代理灭菌的图标
+  desktopShortcutIconsConfig:["自定义表单","外部代理灭菌","外来器械申请"],
+  //启用生物阅读器接口
+  enableBioreaderInterface : true,
+  //添加回收申请单是否加载申领模板
+  isLoadApplyTemplateForAddRecycleRecord : true,
+  //是否启用器械包定义所属科室属性
+  enableTousseDefinitionBelongDepart : true,
+  //登陆系统后选择科室
+  defaultShowOrgChange : true,
+  //器械包种类功能
+  enableInstrumentSetTypeSetting : true,
+  //启用积分功能
+  enableToussePointsStatistics : true,
+  //开启外来器械申请单统计报表材料汇总显示
+  enableShowForeignTousseApplicationReportSummaryOfMaterials : true,
+  //开启外来器械申请单统计报表材料显示
+  enableShowForeignTousseApplicationReportMaterials : true,
+  //电子签收，扫描发货单进行签收
+  serialNumberSignType:2,
+  //是否启用器械包定义所属科室过滤
+  enableTousseDefinitionBelongDepartFilter : true,
+  //使用记录增加字段
+  enableUseRecordFormExtensionFields:["麻醉医生","主刀医生"],
+  //历史回收记录字段设置
+  enableTableColumnCustomizationForTheHistoryRecyclingRecordList :["科室","回收时间","包数","清点人","手术间"],
+  //是否允许外来器械部分装配
+  allowForeignToussePartiallyPacking : true,
+  //住院号去除前缀【30.】
+  wristBandHospitalNumberPrefix:"30.",
+  //隐藏打印装配物品清单
+  packingView_currentTaskGroup_showPrintBtn:false,
+  //预回收功能
+  prepareRecycleVersion:1,
+  //允许部分回收
+  enablePartRecycle : true,
+  //预回收功能增加手术间显示
+  displayOfOperatingRoomAndPatientInformationOnThePrepareRecycleScreenInPDA : true,
+  //预回收拍照功能
+  enablePrepareRecycleShoot : true,
+  //隐藏预回收确认人
+  hiddenPreRecyclingConfirmPeople : true,
+  //隐藏预回收时间
+  hiddenPreRecyclingTime : true,
+  //使用记录必填项设置
+  notAllowBlankFieldsOnUseRecordPage :["patientName","circuitNurse","washHandNurse","operationRoom"],
+  //PDA使用记录的洗手，巡回允许为空
+  useRecordCircuitNurseAllowBlank : true,
+  //外来器械是否允许部分发货
+  allowPartlyInvoiceForeignTousse : true,
+  //科室申领是否启用黑白名单过滤物品
+  appIsUseBwList : true,
+  //按手术间合并
+  useRecordConvertRecyclingApplicationMergeRegular : "operationRoom",
+  //手术间为空时，按科室进行合并
+  allowUseReordToApplicationMergeWhenOperationRoomIsBlank : true,
+  //待装配任务列表的清洗篮筐显示篮筐条码
+  showBarcodeOfWashBasketInPackingTaskList : true,
+  //辅助发货的物品类型
+  auxiliaryInvoiceTousseTypes:"敷料包,普通器械包,外来器械包,外部代理灭菌包,消毒物品",
+  //限制同一个手术间只能登记一个未审核的使用记录
+  limitOneOperationRoomCanOnlyRegistOneUnAuditedUseRecord : true,
   //是否启用预回收通知功能
   enableNotifiOfPrepareRecycleFunction:true,
-  //是否限制同一个手术间只能登记一个未审核的使用记录,true:提示false:不提示
-  limitOneOperationRoomCanOnlyRegistOneUnAuditedUseRecord: true,
-  //发货管理界面,是否启用发货物品汇总功能
-  enableInvoiceItemSummary : true
+  //器械维修管理功能
+  enableInstrumentRepairManagement : true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
===================================================================
diff -u -r28562 -r35800
--- ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 28562)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 35800)
@@ -7,15 +7,14 @@
   <!-- 按门诊号查找病人信息 -->
   <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  SEQNOTEXT AS clinicNumber,
+	        SEQNOTEXT AS hospitalNumber,
+        	patientName,
+			SEXFLAG AS patientSex,
+	        floor(months_between(sysdate, BIRTHTIME)/12) AS patientAge,
+	        ID_NO AS patientIDCard 
+    from apps.v_inpatient_gongyingshi
+    WHERE SEQNOTEXT = #{hospitalNum}
 	]]>
   </select>