Index: ssts-web/src/main/resources/config/gzs12rmyy/mybatis/FindPatientInfoByTreatmentNumMapperNew.xml
===================================================================
diff -u
--- ssts-web/src/main/resources/config/gzs12rmyy/mybatis/FindPatientInfoByTreatmentNumMapperNew.xml	(revision 0)
+++ ssts-web/src/main/resources/config/gzs12rmyy/mybatis/FindPatientInfoByTreatmentNumMapperNew.xml	(revision 26314)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+  PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+  "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.forgon.disinfectsystem.datasynchronization.dao.FindPatientInfoByTreatmentNumDao">
+
+  <!-- 按门诊号查找病人信息 -->
+  <select id="findPatientInfoByTreatmentNum" resultType="PatientInfoVO">
+  <![CDATA[
+	 select clinicNumber clinicNumber,
+       		 serialNumber serialNumber,
+       		 patientName patientName,
+       		 to_char(patientAge) patientAge,
+       		 patientSex patientSex,
+			 patientIDCard patientIDCard,
+			 doctorName doctorName,
+			 operation operation,
+			 operationTime operationTime,
+			 patientArea patientArea,
+			 roomNumber roomNumber,
+			 bedNumber bedNumber, 
+			 remark remark
+	   from  sharedstorage.view_cssd_clinic
+     where clinicNumber = #{treatmentNum}
+
+]]>
+  </select>
+</mapper>
\ No newline at end of file
Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQHelper.java
===================================================================
diff -u -r26249 -r26314
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQHelper.java	(.../MQHelper.java)	(revision 26249)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQHelper.java	(.../MQHelper.java)	(revision 26314)
@@ -26,6 +26,7 @@
 import com.forgon.disinfectsystem.datasynchronization.model.OrgUnitVo;
 import com.forgon.disinfectsystem.datasynchronization.model.PatientInfoVO;
 import com.forgon.disinfectsystem.datasynchronization.model.UserVo;
+import com.forgon.log.service.LogManager;
 import com.ibm.mq.MQException;
 import com.ibm.mq.MQGetMessageOptions;
 import com.ibm.mq.MQMessage;
@@ -129,7 +130,12 @@
 			logger.debug(">>>>>>>消息ID：" + str);
 		} catch (MQException e) {
 			// 回滚事务
-			queueManager.backout();
+			try{
+				queueManager.backout();
+			}catch(Exception e1){
+				logger.error("回滚失败!");
+				e1.printStackTrace();
+			}
 			if (2033 == e.getReason()) {
 				logger.debug("消息已经取完，队列中没有消息!");
 			} else {
@@ -175,18 +181,10 @@
 	 * @throws Exception
 	 */
 	public static void main(String[] args) throws Exception {
-		/*List<String> messages = RabbitMQConsumer.getDepartAndUser();
-		// List<String> messages = RabbitMQConsumer.getHospitalPatientInfo();
-		// List<String> messages = RabbitMQConsumer.getClinicPatientMessage();
-		if (messages != null && messages.size() > 0) {
-			for (int i = 0; i < messages.size(); i++) {
-				System.out.println(messages.get(i));
-			}
-		}*/
-		/*List<PatientInfoVO> objList = getClinicPatientMessageFromMQ();
-		System.out.println(objList.size());*/
-		List<PatientInfoVO> patientList = new ArrayList<PatientInfoVO>();
-		patientList.addAll(null);
+		
+		List<PatientInfoVO> objList = getClinicPatientMessageFromMQ();
+		System.out.println(objList.size());
+		
 	}
 
 	/**
@@ -195,26 +193,43 @@
 	 * @return
 	 * @throws Exception 
 	 */
-	private static List<String> getDepartAndUserMessage() throws Exception {
+	private static List<String> getDepartAndUserMessage() {
 		List<String> messages = new ArrayList<String>();
 		String host = "192.168.2.152";// 平台地址
 		String channal = "IE.SVRCONN";// 通道名称
 		String qmn = "GWO.QM";// 目标队列管理器
 		String quename = "OUT.S023.MS000.LQ";// 目标队列(科室、人员)
 		boolean flag = true;
 		// 初始化连接
-		initEnvironment(host, channal, qmn, quename);
+		try {
+			initEnvironment(host, channal, qmn, quename);
+		} catch (Exception e) {
+			logger.info("getDepartAndUserMessage调用initEnvironment方法出错...");
+			e.printStackTrace();
+		}
 		while (flag) {
 			// 接收消息
-			String msg = receiveMsg();
-			if (StringUtils.isNotBlank(msg)) {
-				messages.add(msg);
-			} else {
-				flag = false;
+			String msg;
+			try {
+				msg = receiveMsg();
+				if (StringUtils.isNotBlank(msg)) {
+					messages.add(msg);
+				} else {
+					flag = false;
+					logger.info("接收到科室&人员消息: " + messages.size() + "条。");
+				}
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
 			}
 		}
 		// 关闭标队列管理器，如果长连接，请不要关闭队列管理器；短连接一定要关闭，不然无法释放连接。
-		destroyEnvironment();
+		try {
+			destroyEnvironment();
+		} catch (Exception e) {
+			logger.info("getDepartAndUserMessage调用destroyEnvironment方法出错...");
+			e.printStackTrace();
+		}
 		return messages;
 	}
 
@@ -224,26 +239,42 @@
 	 * @return
 	 * @throws Exception 
 	 */
-	private static List<String> getClinicPatientMessage() throws Exception {
+	private static List<String> getClinicPatientMessage() {
 		List<String> messages = new ArrayList<String>();
 		String host = "192.168.2.152";// 平台地址
 		String channal = "IE.SVRCONN";// 通道名称
 		String qmn = "GWO.QM";// 目标队列管理器
 		String quename = "OUT.S023.BS001.LQ";// 目标队列(住院病人、挂号病人)
 		boolean flag = true;
 		// 初始化连接
-		initEnvironment(host, channal, qmn, quename);
+		try {
+			initEnvironment(host, channal, qmn, quename);
+		} catch (Exception e1) {
+			logger.info("getClinicPatientMessage调用initEnvironment方法出错...");
+			e1.printStackTrace();
+		}
 		while (flag) {
-			// 接收消息
-			String msg = receiveMsg();
-			if (StringUtils.isNotBlank(msg)) {
-				messages.add(msg);
-			} else {
-				flag = false;
+			try{
+				// 接收消息
+				String msg = receiveMsg();
+				if (StringUtils.isNotBlank(msg)) {
+					messages.add(msg);
+				} else {
+					flag = false;
+					logger.info("接收到“挂号病人”消息: " + messages.size() + "条。");
+				}
+			}catch(Exception e){
+				logger.error("读取平台消息getClinicPatientMessage出错,方法名=receiveMsg");
+				e.printStackTrace();
 			}
 		}
 		// 关闭标队列管理器，如果长连接，请不要关闭队列管理器；短连接一定要关闭，不然无法释放连接。
-		destroyEnvironment();
+		try {
+			destroyEnvironment();
+		} catch (Exception e) {
+			logger.info("getClinicPatientMessage调用destroyEnvironment方法出错...");
+			e.printStackTrace();
+		}
 		return messages;
 	}
 
@@ -253,26 +284,43 @@
 	 * @return
 	 * @throws Exception 
 	 */
-	private static List<String> getHospitalPatientMessage() throws Exception {
+	private static List<String> getHospitalPatientMessage() {
+		logger.info("调用getHospitalPatientMessage方法从消息队列获取“入院病人信息”...");
 		List<String> messages = new ArrayList<String>();
 		String host = "192.168.2.152";// 平台地址
 		String channal = "IE.SVRCONN";// 通道名称
 		String qmn = "GWO.QM";// 目标队列管理器
 		String quename = "OUT.S023.BS310.LQ";// 目标队列(住院病人、挂号病人)
 		boolean flag = true;
 		// 初始化连接
-		initEnvironment(host, channal, qmn, quename);
+		try {
+			initEnvironment(host, channal, qmn, quename);
+		} catch (Exception e1) {
+			logger.info("getHospitalPatientMessage调用initEnvironment方法出错...");
+			e1.printStackTrace();
+		}
 		while (flag) {
-			// 接收消息
-			String msg = receiveMsg();
-			if (StringUtils.isNotBlank(msg)) {
-				messages.add(msg);
-			} else {
-				flag = false;
+			try{
+				// 接收消息
+				String msg = receiveMsg();
+				if (StringUtils.isNotBlank(msg)) {
+					messages.add(msg);
+				} else {
+					flag = false;
+					logger.info("接收到“入院病人信息”消息: " + messages.size() + "条。");
+				}
+			}catch(Exception e){
+				logger.error("读取平台消息getHospitalPatientMessage出错,方法名=receiveMsg");
+				e.printStackTrace();
 			}
 		}
 		// 关闭标队列管理器，如果长连接，请不要关闭队列管理器；短连接一定要关闭，不然无法释放连接。
-		destroyEnvironment();
+		try {
+			destroyEnvironment();
+		} catch (Exception e) {
+			logger.info("getHospitalPatientMessage调用destroyEnvironment方法出错...");
+			e.printStackTrace();
+		}
 		return messages;
 	}
 
@@ -301,6 +349,7 @@
 	 * @return
 	 */
 	private static String processDataByXpath(Document document, Map<String, String> nameSpaceURIMap, String xpathExp) {
+		logger.debug("调用processDataByXpath方法解析数据...");
 		if ((StringUtils.isNotBlank(xpathExp)) && (document != null) && (nameSpaceURIMap != null)) {
 			XPath xpath = document.createXPath(xpathExp);
 			xpath.setNamespaceURIs(nameSpaceURIMap);
@@ -392,7 +441,8 @@
 	public static List<PatientInfoVO> getHospitalPatientMessageFromMQ() throws Exception {
 		// 获取消息队列
 		List<String> mqList = getHospitalPatientMessage();
-		// List<String> mqList = xmlFileToStr("D:/广州市第十二人民医院/0327/挂号&入院病人/入院病人single.xml");
+		//D:\项目\广州市第十二人民医院\0327\挂号&入院病人
+//		List<String> mqList = xmlFileToStr("D:/项目/广州市第十二人民医院/0327/挂号&入院病人/4-18入院病人03.xml");
 		if ((mqList != null) && (mqList.size() > 0)) {
 			// xml文件命名空间
 			Map<String, String> nameSpaceURIMap = new HashMap<String, String>();
@@ -430,60 +480,65 @@
 			// 解析xml
 			List<PatientInfoVO> patientInfoVOList = new ArrayList<PatientInfoVO>();
 			for (String mqStr : mqList) {
-				Document doc = DocumentHelper.parseText(mqStr);
-
-				String patientNumber = processDataByXpath(doc, nameSpaceURIMap, patientNumberXpath);
-				String hospitalNumber = processDataByXpath(doc, nameSpaceURIMap, hospitalNumberXpath);
-				String patientName = processDataByXpath(doc, nameSpaceURIMap, patientNameXpath);
-				String patientAge = processDataByXpath(doc, nameSpaceURIMap, patientAgeXpath);
-				String patientSex = processDataByXpath(doc, nameSpaceURIMap, patientSexXpath);
-				String patientIDCard = processDataByXpath(doc, nameSpaceURIMap, patientIDCardXpath);
-				String visitAmount = processDataByXpath(doc, nameSpaceURIMap, visitAmountXpath);
-				String doctorName = processDataByXpath(doc, nameSpaceURIMap, doctorNameXpath);
-				String operation = processDataByXpath(doc, nameSpaceURIMap, operationXpath);
-				String operationTime = processDataByXpath(doc, nameSpaceURIMap, operationTimeXpath);
-				String type = processDataByXpath(doc, nameSpaceURIMap, typeXpath);
-				String patientArea = processDataByXpath(doc, nameSpaceURIMap, patientAreaXpath);
-				String roomNumber = processDataByXpath(doc, nameSpaceURIMap, roomNumberXpath);
-				String bedNumber = processDataByXpath(doc, nameSpaceURIMap, bedNumberXpath);
-				String ascriptionDepartment = processDataByXpath(doc, nameSpaceURIMap, ascriptionDepartmentXpath);
-				String visitDate = processDataByXpath(doc, nameSpaceURIMap, visitDateXpath);
-				if (StringUtils.isNotBlank(patientAge)) {
-					patientAge = patientAge.split("岁")[0];
+				try{
+					Document doc = DocumentHelper.parseText(mqStr);
+	
+					String patientNumber = processDataByXpath(doc, nameSpaceURIMap, patientNumberXpath);
+					String hospitalNumber = processDataByXpath(doc, nameSpaceURIMap, hospitalNumberXpath);
+					String patientName = processDataByXpath(doc, nameSpaceURIMap, patientNameXpath);
+					String patientAge = processDataByXpath(doc, nameSpaceURIMap, patientAgeXpath);
+					String patientSex = processDataByXpath(doc, nameSpaceURIMap, patientSexXpath);
+					String patientIDCard = processDataByXpath(doc, nameSpaceURIMap, patientIDCardXpath);
+					String visitAmount = processDataByXpath(doc, nameSpaceURIMap, visitAmountXpath);
+					String doctorName = processDataByXpath(doc, nameSpaceURIMap, doctorNameXpath);
+					String operation = processDataByXpath(doc, nameSpaceURIMap, operationXpath);
+					String operationTime = processDataByXpath(doc, nameSpaceURIMap, operationTimeXpath);
+					String type = processDataByXpath(doc, nameSpaceURIMap, typeXpath);
+					String patientArea = processDataByXpath(doc, nameSpaceURIMap, patientAreaXpath);
+					String roomNumber = processDataByXpath(doc, nameSpaceURIMap, roomNumberXpath);
+					String bedNumber = processDataByXpath(doc, nameSpaceURIMap, bedNumberXpath);
+					String ascriptionDepartment = processDataByXpath(doc, nameSpaceURIMap, ascriptionDepartmentXpath);
+					String visitDate = processDataByXpath(doc, nameSpaceURIMap, visitDateXpath);
+					if (StringUtils.isNotBlank(patientAge)) {
+						patientAge = patientAge.split("岁")[0];
+					}
+					if ("1".equals(patientSex)) {
+						patientSex = "男";
+					} else if ("2".equals(patientSex)) {
+						patientSex = "女";
+					} else if ("9".equals(patientSex)) {
+						patientSex = "未说明的性别";
+					} else if ("0".equals(patientSex)) {
+						patientSex = "未知的性别";
+					} else {
+						patientSex = null;
+					}
+	
+					PatientInfoVO patientInfoVO = new PatientInfoVO();
+					patientInfoVO.setPatientNumber(patientNumber);
+					patientInfoVO.setHospitalNumber(hospitalNumber);
+					patientInfoVO.setPatientName(patientName);
+					patientInfoVO.setPatientAge(patientAge);
+					patientInfoVO.setPatientSex(patientSex);
+					patientInfoVO.setPatientIDCard(patientIDCard);
+					patientInfoVO.setVisitAmount(visitAmount);
+					patientInfoVO.setDoctorName(doctorName);
+					patientInfoVO.setOperation(operation);
+					patientInfoVO.setOperationTime(operationTime);
+					patientInfoVO.setType(type);
+					patientInfoVO.setPatientArea(patientArea);
+					patientInfoVO.setRoomNumber(roomNumber);
+					patientInfoVO.setBedNumber(bedNumber);
+					patientInfoVO.setAscriptionDepartment(ascriptionDepartment);
+					patientInfoVO.setVisitDate(visitDate);
+					// 判断对象属性是否都为空
+					if (!checkObjAllFieldsIsNull(patientInfoVO)) {
+						patientInfoVOList.add(patientInfoVO);
+					}
+				}catch(Exception e){
+					e.printStackTrace();
+					logger.error("入院病人消息解析出错:mqStr=" + mqStr);
 				}
-				if ("1".equals(patientSex)) {
-					patientSex = "男";
-				} else if ("2".equals(patientSex)) {
-					patientSex = "女";
-				} else if ("9".equals(patientSex)) {
-					patientSex = "未说明的性别";
-				} else if ("0".equals(patientSex)) {
-					patientSex = "未知的性别";
-				} else {
-					patientSex = null;
-				}
-
-				PatientInfoVO patientInfoVO = new PatientInfoVO();
-				patientInfoVO.setPatientNumber(patientNumber);
-				patientInfoVO.setHospitalNumber(hospitalNumber);
-				patientInfoVO.setPatientName(patientName);
-				patientInfoVO.setPatientAge(patientAge);
-				patientInfoVO.setPatientSex(patientSex);
-				patientInfoVO.setPatientIDCard(patientIDCard);
-				patientInfoVO.setVisitAmount(visitAmount);
-				patientInfoVO.setDoctorName(doctorName);
-				patientInfoVO.setOperation(operation);
-				patientInfoVO.setOperationTime(operationTime);
-				patientInfoVO.setType(type);
-				patientInfoVO.setPatientArea(patientArea);
-				patientInfoVO.setRoomNumber(roomNumber);
-				patientInfoVO.setBedNumber(bedNumber);
-				patientInfoVO.setAscriptionDepartment(ascriptionDepartment);
-				patientInfoVO.setVisitDate(visitDate);
-				// 判断对象属性是否都为空
-				if (!checkObjAllFieldsIsNull(patientInfoVO)) {
-					patientInfoVOList.add(patientInfoVO);
-				}
 			}
 			return patientInfoVOList;
 		}
@@ -497,7 +552,7 @@
 	public static List<PatientInfoVO> getClinicPatientMessageFromMQ() throws Exception {
 		// 获取消息队列
 		List<String> mqList = getClinicPatientMessage();
-		// List<String> mqList = xmlFileToStr("D:/广州市第十二人民医院/0327/挂号&入院病人/挂号病人single.xml");
+//		List<String> mqList = xmlFileToStr("D:/项目/广州市第十二人民医院/0327/挂号&入院病人/4-18挂号病人01.xml");
 		if ((mqList != null) && (mqList.size() > 0)) {
 			// xml文件命名空间
 			Map<String, String> nameSpaceURIMap = new HashMap<String, String>();
@@ -532,57 +587,63 @@
 			// 解析xml
 			List<PatientInfoVO> patientInfoVOList = new ArrayList<PatientInfoVO>();
 			for (String mqStr : mqList) {
-				Document doc = DocumentHelper.parseText(mqStr);
-				String clinicNumber = processDataByXpath(doc, nameSpaceURIMap, clinicNumberXpath);
-				String patientName = processDataByXpath(doc, nameSpaceURIMap, patientNameXpath);
-				String patientAge = processDataByXpath(doc, nameSpaceURIMap, patientAgeXpath);
-				String patientSex = processDataByXpath(doc, nameSpaceURIMap, patientSexXpath);
-				String patientIDCard = processDataByXpath(doc, nameSpaceURIMap, patientIDCardXpath);
-				String visitAmount = processDataByXpath(doc, nameSpaceURIMap, visitAmountXpath);
-				String doctorName = processDataByXpath(doc, nameSpaceURIMap, doctorNameXpath);
-				String operation = processDataByXpath(doc, nameSpaceURIMap, operationXpath);
-				String operationTime = processDataByXpath(doc, nameSpaceURIMap, operationTimeXpath);
-				String type = processDataByXpath(doc, nameSpaceURIMap, typeXpath);
-				String patientArea = processDataByXpath(doc, nameSpaceURIMap, patientAreaXpath);
-				String roomNumber = processDataByXpath(doc, nameSpaceURIMap, roomNumberXpath);
-				String bedNumber = processDataByXpath(doc, nameSpaceURIMap, bedNumberXpath);
-				String ascriptionDepartment = processDataByXpath(doc, nameSpaceURIMap, ascriptionDepartmentXpath);
-				String patientNumber = processDataByXpath(doc, nameSpaceURIMap, patientNumberXpath);
-				String visitDate = processDataByXpath(doc, nameSpaceURIMap, visitDateXpath);
-				if (StringUtils.isNotBlank(patientAge)) {
-					patientAge = patientAge.split("岁")[0];
+				try{
+					Document doc = DocumentHelper.parseText(mqStr);
+					String clinicNumber = processDataByXpath(doc, nameSpaceURIMap, clinicNumberXpath);
+					String patientName = processDataByXpath(doc, nameSpaceURIMap, patientNameXpath);
+					String patientAge = processDataByXpath(doc, nameSpaceURIMap, patientAgeXpath);
+					String patientSex = processDataByXpath(doc, nameSpaceURIMap, patientSexXpath);
+					String patientIDCard = processDataByXpath(doc, nameSpaceURIMap, patientIDCardXpath);
+					String visitAmount = processDataByXpath(doc, nameSpaceURIMap, visitAmountXpath);
+					String doctorName = processDataByXpath(doc, nameSpaceURIMap, doctorNameXpath);
+
+					String operation = processDataByXpath(doc, nameSpaceURIMap, operationXpath);
+					String operationTime = processDataByXpath(doc, nameSpaceURIMap, operationTimeXpath);
+					String type = processDataByXpath(doc, nameSpaceURIMap, typeXpath);
+					String patientArea = processDataByXpath(doc, nameSpaceURIMap, patientAreaXpath);
+					String roomNumber = processDataByXpath(doc, nameSpaceURIMap, roomNumberXpath);
+					String bedNumber = processDataByXpath(doc, nameSpaceURIMap, bedNumberXpath);
+					String ascriptionDepartment = processDataByXpath(doc, nameSpaceURIMap, ascriptionDepartmentXpath);
+					String patientNumber = processDataByXpath(doc, nameSpaceURIMap, patientNumberXpath);
+					String visitDate = processDataByXpath(doc, nameSpaceURIMap, visitDateXpath);
+					if (StringUtils.isNotBlank(patientAge)) {
+						patientAge = patientAge.split("岁")[0];
+					}
+					if ("1".equals(patientSex)) {
+						patientSex = "男";
+					} else if ("2".equals(patientSex)) {
+						patientSex = "女";
+					} else if ("9".equals(patientSex)) {
+						patientSex = "未说明的性别";
+					} else if ("0".equals(patientSex)) {
+						patientSex = "未知的性别";
+					} else {
+						patientSex = null;
+					}
+					PatientInfoVO patientInfoVO = new PatientInfoVO();
+					patientInfoVO.setClinicNumber(clinicNumber);
+					patientInfoVO.setPatientName(patientName);
+					patientInfoVO.setPatientAge(patientAge);
+					patientInfoVO.setPatientSex(patientSex);
+					patientInfoVO.setPatientIDCard(patientIDCard);
+					patientInfoVO.setVisitAmount(visitAmount);
+					patientInfoVO.setDoctorName(doctorName);
+					patientInfoVO.setOperation(operation);
+					patientInfoVO.setOperationTime(operationTime);
+					patientInfoVO.setType(type);
+					patientInfoVO.setPatientArea(patientArea);
+					patientInfoVO.setRoomNumber(roomNumber);
+					patientInfoVO.setBedNumber(bedNumber);
+					patientInfoVO.setAscriptionDepartment(ascriptionDepartment);
+					patientInfoVO.setPatientNumber(patientNumber);
+					patientInfoVO.setVisitDate(visitDate);
+					if (!checkObjAllFieldsIsNull(patientInfoVO)) {
+						patientInfoVOList.add(patientInfoVO);
+					}
+				}catch(Exception e){
+					e.printStackTrace();
+					logger.error("挂号病人消息解析出错:mqStr=" + mqStr);
 				}
-				if ("1".equals(patientSex)) {
-					patientSex = "男";
-				} else if ("2".equals(patientSex)) {
-					patientSex = "女";
-				} else if ("9".equals(patientSex)) {
-					patientSex = "未说明的性别";
-				} else if ("0".equals(patientSex)) {
-					patientSex = "未知的性别";
-				} else {
-					patientSex = null;
-				}
-				PatientInfoVO patientInfoVO = new PatientInfoVO();
-				patientInfoVO.setClinicNumber(clinicNumber);
-				patientInfoVO.setPatientName(patientName);
-				patientInfoVO.setPatientAge(patientAge);
-				patientInfoVO.setPatientSex(patientSex);
-				patientInfoVO.setPatientIDCard(patientIDCard);
-				patientInfoVO.setVisitAmount(visitAmount);
-				patientInfoVO.setDoctorName(doctorName);
-				patientInfoVO.setOperation(operation);
-				patientInfoVO.setOperationTime(operationTime);
-				patientInfoVO.setType(type);
-				patientInfoVO.setPatientArea(patientArea);
-				patientInfoVO.setRoomNumber(roomNumber);
-				patientInfoVO.setBedNumber(bedNumber);
-				patientInfoVO.setAscriptionDepartment(ascriptionDepartment);
-				patientInfoVO.setPatientNumber(patientNumber);
-				patientInfoVO.setVisitDate(visitDate);
-				if (!checkObjAllFieldsIsNull(patientInfoVO)) {
-					patientInfoVOList.add(patientInfoVO);
-				}
 			}
 			return patientInfoVOList;
 		}
Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQDataDaoImpl.java
===================================================================
diff -u -r26249 -r26314
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQDataDaoImpl.java	(.../MQDataDaoImpl.java)	(revision 26249)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/mq/dao/gzs12rmyy/MQDataDaoImpl.java	(.../MQDataDaoImpl.java)	(revision 26314)
@@ -3,6 +3,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.collections.CollectionUtils;
+import org.hibernate.action.internal.CollectionUpdateAction;
+
 import com.forgon.disinfectsystem.datasynchronization.model.OrgUnitVo;
 import com.forgon.disinfectsystem.datasynchronization.model.PatientInfoVO;
 import com.forgon.disinfectsystem.datasynchronization.model.UserVo;
@@ -27,7 +30,11 @@
 		if (hospitalPatientList != null) {
 			patientList.addAll(hospitalPatientList);
 		}
-		PatientInfoVO[] patientInfoArr = (PatientInfoVO[]) patientList.toArray();
+		PatientInfoVO[] patientInfoArr = null;
+		if(CollectionUtils.isNotEmpty(patientList)){
+			patientInfoArr = new PatientInfoVO[patientList.size()];
+			patientInfoArr = patientList.toArray(patientInfoArr);
+		}
 		return patientInfoArr;
 	}
 
Index: ssts-web/src/main/resources/config/gzs12rmyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml
===================================================================
diff -u
--- ssts-web/src/main/resources/config/gzs12rmyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(revision 0)
+++ ssts-web/src/main/resources/config/gzs12rmyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml	(revision 26314)
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+  PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+  "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.forgon.disinfectsystem.datasynchronization.dao.FindPatientInfoByTreatmentNumDao">
+
+  <select id="findPatientInfoByTreatmentNum" resultType="PatientInfoVO">
+  	<![CDATA[
+	 select hospitalNumber,
+			 hospitalSerialNumber,
+			 patientName,
+			 patientAge,
+			 patientSex,
+			 patientIDCard,
+			 doctorName,
+			 surgeryName,
+			 patientArea,
+			 roomNumber,
+			 bedNumber,
+			 inDate
+	  from  PatientAdmissionInfo
+	  where treatmentNum = #{treatmentNum}
+
+	]]>
+  </select>
+</mapper>
\ No newline at end of file
Index: ssts-web/src/main/resources/config/gzs12rmyy/mybatis/FindPatientInfoByHospitalNumMapperNew.xml
===================================================================
diff -u
--- ssts-web/src/main/resources/config/gzs12rmyy/mybatis/FindPatientInfoByHospitalNumMapperNew.xml	(revision 0)
+++ ssts-web/src/main/resources/config/gzs12rmyy/mybatis/FindPatientInfoByHospitalNumMapperNew.xml	(revision 26314)
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+  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 hospitalNumber hospitalNumber,
+       		 searialNumber serialNumber,
+       		 patientName patientName,
+      		 to_char(patientAge) patientAge,
+       		 patientSex patientSex,
+			 patientIDCard patientIDCard,
+			 doctorName doctorName,
+			 operation operation,
+			 operationTime operationTime,
+			 patientArea patientArea,
+			 roomNumber roomNumber,
+			 bedNumber bedNumber, 
+			 remark remark
+	   from  sharedstorage.view_cssd_hospitalnumber
+	   where hospitalNumber = #{hospitalNumber}
+	    order by in_date desc
+	]]>
+  </select>
+  
+  <!-- 按住院号查找病人信息:提供给外来器械申请单页面的按住院号查询 -->
+  <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
+  <![CDATA[
+      select hospitalNumber hospitalNumber,
+       		 searialNumber serialNumber,
+       		 patientName patientName,
+      		 to_char(patientAge) patientAge,
+       		 patientSex patientSex,
+			 patientIDCard patientIDCard,
+			 doctorName doctorName,
+			 operation operation,
+			 operationTime operationTime,
+			 patientArea patientArea,
+			 roomNumber roomNumber,
+			 bedNumber bedNumber, 
+			 remark remark
+	   from  sharedstorage.view_cssd_hospitalnumber
+	   where hospitalNumber = #{hospitalNumber}
+	    order by in_date desc
+	]]>
+  </select>
+
+</mapper>
\ No newline at end of file
Index: ssts-web/src/main/resources/config/gzs12rmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml
===================================================================
diff -u -r22737 -r26314
--- ssts-web/src/main/resources/config/gzs12rmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 22737)
+++ ssts-web/src/main/resources/config/gzs12rmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml	(.../FindPatientInfoByHospitalNumMapper.xml)	(revision 26314)
@@ -3,69 +3,41 @@
   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 hospitalNumber,
-			 searialNumber,
+			 hospitalSerialNumber serialNumber,
 			 patientName,
 			 patientAge,
 			 patientSex,
 			 patientIDCard,
 			 doctorName,
-			 operation,
-			 operationTime,
+			 surgeryName,
 			 patientArea,
 			 roomNumber,
-			 bedNumber, 
-			 remark
-	   from  srhis.view_cssd_hospitalnumber
-	   where hospitalNumber = #{hospitalNumber}
+			 bedNumber
+	   from  PatientAdmissionInfo
+	   where hospitalNumber = #{hospitalNum}
 	]]>
   </select>
   
-  <!-- 按住院号查找病人信息:提供给外来器械申请单页面的按住院号查询 -->
   <select id="findPatientInfoByHospitalNumBeforeOperation" resultType="PatientInfoVO">
   <![CDATA[
       select hospitalNumber,
-			 searialNumber,
+			 hospitalSerialNumber serialNumber,
 			 patientName,
 			 patientAge,
 			 patientSex,
 			 patientIDCard,
 			 doctorName,
-			 operation,
-			 operationTime,
+			 surgeryName,
 			 patientArea,
 			 roomNumber,
-			 bedNumber, 
-			 remark
-	   from  srhis.view_cssd_hospitalnumber
+			 bedNumber
+	   from  PatientAdmissionInfo
 	   where hospitalNumber = #{hospitalNumber}
 	]]>
   </select>
 
-  <!-- 按门诊号查找病人信息 -->
-  <select id="findPatientInfoByTreatmentNum" resultType="PatientInfoVO">
-  <![CDATA[
-	 select clinicNumber,
-			serialNumber,
-			patientName, 
-			patientAge,
-			patientSex,
-			patientIDCard,
-			doctorName,
-			operation,
-			operationTime,
-			patientArea,
-			roomNumber,
-			bedNumber,
-			remark
-	  from  srhis.view_cssd_clinic 
-	  where hospitalNumber = #{hospitalNumber}
-
-]]>
-  </select>
 </mapper>
\ No newline at end of file
Index: ssts-web/src/main/resources/spring/projects/gzs12rmyy/timer.xml
===================================================================
diff -u
--- ssts-web/src/main/resources/spring/projects/gzs12rmyy/timer.xml	(revision 0)
+++ ssts-web/src/main/resources/spring/projects/gzs12rmyy/timer.xml	(revision 26314)
@@ -0,0 +1,53 @@
+<?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>
+    <!-- 每10分触发 -->
+	<bean id="timingSyncMqPatientInfoTimer" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<property name="targetObject">
+			<ref bean="dataSynchronizationManager" />
+		</property>
+		<property name="targetMethod">
+			<value>syncMqPatientInfo</value>
+		</property>
+		<property name="concurrent" value="false"/> 
+	</bean>
+	<bean id="timingSyncMqPatientInfoTimerTask" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+		<property name="jobDetail">
+			<ref bean="timingSyncMqPatientInfoTimer" />
+		</property>
+		<property name="cronExpression">
+		<value>0 0/10 * * * ?</value>
+		</property>
+	</bean>
+	
+	<!-- 每天0时0分0秒触发 -->
+	<bean id="timingSyncMqDepartmentAndUserInfoTimer" class="org.springframework.scheduling.quartz.MethodInvokingJobDetailFactoryBean">
+		<property name="targetObject">
+			<ref bean="dataSynchronizationManager" />
+		</property>
+		<property name="targetMethod">
+			<value>syncOrgUnitAndUser</value>
+		</property>
+		<property name="concurrent" value="false"/> 
+	</bean>
+	<bean id="timingSyncMqDepartmentAndUserInfoTimerTask" class="org.springframework.scheduling.quartz.CronTriggerFactoryBean">
+		<property name="jobDetail">
+			<ref bean="timingSyncMqDepartmentAndUserInfoTimer" />
+		</property>
+		<property name="cronExpression">
+		<value>0 0 0 * * ?</value>
+		</property>
+	</bean>
+	
+    <bean id="schedulerFactoryBean" class = "org.springframework.scheduling.quartz.SchedulerFactoryBean">
+        <property name="triggers">
+            <list>
+             	<!-- 每10分触发：定时同步入院病人、挂号病人 -->
+                <ref bean="timingSyncMqPatientInfoTimerTask"/>
+                <ref bean="timingSyncMqDepartmentAndUserInfoTimerTask"/>
+            </list>
+        </property>
+    </bean>
+    
+</beans>
\ No newline at end of file
Index: ssts-web/src/main/resources/spring/projects/gzs12rmyy/applicationContext-his-gzs12rmyy.xml
===================================================================
diff -u -r23822 -r26314
--- ssts-web/src/main/resources/spring/projects/gzs12rmyy/applicationContext-his-gzs12rmyy.xml	(.../applicationContext-his-gzs12rmyy.xml)	(revision 23822)
+++ ssts-web/src/main/resources/spring/projects/gzs12rmyy/applicationContext-his-gzs12rmyy.xml	(.../applicationContext-his-gzs12rmyy.xml)	(revision 26314)
@@ -34,48 +34,62 @@
     <bean id="dataSynchronizationTableManager"
         class="com.forgon.disinfectsystem.datasynchronization.dwr.DataSynchronizationTableManager">
     </bean>
-    
-    <bean id="hisDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">  
+	
+	<bean id="baseDataDao" class="com.forgon.disinfectsystem.mq.dao.gzs12rmyy.MQDataDaoImpl"></bean>
+ 
+    <!-- his新视图的数据源 -->
+    <bean id="hisDataSourceNewView" 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="usr_his2wuzi" />  
-        <property name="password" value="his2wuzi" />
+        <property name="jdbcUrl" value="jdbc:oracle:thin:@//192.168.2.133:1521/clinicdb" />  
+        <property name="user" value="usr_nhis2gys" />  
+        <property name="password" value="nhis2gys" />
     </bean>
-    
-    
-    
-    <!-- 由MyBatis实现访问HIS数据的Dao接口-->
-    <bean id="syncOrgUnitAndUserDao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
+ 
+ 	<!-- 住院病人(入院病人)主数据源:patientAdmissionInfo表 -->
+    <bean id="findPatientInfoByHospitalNumDao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
        <property name="mapperInterface"  
-           value="com.forgon.disinfectsystem.datasynchronization.dao.SyncOrgUnitAndUserDao" />  
+           value="com.forgon.disinfectsystem.datasynchronization.dao.FindPatientInfoByHospitalNumDao" />  
        <property name="sqlSessionFactory">
             <bean class="org.mybatis.spring.SqlSessionFactoryBean">
-                <property name="dataSource" ref="hisDataSource" />
-                <property name="mapperLocations" value="classpath*:config/gzs12rmyy/mybatis/SyncOrgUnitAndUserMapper.xml" />
+                <property name="dataSource" ref="dataSource" />
+                <property name="mapperLocations" value="classpath*:config/gzs12rmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml" />
                 <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
             </bean>
        </property>
     </bean>
+
+	<!-- 门诊病人(挂号病人)主数据源:patientAdmissionInfo表 -->    
+    <bean id="findPatientInfoByTreatmentNumDao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
+       <property name="mapperInterface"  
+           value="com.forgon.disinfectsystem.datasynchronization.dao.FindPatientInfoByTreatmentNumDao" />  
+       <property name="sqlSessionFactory">
+            <bean class="org.mybatis.spring.SqlSessionFactoryBean">
+                <property name="dataSource" ref="dataSource" />
+                <property name="mapperLocations" value="classpath*:config/gzs12rmyy/mybatis/FindPatientInfoByTreatmentNumMapper.xml" />
+                <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
+            </bean>
+       </property>
+    </bean>
     
-    <bean id="findPatientInfoByHospitalNumDao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
+    <bean id="findPatientInfoByHospitalNumDao2" class="org.mybatis.spring.mapper.MapperFactoryBean">  
        <property name="mapperInterface"  
            value="com.forgon.disinfectsystem.datasynchronization.dao.FindPatientInfoByHospitalNumDao" />  
        <property name="sqlSessionFactory">
             <bean class="org.mybatis.spring.SqlSessionFactoryBean">
-                <property name="dataSource" ref="hisDataSource" />
-                <property name="mapperLocations" value="classpath*:config/gzs12rmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml" />
+                <property name="dataSource" ref="hisDataSourceNewView" />
+                <property name="mapperLocations" value="classpath*:config/gzs12rmyy/mybatis/FindPatientInfoByHospitalNumMapperNew.xml" />
                 <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
             </bean>
        </property>
     </bean>
     
-    <bean id="findPatientInfoByTreatmentNumDao" class="org.mybatis.spring.mapper.MapperFactoryBean">  
+    <bean id="findPatientInfoByTreatmentNumDao2" class="org.mybatis.spring.mapper.MapperFactoryBean">  
        <property name="mapperInterface"  
            value="com.forgon.disinfectsystem.datasynchronization.dao.FindPatientInfoByTreatmentNumDao" />  
        <property name="sqlSessionFactory">
             <bean class="org.mybatis.spring.SqlSessionFactoryBean">
-                <property name="dataSource" ref="hisDataSource" />
-                <property name="mapperLocations" value="classpath*:config/gzs12rmyy/mybatis/FindPatientInfoByHospitalNumMapper.xml" />
+                <property name="dataSource" ref="hisDataSourceNewView" />
+                <property name="mapperLocations" value="classpath*:config/gzs12rmyy/mybatis/FindPatientInfoByTreatmentNumMapperNew.xml" />
                 <property name="typeAliasesPackage" value="com.forgon.disinfectsystem.datasynchronization.model" />
             </bean>
        </property>