Index: ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/config.js
===================================================================
diff -u -r22653 -r22737
--- ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/config.js	(.../config.js)	(revision 22653)
+++ ssts-web/src/main/webapp/disinfectsystem/config/gzs12rmyy/config.js	(.../config.js)	(revision 22737)
@@ -82,12 +82,19 @@
   packAmountProcessTypeInDirectPackingView:2,
   //自定义装配界面,灭菌日期的处理方式	0或者未定义:清空,1:表示保留当前值,2表示设置回默认值。其他值跟1一样，保留当前值
   disinfectionDateProcessTypeInDirectPackingView:2,
+  //发货数量依据回收单,回收后发货的情况下,打印未回收的申请单,是否打印申请数量。
   printApplyInfo:true,
   //是否启用回收申请单不发货科室配置
   enableRecyclingApplicationNotInvoice:true,
   //回收时，申请数量与回收数量不一致，是否要确认
   confirmRecyclingAmount:false,
   //打印发货单的版本,如果为2,则表示批量打印使用分组打印方式,并有下拉菜单,目前除
   //配置为2以外的其他值都使用以前的单科室的多单打印	2:批量打印使用分组打印方式,并有下拉菜单其他：使用以前的单科室的多单打印	
-  printInvoiceVersion:2
+  printInvoiceVersion:2,
+  //一次性物品申库存数量依据是否使用库存数量减去待发货数量	只有为true时才启用，false或不配置都不启用
+  storageUseStorageSubtractWaitDeliver : true,
+  //autoReturnTousse	申请器械包时是否自动归还待归还物品	true ： 自动归还 false ： 不自动归还	
+  autoReturnTousse : true,
+  //启用器械包的是否发货功能	默认不启用 true:启用 false:不启用 (为0或''等不启用,其它值启用)
+  enableIsInvoice:true
 }
\ No newline at end of file
Index: ssts-web/src/main/resources/config/gzs12rmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r18573 -r22737
--- ssts-web/src/main/resources/config/gzs12rmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 18573)
+++ ssts-web/src/main/resources/config/gzs12rmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 22737)
@@ -8,60 +8,63 @@
  <!-- 按住院号查找病人信息:提供给使用记录页面的按住院号查询 -->
   <select id="findPatientInfoByHospitalNum" resultType="PatientInfoVO">
   <![CDATA[
-	select f.PATIENT_NO   hospitalNumber,
- f.inpatient_no searialNumber,
- f.name patientName,
- floor(months_between(SYSDATE, birthday) / 12)   patientAge,
- f.SEX_CODE  patientSex,
- f.IDENNO      patientIDCard,
- f.HOUSE_DOC_NAME     doctorName,
- null as operation,
- null as operationTime,
-  f.NURSE_CELL_NAME patientArea,
-   f.DEPT_NAME roomNumber,
-  null as  bedNumber, 
-  f.memo  	remark
-from  FIN_IPR_INMAININFO   f
+	  select hospitalNumber,
+			 searialNumber,
+			 patientName,
+			 patientAge,
+			 patientSex,
+			 patientIDCard,
+			 doctorName,
+			 operation,
+			 operationTime,
+			 patientArea,
+			 roomNumber,
+			 bedNumber, 
+			 remark
+	   from  srhis.view_cssd_hospitalnumber
+	   where hospitalNumber = #{hospitalNumber}
 	]]>
   </select>
   
   <!-- 按住院号查找病人信息:提供给外来器械申请单页面的按住院号查询 -->
   <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
   <![CDATA[
-	select f.PATIENT_NO   hospitalNumber,
- f.inpatient_no searialNumber,
- f.name patientName,
- floor(months_between(SYSDATE, birthday) / 12)   patientAge,
- f.SEX_CODE  patientSex,
- f.IDENNO      patientIDCard,
- f.HOUSE_DOC_NAME     doctorName,
- null as operation,
- null as operationTime,
-  f.NURSE_CELL_NAME patientArea,
-   f.DEPT_NAME roomNumber,
-  null as  bedNumber, 
-  f.memo  	remark
-from  FIN_IPR_INMAININFO   f
+      select hospitalNumber,
+			 searialNumber,
+			 patientName,
+			 patientAge,
+			 patientSex,
+			 patientIDCard,
+			 doctorName,
+			 operation,
+			 operationTime,
+			 patientArea,
+			 roomNumber,
+			 bedNumber, 
+			 remark
+	   from  srhis.view_cssd_hospitalnumber
+	   where hospitalNumber = #{hospitalNumber}
 	]]>
   </select>
 
   <!-- 按门诊号查找病人信息 -->
   <select id="findPatientInfoByTreatmentNum" resultType="PatientInfoVO">
   <![CDATA[
-	select t.card_no clinicNumber, ---诊疗号（门诊）
-t.clinic_code serialNumber, ---当前诊疗流水号
-t.name patientName, --病人姓名
-(select floor(MONTHS_BETWEEN(sysdate,c.birthday)/12)  from com_patientinfo c where c.card_no=t.card_no) patientAge,---病人年龄
-t.SEX_CODE patientSex, ---病人性别
-(select c.IDENNO  from com_patientinfo c where c.card_no=t.card_no)  patientIDCard, ---病人身份证号
-DOCT_NAME doctorName, --医生
-null as operation,
-null as operationTime,
-DEPT_NAME as patientArea,
-null as roomNumber,
-null as bedNumber,
-null as remark
-from  fin_opr_register  t 
+	 select clinicNumber,
+			serialNumber,
+			patientName, 
+			patientAge,
+			patientSex,
+			patientIDCard,
+			doctorName,
+			operation,
+			operationTime,
+			patientArea,
+			roomNumber,
+			bedNumber,
+			remark
+	  from  srhis.view_cssd_clinic 
+	  where hospitalNumber = #{hospitalNumber}
 
 ]]>
   </select>
Index: ssts-web/src/main/resources/spring/projects/gzs12rmyy/applicationContext-his-gzs12rmyy.xml
===================================================================
diff -u -r17591 -r22737
--- ssts-web/src/main/resources/spring/projects/gzs12rmyy/applicationContext-his-gzs12rmyy.xml	(.../applicationContext-his-gzs12rmyy.xml)	(revision 17591)
+++ ssts-web/src/main/resources/spring/projects/gzs12rmyy/applicationContext-his-gzs12rmyy.xml	(.../applicationContext-his-gzs12rmyy.xml)	(revision 22737)
@@ -44,8 +44,8 @@
     <bean id="hisDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">  
         <property name="driverClass" value="oracle.jdbc.OracleDriver" />  
         <property name="jdbcUrl" value="jdbc:oracle:thin:@//192.168.2.32:1521/his" />  
-        <property name="user" value="mediexam" />  
-        <property name="password" value="system1901" />
+        <property name="user" value="usr_his2wuzi" />  
+        <property name="password" value="his2wuzi" />
     </bean>