Index: ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/PatientInfoVO.java
===================================================================
diff -u -r14709 -r15223
--- ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/PatientInfoVO.java	(.../PatientInfoVO.java)	(revision 14709)
+++ ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/PatientInfoVO.java	(.../PatientInfoVO.java)	(revision 15223)
@@ -75,10 +75,6 @@
 
 	public void setPatientNumber(String patientNumber) {
 		this.patientNumber = patientNumber;
-		if(CommonVo.NEEDTRANSCODING_Y.equals(getNeedTranscoding())){
-			//病人姓名转码
-			setPatientName(getValueAfterTransCoding(getPatientName()));
-		}
 	}
 
 	public String getPatientName() {
@@ -95,10 +91,6 @@
 
 	public void setPatientAge(String patientAge) {
 		this.patientAge = patientAge;
-		if(CommonVo.NEEDTRANSCODING_Y.equals(getNeedTranscoding())){
-			//病人性别转码
-			setPatientSex(getValueAfterTransCoding(getPatientSex()));
-		}
 	}
 
 	public String getPatientSex() {
@@ -123,10 +115,6 @@
 
 	public void setPatientArea(String patientArea) {
 		this.patientArea = patientArea;
-		if(CommonVo.NEEDTRANSCODING_Y.equals(getNeedTranscoding())){
-			//病人所属病区转码
-			setPatientArea(getValueAfterTransCoding(getPatientArea()));
-		}
 	}
 
 	public String getRoomNumber() {
@@ -143,10 +131,6 @@
 
 	public void setDoctorName(String doctorName) {
 		this.doctorName = doctorName;
-		if(CommonVo.NEEDTRANSCODING_Y.equals(getNeedTranscoding())){
-			//医生名字转码
-			setDoctorName(getValueAfterTransCoding(getDoctorName()));
-		}
 	}
 
 	public String getOperation() {
@@ -155,10 +139,6 @@
 
 	public void setOperation(String operation) {
 		this.operation = operation;
-		if(CommonVo.NEEDTRANSCODING_Y.equals(getNeedTranscoding())){
-			//手术名称转码
-			setOperation(getValueAfterTransCoding(getOperation()));
-		}
 	}
 	
 	public String getOperationTime() {
@@ -293,6 +273,26 @@
 			//病人所属病区转码
 			setPatientArea(getValueAfterTransCoding(getPatientArea()));
 			logger.debug("set病人转码后信息getPatientArea():" + getPatientArea());
+			
+			logger.debug("set病人转码前信息getCircuitNurse():" + getCircuitNurse());
+			//巡回护士转码
+			setCircuitNurse(getValueAfterTransCoding(getCircuitNurse()));
+			logger.debug("set病人转码后信息getCircuitNurse():" + getCircuitNurse());
+			
+			logger.debug("set病人转码前信息getWashHandNurse():" + getWashHandNurse());
+			//洗手护士转码
+			setWashHandNurse(getValueAfterTransCoding(getWashHandNurse()));
+			logger.debug("set病人转码后信息getWashHandNurse():" + getWashHandNurse());
+			
+			logger.debug("set病人转码前信息getRemark():" + getRemark());
+			//备注转码
+			setRemark(getValueAfterTransCoding(getRemark()));
+			logger.debug("set病人转码后信息getRemark():" + getRemark());
+			
+			logger.debug("set病人转码前信息getSpecialInfection():" + getSpecialInfection());
+			//特殊感染类型转码
+			setSpecialInfection(getValueAfterTransCoding(getSpecialInfection()));
+			logger.debug("set病人转码后信息getSpecialInfection():" + getSpecialInfection());
 		}
 	}
 	
Index: ssts-web/src/main/resources/config/zsszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r13561 -r15223
--- ssts-web/src/main/resources/config/zsszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 13561)
+++ ssts-web/src/main/resources/config/zsszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 15223)
@@ -14,9 +14,14 @@
 	        h.patientIDCard patientIDCard,
 	        h.doctorName doctorName,
 	        h.operation operation,
-	        h.VISIT_ID visitId,
+	        h.patientArea patientArea,
+			h.bedNumber bedNumber,
+			h.remark remark,
+			h.operationRoom opRoomId,
+			h.circuitNurse circuitNurse,
+			h.washHandNurse washHandNurse,
 	        '1' needTranscoding
-	FROM VIEW_inpatient_patient_info h
+	FROM ZyyZhuiSu_VIEW h
 	WHERE h.hospitalNumber = #{hospitalNum}
 	]]>
   </select>
Index: ssts-web/src/main/resources/spring/projects/zsszyy/applicationContext-his.xml
===================================================================
diff -u -r15004 -r15223
--- ssts-web/src/main/resources/spring/projects/zsszyy/applicationContext-his.xml	(.../applicationContext-his.xml)	(revision 15004)
+++ ssts-web/src/main/resources/spring/projects/zsszyy/applicationContext-his.xml	(.../applicationContext-his.xml)	(revision 15223)
@@ -41,6 +41,7 @@
         class="com.forgon.disinfectsystem.datasynchronization.dwr.DataSynchronizationTableManager">
     </bean>
     
+    <!-- his系统数据源:用于人员、科室、使用记录根据诊疗号的病人接口等 -->
     <bean id="hisDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">
         <property name="driverClass" value="oracle.jdbc.OracleDriver" />  
         <!-- <property name="jdbcUrl" value="jdbc:wrap-jdbc:filters=encoding:jdbc:oracle:thin:@//10.0.254.15:1521/his.zsszyy" /> -->  
@@ -53,8 +54,14 @@
         <property name="jdbcUrl" value="jdbc:odbc:his" /> -->
     </bean>
     
+    <!-- 手麻系统数据源:用于使用记录根据住院号的病人接口等 -->
+    <bean id="operationDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">
+        <property name="driverClass" value="oracle.jdbc.OracleDriver" />  
+        <property name="jdbcUrl" value="jdbc:oracle:thin:ZhuiSu/ZhuiSu80316@//10.0.254.65:1521/DOCARE" />
+        <property name="user" value="ZhuiSu" />  
+        <property name="password" value="ZhuiSu80316" />
+    </bean>
     
-    
     <!-- 由MyBatis实现访问HIS数据的Dao接口-->
     <bean id="syncOrgUnitAndUserDao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
        <property name="mapperInterface"  
@@ -73,7 +80,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="operationDataSource" />
                 <property name="mapperLocations" value="classpath*:config/zsszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml" />
                 <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
             </bean>
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r15198 -r15223
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 15198)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 15223)
@@ -229,6 +229,9 @@
 	top.Ext.getCmp('roomNumber').setValue(patientInfo.roomNumber);
 	top.Ext.getCmp('visitId').setValue(patientInfo.visitId);
 	top.Ext.getCmp('operationRoom').setValue(patientInfo.opRoomId);
+	top.Ext.getCmp('remark').setValue(patientInfo.remark);
+	top.Ext.getCmp('circuitNurse').setValue(patientInfo.circuitNurse);
+	top.Ext.getCmp('washHandNurse').setValue(patientInfo.washHandNurse);
 }
 
 // 获取扫描的物品所有条码