Fisheye: Tag 13496 refers to a dead (removed) revision in file `ssts-web/src/main/resources/spring/projects/zsszyy/applicationContext-his-gzfdzl.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/OrgUnitVo.java
===================================================================
diff -u -r12331 -r13496
--- ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/OrgUnitVo.java	(.../OrgUnitVo.java)	(revision 12331)
+++ ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/OrgUnitVo.java	(.../OrgUnitVo.java)	(revision 13496)
@@ -2,7 +2,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 
-public class OrgUnitVo {
+public class OrgUnitVo extends CommonVo {
 	public String coding;
 	public String name;
 	public String parentCoding;
@@ -26,7 +26,14 @@
 	}
 
 	public void setName(String name) {
+		logger.debug("set科室名称value:" + name);
 		this.name = name;
+		//字符集转码处理
+		if(CommonVo.NEEDTRANSCODING_Y.equals(getNeedTranscoding())){
+			logger.debug("set科室名称value转码:");
+			setName(getValueAfterTransCoding(getName()));
+			logger.debug("set科室名称value转码后的值:" + getName());
+		}
 	}
 
 	public String getParentCoding() {
@@ -75,4 +82,13 @@
 		this.spelling = spelling;
 	}
 
+	@Override
+	public void setNeedTranscoding(String needTranscoding) {
+		logger.debug("set科室名称value是否转码:" + needTranscoding);
+		//字符集转码处理
+		if(CommonVo.NEEDTRANSCODING_Y.equals(needTranscoding)){
+			setName(getValueAfterTransCoding(getName()));
+			logger.debug("set科室名称value是否转码后的值:" + getName());
+		}
+	}
 }
Index: ssts-web/src/main/resources/config/zsszyy/mybatis/SyncOrgUnitAndUserMapper.xml
===================================================================
diff -u -r13159 -r13496
--- ssts-web/src/main/resources/config/zsszyy/mybatis/SyncOrgUnitAndUserMapper.xml	(.../SyncOrgUnitAndUserMapper.xml)	(revision 13159)
+++ ssts-web/src/main/resources/config/zsszyy/mybatis/SyncOrgUnitAndUserMapper.xml	(.../SyncOrgUnitAndUserMapper.xml)	(revision 13496)
@@ -7,22 +7,20 @@
   <!-- 获取所有部门 -->
   <select id="getAllOrgUnit" resultType="OrgUnitVo">
   <![CDATA[
-	SELECT deptcode as coding,
-        	deptname as name,
-	        parentCoding as parentCoding
-	FROM cssd_department
-	where deptcode != 0
+	SELECT coding,name,parentCoding,'1' needTranscoding
+	FROM VIEW_HIS_DEPT where coding is not null and length(trim(coding)) > 0
+	and name is not null and length(trim(name)) > 0
+	and coding != '0'
 	]]>
   </select>
   
   <!-- 获取所有用户 -->
   <select id="getAllUser" resultType="UserVo">
   <![CDATA[
-	SELECT usercode as coding,
-        	username as name,
-	        deptcode as orgUnitCoding
-	FROM CSSD_User
-	ORDER BY deptcode
+	SELECT coding,name,orgUnitCoding,'1' needTranscoding
+	FROM VIEW_HIS_USER where coding is not null and length(trim(coding)) > 0
+	and name is not null and length(trim(name)) > 0
+	ORDER BY coding
 	]]>
   </select>
 </mapper>
\ No newline at end of file
Index: ssts-web/src/main/resources/config/zsszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r13159 -r13496
--- ssts-web/src/main/resources/config/zsszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 13159)
+++ ssts-web/src/main/resources/config/zsszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 13496)
@@ -7,14 +7,14 @@
   <!-- 按住院号查找病人信息 -->
   <select id="findPatientInfoByHospitalNum" resultType="PatientInfoVO">
   <![CDATA[
-	SELECT h.hospitalNumber as patientNumber,
-        	h.patientName as patientName,
-	        h.patientAge as patientAge,
-	        h.patientSex as patientSex,
-	        h.patientIDCard as patientIDCard,
-	        h.doctorName as doctorName,
-	        h.operation as operation
-	FROM CSSD_HospitalNumber h
+	SELECT h.hospitalNumber patientNumber,
+        	h.patientName patientName,
+	        h.patientAge patientAge,
+	        h.patientSex patientSex,
+	        h.patientIDCard patientIDCard,
+	        h.doctorName doctorName,
+	        h.operation operation,'1' needTranscoding
+	FROM VIEW_inpatient_patient_info h
 	WHERE h.hospitalNumber = #{hospitalNum}
 	]]>
   </select>
Index: ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/PatientInfoVO.java
===================================================================
diff -u -r12646 -r13496
--- ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/PatientInfoVO.java	(.../PatientInfoVO.java)	(revision 12646)
+++ ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/PatientInfoVO.java	(.../PatientInfoVO.java)	(revision 13496)
@@ -6,7 +6,7 @@
  *
  * 2012-10-15 上午09:16:54
  */
-public class PatientInfoVO {
+public class PatientInfoVO extends CommonVo {
 
 	private String patientNumber;// 诊疗号或住院号
 	private String patientName;// 病人姓名
@@ -50,6 +50,10 @@
 
 	public void setPatientNumber(String patientNumber) {
 		this.patientNumber = patientNumber;
+		if(CommonVo.NEEDTRANSCODING_Y.equals(getNeedTranscoding())){
+			//病人姓名转码
+			setPatientName(getValueAfterTransCoding(getPatientName()));
+		}
 	}
 
 	public String getPatientName() {
@@ -66,6 +70,10 @@
 
 	public void setPatientAge(String patientAge) {
 		this.patientAge = patientAge;
+		if(CommonVo.NEEDTRANSCODING_Y.equals(getNeedTranscoding())){
+			//病人性别转码
+			setPatientSex(getValueAfterTransCoding(getPatientSex()));
+		}
 	}
 
 	public String getPatientSex() {
@@ -90,6 +98,10 @@
 
 	public void setPatientArea(String patientArea) {
 		this.patientArea = patientArea;
+		if(CommonVo.NEEDTRANSCODING_Y.equals(getNeedTranscoding())){
+			//病人所属病区转码
+			setPatientArea(getValueAfterTransCoding(getPatientArea()));
+		}
 	}
 
 	public String getRoomNumber() {
@@ -106,6 +118,10 @@
 
 	public void setDoctorName(String doctorName) {
 		this.doctorName = doctorName;
+		if(CommonVo.NEEDTRANSCODING_Y.equals(getNeedTranscoding())){
+			//医生名字转码
+			setDoctorName(getValueAfterTransCoding(getDoctorName()));
+		}
 	}
 
 	public String getOperation() {
@@ -114,6 +130,10 @@
 
 	public void setOperation(String operation) {
 		this.operation = operation;
+		if(CommonVo.NEEDTRANSCODING_Y.equals(getNeedTranscoding())){
+			//手术名称转码
+			setOperation(getValueAfterTransCoding(getOperation()));
+		}
 	}
 	
 	public String getOperationTime() {
@@ -179,5 +199,36 @@
 	public void setRemark(String remark) {
 		this.remark = remark;
 	}
+
+	@Override
+	public void setNeedTranscoding(String needTranscoding) {
+		logger.debug("set病人转码信息needTranscoding:" + needTranscoding);
+		if(CommonVo.NEEDTRANSCODING_Y.equals(needTranscoding)){
+			logger.debug("set病人转码前信息getPatientName():" + getPatientName());
+			//病人姓名转码
+			setPatientName(getValueAfterTransCoding(getPatientName()));
+			logger.debug("set病人转码后信息getPatientName():" + getPatientName());
+			
+			logger.debug("set病人转码前信息getPatientSex():" + getPatientSex());
+			//病人性别转码
+			setPatientSex(getValueAfterTransCoding(getPatientSex()));
+			logger.debug("set病人转码后息getPatientSex():" + getPatientSex());
+			
+			logger.debug("set病人转码前信息getDoctorName():" + getDoctorName());
+			//医生名字转码
+			setDoctorName(getValueAfterTransCoding(getDoctorName()));
+			logger.debug("set病人转码后信息getDoctorName():" + getDoctorName());
+			
+			logger.debug("set病人转码前信息getOperation():" + getOperation());
+			//手术名称转码
+			setOperation(getValueAfterTransCoding(getOperation()));
+			logger.debug("set病人转码后信息getOperation():" + getOperation());
+			
+			logger.debug("set病人转码前信息getPatientArea():" + getPatientArea());
+			//病人所属病区转码
+			setPatientArea(getValueAfterTransCoding(getPatientArea()));
+			logger.debug("set病人转码后信息getPatientArea():" + getPatientArea());
+		}
+	}
 	
 }
Index: ssts-web/src/main/resources/spring/projects/zsszyy/applicationContext-his-gzfdzl.xml
===================================================================
diff -u -r13159 -r13496
--- ssts-web/src/main/resources/spring/projects/zsszyy/applicationContext-his-gzfdzl.xml	(.../applicationContext-his-gzfdzl.xml)	(revision 13159)
+++ ssts-web/src/main/resources/spring/projects/zsszyy/applicationContext-his-gzfdzl.xml	(.../applicationContext-his.xml)	(revision 13496)
@@ -18,7 +18,7 @@
         class="com.forgon.disinfectsystem.datasynchronization.service.DataSynchronizationManagerImpl" >
 		<property name="config" >
             <bean class="com.forgon.tools.json.JsonObjectFromResourceFactoryBean">
-                <property name="resource" value="config/gzfdzl/dataSyncConfig.json" />
+                <property name="resource" value="config/zsszyy/dataSyncConfig.json" />
                 <property name="charset" value="UTF-8" />
             </bean>
         </property>
@@ -41,11 +41,15 @@
         class="com.forgon.disinfectsystem.datasynchronization.dwr.DataSynchronizationTableManager">
     </bean>
     
-    <bean id="hisDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">  
-        <property name="driverClass" value="com.microsoft.sqlserver.jdbc.SQLServerDriver" />  
-        <property name="jdbcUrl" value="jdbc:sqlserver://192.168.1.254:1433;databaseName=fdyyhis" />  
-        <property name="user" value="his" />  
-        <property name="password" value="manager" />
+    <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" />  
+        <property name="user" value="mz" />  
+        <property name="password" value="mz" />
+        
+        <!-- java8已经废弃了odbc,所以odbc不再使用 -->
+        <!-- <property name="driverClass" value="sun.jdbc.odbc.JdbcOdbcDriver" />  
+        <property name="jdbcUrl" value="jdbc:odbc:his" /> -->
     </bean>
     
     
@@ -57,7 +61,7 @@
        <property name="sqlSessionFactory">
             <bean class="org.mybatis.spring.SqlSessionFactoryBean">
                 <property name="dataSource" ref="hisDataSource" />
-                <property name="mapperLocations" value="classpath*:config/gzfdzl/mybatis/SyncOrgUnitAndUserMapper.xml" />
+                <property name="mapperLocations" value="classpath*:config/zsszyy/mybatis/SyncOrgUnitAndUserMapper.xml" />
                 <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
             </bean>
        </property>
@@ -69,7 +73,7 @@
        <property name="sqlSessionFactory">
             <bean class="org.mybatis.spring.SqlSessionFactoryBean">
                 <property name="dataSource" ref="hisDataSource" />
-                <property name="mapperLocations" value="classpath*:config/gzfdzl/mybatis/FindPatientInfoByHospitalNumMapper.xml" />
+                <property name="mapperLocations" value="classpath*:config/zsszyy/mybatis/FindPatientInfoByHospitalNumMapper.xml" />
                 <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
             </bean>
        </property>
@@ -81,7 +85,7 @@
        <property name="sqlSessionFactory">
             <bean class="org.mybatis.spring.SqlSessionFactoryBean">
                 <property name="dataSource" ref="hisDataSource" />
-                <property name="mapperLocations" value="classpath*:config/gzfdzl/mybatis/FindPatientInfoByTreatmentNumMapper.xml" />
+                <property name="mapperLocations" value="classpath*:config/zsszyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml" />
                 <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
             </bean>
        </property>
Index: ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/UserVo.java
===================================================================
diff -u -r12331 -r13496
--- ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/UserVo.java	(.../UserVo.java)	(revision 12331)
+++ ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/UserVo.java	(.../UserVo.java)	(revision 13496)
@@ -2,7 +2,7 @@
 
 import org.apache.commons.lang3.StringUtils;
 
-public class UserVo {
+public class UserVo extends CommonVo {
 	public String coding;
 	public String name;
 	public String orgUnitCoding;
@@ -26,6 +26,10 @@
 
 	public void setName(String name) {
 		this.name = name;
+		//字符集转码处理
+		if(CommonVo.NEEDTRANSCODING_Y.equals(getNeedTranscoding())){
+			setName(getValueAfterTransCoding(getName()));
+		}
 	}
 
 	public String getOrgUnitCoding() {
@@ -69,4 +73,12 @@
 		}
 	}
 
+	@Override
+	public void setNeedTranscoding(String needTranscoding) {
+		//字符集转码处理
+		if(CommonVo.NEEDTRANSCODING_Y.equals(needTranscoding)){
+			setName(getValueAfterTransCoding(getName()));
+		}
+	}
+
 }
Index: ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/CommonVo.java
===================================================================
diff -u
--- ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/CommonVo.java	(revision 0)
+++ ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/CommonVo.java	(revision 13496)
@@ -0,0 +1,61 @@
+package com.forgon.disinfectsystem.datasynchronization.model;
+
+import java.io.UnsupportedEncodingException;
+import java.nio.charset.Charset;
+
+import org.apache.log4j.Logger;
+
+/**
+ * 同步接口的公共属性类
+ * @author shuyongfu
+ *
+ */
+public class CommonVo {
+	
+	protected Logger logger = Logger.getLogger(CommonVo.class);
+	
+	public static String NEEDTRANSCODING_Y = "1";
+	public static String CHARSET_ISO = "ISO-8859-1";
+	public static String CHARSET_UTF8 = "UTF-8";
+	public static String CHARSET_GBK = "GBK";
+
+	//是否需要转码
+	private String needTranscoding;
+	//源字符编码
+	private String charset;
+	
+	public String getNeedTranscoding() {
+		return needTranscoding;
+	}
+	public void setNeedTranscoding(String needTranscoding) {
+		this.needTranscoding = needTranscoding;
+	}
+	public String getCharset() {
+		return charset;
+	}
+	public void setCharset(String charset) {
+		this.charset = charset;
+	};
+	
+	/**
+	 * 取到转码后的值
+	 * @param value
+	 * @return
+	 */
+	protected String getValueAfterTransCoding(String value){
+		String newValue = value;
+		try {
+			//转utf-8的结果还是乱码
+			//newValue = new String(value.getBytes(CHARSET_ISO) , CHARSET_UTF8);
+			//转gbk的结果正常
+			newValue = new String(value.getBytes(CHARSET_ISO) , CHARSET_GBK);
+		} catch (UnsupportedEncodingException e) {
+			logger.error("转码失败:" + e);
+		} catch (NullPointerException e) {
+			logger.error("需转码的值为空:" + e);
+		} catch (Exception e) {
+			logger.error("转码方法出现异常:" + e);
+		}
+		return newValue;
+	}
+}
Index: ssts-web/src/main/resources/config/zsszyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
===================================================================
diff -u -r13159 -r13496
--- ssts-web/src/main/resources/config/zsszyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 13159)
+++ ssts-web/src/main/resources/config/zsszyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(.../FindPatientInfoByTreatmentNumMapper.xml)	(revision 13496)
@@ -7,14 +7,14 @@
   <!-- 按门诊号查找病人信息 -->
   <select id="findPatientInfoByTreatmentNum" resultType="PatientInfoVO">
   <![CDATA[
-	SELECT h.clinicNumber as patientNumber,
-        	h.patientName as patientName,
-	        h.patientAge as patientAge,
-	        h.patientSex as patientSex,
-	        h.patientIDCard as patientIDCard,
-	        '' as doctorName,
-	        '' as operation
-	FROM CSSD_ClinicNumber h
+	SELECT h.clinicNumber patientNumber,
+        	h.patientName patientName,
+	        h.patientAge patientAge,
+	        h.patientSex patientSex,
+	        h.patientIDCard patientIDCard,
+	        '' doctorName,
+	        '' operation,'1' needTranscoding
+	FROM VIEW_inpatient_patient_info h
 	WHERE h.clinicNumber = #{treatmentNum}
 	]]>
   </select>