Index: ssts-web/src/main/webapp/disinfectsystem/config/sdqdermyy/spring/HIS.xml
===================================================================
diff -u -r30469 -r37169
--- ssts-web/src/main/webapp/disinfectsystem/config/sdqdermyy/spring/HIS.xml	(.../HIS.xml)	(revision 30469)
+++ ssts-web/src/main/webapp/disinfectsystem/config/sdqdermyy/spring/HIS.xml	(.../HIS.xml)	(revision 37169)
@@ -88,9 +88,9 @@
     <!-- 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="jdbcUrl" value="jdbc:sqlserver://192.168.1.6:1433;databaseName=gzyyhis" />
+        <property name="user" value="GYSZSXTUSER" />  
+        <property name="password" value="GYSZSXT20200428" />
     </bean>
     
    <bean id="inventoryManagerTarget"
Index: ssts-web/src/main/webapp/disinfectsystem/config/sdqdermyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r30469 -r37169
--- ssts-web/src/main/webapp/disinfectsystem/config/sdqdermyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 30469)
+++ ssts-web/src/main/webapp/disinfectsystem/config/sdqdermyy/interfaces/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 37169)
@@ -3,8 +3,7 @@
   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 h.hospitalNumber patientNumber,
@@ -14,14 +13,14 @@
 	        h.patientIDCard patientIDCard,
 	        h.doctorName doctorName,
 	        h.operation operation,
+			h.patientArea patientArea,
 	        convert(varchar,h.operationTime,120) operationTime
 	FROM CSSD_HospitalNumber h
 	WHERE h.hospitalNumber = #{hospitalNum}
+	order by h.operationTime desc
 	]]>
   </select>
-  
-  <!-- 按住院号查找病人信息:提供给外来器械申请单页面的按住院号查询 -->
-  <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
+   <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
   <![CDATA[
 	SELECT h.hospitalNumber patientNumber,
         	h.patientName patientName,
@@ -30,9 +29,11 @@
 	        h.patientIDCard patientIDCard,
 	        h.doctorName doctorName,
 	        h.operation operation,
+			h.patientArea patientArea,
 	        convert(varchar,h.operationTime,120) operationTime
 	FROM CSSD_HospitalNumber h
 	WHERE h.hospitalNumber = #{hospitalNum}
+	order by h.operationTime desc
 	]]>
   </select>
   
Index: ssts-web/src/main/webapp/disinfectsystem/config/sdqdermyy/config.js
===================================================================
diff -u -r33154 -r37169
--- ssts-web/src/main/webapp/disinfectsystem/config/sdqdermyy/config.js	(.../config.js)	(revision 33154)
+++ ssts-web/src/main/webapp/disinfectsystem/config/sdqdermyy/config.js	(.../config.js)	(revision 37169)
@@ -80,7 +80,7 @@
   //在灭菌视图界面是否显示“生物监测的状态”属性
   showBiologicalMonitoringStatus : true,
   //是否显示辅助发货按钮
-  showAuxiliaryInvoiceBtn : false,
+  showAuxiliaryInvoiceBtn : true,
   //公司名称 "dingxiang"显示主页显示丁香的logo
   companyName : "dingxiang",
   //是否显示包实例科室(待灭菌与待灭菌装载的表格)
@@ -142,5 +142,21 @@
   disableDeviceInterface:false,
   enableUrgentFunction:true,
   //炉次炉号
-  showSterilizer:true
+  showSterilizer:true,
+  //申领模板
+  isOpenLoadTemplateByUnit:true,
+  //可以部分器械先入框保存
+  enableParecycle:true,
+  //回收界面默认是上一次回收人
+  recyclePageRecyclingUserDefaultLastRecyclingUser:true,
+  //启动手工关闭添加器械包窗口
+  enableUserManuallyCloseAddTousseWindoe:true,
+  //可以部分器械先入框保存
+  enablePartRecycle:true,
+  //保存上个回收清洗框
+  loadWashBasketsAfterSaveAndCreateNewRecyclingRecord:true,
+  //装配时有序号
+  enablePackingSerialNum:true
+  //启动手工关闭添加器械包窗口
+  //enableUserManuallyCloseAddTousseWindow:true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/config/sdqdermyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml
===================================================================
diff -u -r30469 -r37169
--- ssts-web/src/main/webapp/disinfectsystem/config/sdqdermyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 30469)
+++ ssts-web/src/main/webapp/disinfectsystem/config/sdqdermyy/interfaces/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 37169)
@@ -7,15 +7,10 @@
   <!-- 按门诊号查找病人信息 -->
   <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 h.mzh clinicNumber,
+        	h.xm patientName
+	       	FROM CSSD_ClinicNumber h
+		WHERE h.mzh = #{treatmentNum}
 	]]>
   </select>