Index: ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/OrgUnitVo.java
===================================================================
diff -u -r26116 -r27131
--- ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/OrgUnitVo.java	(.../OrgUnitVo.java)	(revision 26116)
+++ ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/OrgUnitVo.java	(.../OrgUnitVo.java)	(revision 27131)
@@ -24,6 +24,11 @@
 	 */
     public String source;
     
+    /**
+     * 请求消息的Id(德阳市人民医院DYSYY-53二期合同接口开发)
+     */
+    private String messageId;
+    
 	public String getCoding() {
 		return coding;
 	}
@@ -118,4 +123,12 @@
 			logger.debug("set科室名称value是否转码后的值:" + getName());
 		}
 	}
+
+	public String getMessageId() {
+		return messageId;
+	}
+
+	public void setMessageId(String messageId) {
+		this.messageId = messageId;
+	}
 }
Index: ssts-web/src/main/resources/spring/projects/dysyy/applicationContext-his.xml
===================================================================
diff -u -r23822 -r27131
--- ssts-web/src/main/resources/spring/projects/dysyy/applicationContext-his.xml	(.../applicationContext-his.xml)	(revision 23822)
+++ ssts-web/src/main/resources/spring/projects/dysyy/applicationContext-his.xml	(.../applicationContext-his.xml)	(revision 27131)
@@ -38,6 +38,10 @@
     <bean id="syncOrgUnitAndUserDao" class="com.forgon.disinfectsystem.datasynchronization.dao.dysrmyy.SyncOrgUnitAndUserDaoImpl">  
     </bean>
     
+    <!-- 德阳市人民医院DYSYY-53 二期合同接口开发 -->
+    <bean id="sycnDataFromHIPDao" class="com.forgon.disinfectsystem.datasynchronization.dao.dysrmyy.SycnDataFromHIPDaoImpl">  
+    </bean>
+    
     <bean id="findPatientInfoByHospitalNumDao" class="com.forgon.disinfectsystem.datasynchronization.dao.dysrmyy.FindPatientInfoByHospitalNumDaoImpl">  
     </bean>
     
Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/DatasyncConstant.java
===================================================================
diff -u -r16800 -r27131
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/DatasyncConstant.java	(.../DatasyncConstant.java)	(revision 16800)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/DatasyncConstant.java	(.../DatasyncConstant.java)	(revision 27131)
@@ -23,6 +23,11 @@
 	 */
 	public static String WebserviceAddress = "http://192.168.28.10:9086/ExternalServices/ZL_InformationService.asmx/Custom";
 	
+	/**
+	 * 调用集成平台提供的webservice(DYSYY-53 二期合同接口开发)
+	 */
+	public static String HIPWebServiceAddress = "http://192.168.28.123:6998/services/HIPService?wsdl";
+	
 	//公网环境的接口地址
 	//public static String WebserviceAddress = "http://218.6.146.70:8086/ExternalServices/ZL_InformationService.asmx/Custom";
 	
@@ -47,6 +52,11 @@
 	public static String MethodName_CSSD_User = "ZLTHIRD.CSSD.USER";
 	
 	/**
+	 * 调用集成平台提供的webservice，查询用户信息(DYSYY-53 二期合同接口开发)
+	 */
+	public static String MethodName_GetUserInfo = "getUserInfo";
+	
+	/**
 	 * 请求参数的特殊字符替换
 	 */
 	public static Map<String , String> paramSpecialWordReplaceMap;
Index: ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/SyncDataFromHIPDao.java
===================================================================
diff -u
--- ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/SyncDataFromHIPDao.java	(revision 0)
+++ ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/SyncDataFromHIPDao.java	(revision 27131)
@@ -0,0 +1,58 @@
+package com.forgon.disinfectsystem.datasynchronization.dao;
+
+import java.util.List;
+
+import com.forgon.disinfectsystem.datasynchronization.model.OrgUnitVo;
+import com.forgon.disinfectsystem.datasynchronization.model.UserVo;
+import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
+import com.forgon.disinfectsystem.entity.operationreservation.OperationReservation;
+import com.forgon.disinfectsystem.entity.useRecord.UseRecord;
+
+/**
+ * 德阳市人民医院DYSYY-53 二期合同接口开发
+ * 
+ * @author ZhouPeiMian
+ *
+ */
+public interface SyncDataFromHIPDao {
+	
+	/**
+	 * 解析xml,返回OrgUnitVo
+	 * @param action	OrganizationInfoRegister：	医疗卫生机构信息注册服务
+	 * 					OrganizationInfoUpdate：		医疗卫生机构信息更新服务
+	 * @param xmlStr	待解析的xml字符串
+	 * @return
+	 */
+	public List<OrgUnitVo> paramToOrgUnitVos(String action, String xmlStr);
+	
+	/**
+	 * 解析xml,返回UserVo
+	 * @param action	ProviderInfoRegister：	医疗卫生人员信息注册服务
+	 * 					ProviderInfoUpdate：		医疗卫生人员信息更新服务
+	 * @param xmlStr	待解析的xml字符串
+	 * @return
+	 */
+	public List<UserVo> paramToUserVos(String action, String xmlStr);
+	
+	/**
+	 * 根据xml中的手术申请单编号，查询并返回申请单信息
+	 * @param xmlStr	手术申请单信息查询服务请求信息xml
+	 * @return
+	 */
+	public List<OperationReservation> paramToOperationReservation(String xmlStr);
+	
+	/**
+	 * 消毒物料使用记录登记
+	 * @param xmlStr
+	 * @return 处理的消息id
+	 */
+	public UseRecord syncUseRecord(String xmlStr);
+	
+	/**
+	 * 消毒物料明细查询服务
+	 * @param xmlStr
+	 * @return
+	 */
+	public TousseInstance tousseDetailQuery(String xmlStr);
+
+}
Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/WebServiceClientHelper.java
===================================================================
diff -u -r16803 -r27131
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/WebServiceClientHelper.java	(.../WebServiceClientHelper.java)	(revision 16803)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/WebServiceClientHelper.java	(.../WebServiceClientHelper.java)	(revision 27131)
@@ -1,6 +1,8 @@
 package com.forgon.disinfectsystem.datasynchronization.dao.dysrmyy;
 
 
+import java.util.UUID;
+
 import net.sf.json.JSON;
 import net.sf.json.JSONObject;
 import net.sf.json.xml.XMLSerializer;
@@ -26,6 +28,13 @@
 	public static String STATE_FAIL = "F";
 	
 	/**
+	 * 医院平台提供的用户名密码（中联项目人员进行系统注册）德阳市人民医院DYSYY-53 二期合同接口开发
+	 */
+	public final static String USERNAME = "CSSD-96412E0C1AE56502E053CF1CA8C060C7";
+	public final static String PASSWORD = "mcTuwEZ1YyPv9slh5X1jsw==";
+	
+	
+	/**
 	 * 构造接口输入参数
 	 * @param methodName
 	 * @param arg
@@ -68,6 +77,23 @@
 			      + "</tem:Custom>"
 			   + "</soap:Body>"
 			+ "</soap:Envelope>";
+		} else if (DatasyncConstant.MethodName_GetUserInfo.equals(methodName)) {
+			StringBuilder soap = new StringBuilder();
+			UUID uuid = UUID.randomUUID();
+			String xmlInput = "<req><message_id>" + uuid.toString() + "</message_id><message_cont><sid>" + arg[0] + "</sid></message_cont></req>";
+			soap.append("<soap:Envelope xmlns:soap=\"http://www.w3.org/2003/05/soap-envelope\" xmlns:urn=\"urn:hl7-org:v3\">");
+			soap.append("<soap:Header><wsse:Security soap:mustUnderstand=\"true\" xmlns:wsse=\"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd\" xmlns:wsu=\"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd\">");
+			soap.append("<wsse:UsernameToken wsu:Id=\"UsernameToken-613FE229F310BC359315373193916346\"><wsse:Username>" + (WebServiceClientHelper.USERNAME) + "</wsse:Username>");
+			soap.append("<wsse:Password Type=\"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordText\">" + (WebServiceClientHelper.PASSWORD) + "</wsse:Password>");
+			soap.append("<wsse:Nonce EncodingType=\"http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary\">VQWHc2A2Y03wM2Yfumbd2g==</wsse:Nonce><wsu:Created>2018-09-19T01:09:51.634Z</wsu:Created></wsse:UsernameToken></wsse:Security></soap:Header>");
+			soap.append("<soap:Body>");
+			soap.append("<urn:HIPMessageServer>");
+			soap.append("<urn:action>" + methodName + "</urn:action>");
+			soap.append("<urn:message><![CDATA[" + xmlInput + "]]></urn:message>");
+			soap.append("</urn:HIPMessageServer>");
+			soap.append("</soap:Body>");
+			soap.append("</soap:Envelope>");
+			inputXml = soap.toString();
 		} else {
 			throw new RuntimeException("不存在此方法:" + methodName);
 		}
Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/SycnDataFromHIPDaoImpl.java
===================================================================
diff -u
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/SycnDataFromHIPDaoImpl.java	(revision 0)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/dysrmyy/SycnDataFromHIPDaoImpl.java	(revision 27131)
@@ -0,0 +1,281 @@
+package com.forgon.disinfectsystem.datasynchronization.dao.dysrmyy;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Node;
+import org.dom4j.XPath;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.forgon.disinfectsystem.barcode.service.BarcodeManager;
+import com.forgon.disinfectsystem.datasynchronization.dao.SyncDataFromHIPDao;
+import com.forgon.disinfectsystem.datasynchronization.model.OrgUnitVo;
+import com.forgon.disinfectsystem.datasynchronization.model.UserVo;
+import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
+import com.forgon.disinfectsystem.entity.operationreservation.OperationReservation;
+import com.forgon.disinfectsystem.entity.useRecord.UseRecord;
+import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager;
+import com.forgon.tools.Constants;
+import com.forgon.tools.date.DateTools;
+
+public class SycnDataFromHIPDaoImpl implements SyncDataFromHIPDao {
+	
+	@Autowired
+	private TousseInstanceManager tousseInstanceManager;
+	@Autowired
+	private BarcodeManager barcodeManager;
+	
+	/**
+	 * 根据document和Xpath表达式解析数据
+	 * @param document
+	 * @param nameSpaceURIMap
+	 * @param xpathExp
+	 * @return
+	 */
+	private static String processDataByXpath(Document document, Map<String, String> nameSpaceURIMap, String xpathExp) {
+		if ((StringUtils.isNotBlank(xpathExp)) && (document != null)) {
+			XPath xpath = document.createXPath(xpathExp);
+			if (nameSpaceURIMap != null) {
+				xpath.setNamespaceURIs(nameSpaceURIMap);
+			}
+			Node node = xpath.selectSingleNode(document);
+			if (node != null) {
+				return node.getStringValue();
+			}
+		}
+		return null;
+	}
+
+	@Override
+	public List<OrgUnitVo> paramToOrgUnitVos(String action, String xmlStr) {
+		if (StringUtils.isBlank(action) || StringUtils.isBlank(xmlStr)) {
+			throw new RuntimeException("参数action或message为空！");
+		}
+		// xml文件命名空间
+		Map<String, String> nameSpaceURIMap = new HashMap<String, String>();
+		nameSpaceURIMap.put("s", "urn:hl7-org:v3");
+		// xml字段的xpath表达式
+		String idXpath = "";
+		String deptXpath = "";
+		String deptCodeXpath = "";
+		String deptNameXpath = "";
+		String parentDeptCodeXpath = "";
+		if (StringUtils.equals("OrganizationInfoRegister", action)) {
+			idXpath = "/PRPM_IN401030UV01/s:id/@extension";
+			deptXpath = "/PRPM_IN401030UV01/s:controlActProcess/s:subject/s:registrationRequest/s:subject1/s:assignedEntity";
+			deptCodeXpath = deptXpath
+					+ "/s:id/s:item/@extension";
+			deptNameXpath = deptXpath
+					+ "/s:assignedPrincipalOrganization/s:name/s:item/s:part/@value";
+			parentDeptCodeXpath = deptXpath
+					+ "/s:assignedPrincipalOrganization/s:asAffiliate/s:scoper2/s:id/s:item/@extension";
+		} else if (StringUtils.equals("OrganizationInfoUpdate", action)){
+			idXpath = "/PRPM_IN403010UV01/s:id/@extension";
+			deptXpath = "/PRPM_IN403010UV01/s:controlActProcess/s:subject/s:registrationRequest/s:subject1/s:assignedEntity";
+			deptCodeXpath = deptXpath
+					+ "/s:id/s:item/@extension";
+			deptNameXpath = deptXpath
+					+ "/s:assignedPrincipalOrganization/s:name/s:item/s:part/@value";
+			parentDeptCodeXpath = deptXpath
+					+ "/s:assignedPrincipalOrganization/s:asAffiliate/s:affiliatedPrincipalOrganization/s:id/s:item/@extension";
+		} else {
+			throw new RuntimeException("action不为OrganizationInfoRegister或者OrganizationInfoUpdate！");
+		}
+		
+		try {
+			Document document = DocumentHelper.parseText(xmlStr);
+			String messageId = processDataByXpath(document, nameSpaceURIMap, idXpath);
+			String deptCode = processDataByXpath(document, nameSpaceURIMap, deptCodeXpath);
+			String deptName = processDataByXpath(document, nameSpaceURIMap, deptNameXpath);
+			String parentDeptCode = processDataByXpath(document, nameSpaceURIMap, parentDeptCodeXpath);
+			
+			if (messageId == null || deptCode == null || deptName == null || parentDeptCode == null) {
+				throw new RuntimeException("xml中的必须项不能为空！");
+			}
+			
+			OrgUnitVo orgUnitVo = new OrgUnitVo();
+			orgUnitVo.setCoding(deptCode);
+			orgUnitVo.setName(deptName);
+			orgUnitVo.setParentCoding(parentDeptCode);
+			orgUnitVo.setSource(Constants.SOURCE_SYNC);
+			// 临时用于保存消息id
+			orgUnitVo.setMessageId(messageId);
+			List<OrgUnitVo> orgUnitVoList = new ArrayList<OrgUnitVo>();
+			orgUnitVoList.add(orgUnitVo);
+			return orgUnitVoList;
+		}catch (DocumentException e) {
+			e.printStackTrace();
+			throw new RuntimeException("xml解析失败！");
+		}
+	}
+	
+	@Override
+	public List<UserVo> paramToUserVos(String action, String xmlStr) {
+		if (StringUtils.isBlank(action) || StringUtils.isBlank(xmlStr)) {
+			throw new RuntimeException("参数action或message为空！");
+		}
+		// xml文件命名空间
+		Map<String, String> nameSpaceURIMap = new HashMap<String, String>();
+		nameSpaceURIMap.put("s", "urn:hl7-org:v3");
+		// xml字段的xpath表达式
+		String messageIdXpath = "";
+		String userXpath = "";
+		String userCodeXpath = "";
+		String userNameXpath = "";
+		String deptCodeXpath = "";
+		if (StringUtils.equals("ProviderInfoRegister", action)) {
+			messageIdXpath = "/PRPM_IN301010UV01/s:id/@extension";
+			userXpath = "/PRPM_IN301010UV01/s:controlActProcess/s:subject/s:registrationRequest/s:subject1/s:healthCareProvider";
+			userCodeXpath = userXpath
+					+ "/s:id/s:item/@extension";
+			userNameXpath = userXpath
+					+ "/s:healthCarePrincipalPerson/s:name/s:item/s:part/@value";
+			deptCodeXpath = userXpath
+					+ "/s:healthCarePrincipalPerson/s:asAffiliate/s:affiliatedPrincipalOrganization/s:id/s:item/@extension";
+		} else if (StringUtils.equals("ProviderInfoUpdate", action)){
+			messageIdXpath = "/PRPM_IN303010UV01/s:id/@extension";
+			userXpath = "/PRPM_IN303010UV01/s:controlActProcess/s:subject/s:registrationRequest/s:subject1/s:healthCareProvider";
+			userCodeXpath = userXpath
+					+ "/s:id/s:item/@extension";
+			userNameXpath = userXpath
+					+ "/s:healthCarePrincipalPerson/s:name/s:item/s:part/@value";
+			deptCodeXpath = userXpath
+					+ "/s:healthCarePrincipalPerson/s:asAffiliate/s:affiliatedPrincipalOrganization/s:id/s:item/@extension";
+		} else {
+			throw new RuntimeException("action不为ProviderInfoRegister或者ProviderInfoUpdate！");
+		}
+		
+		try {
+			Document document = DocumentHelper.parseText(xmlStr);
+			String messageId = processDataByXpath(document, nameSpaceURIMap, messageIdXpath);
+			String userCode = processDataByXpath(document, nameSpaceURIMap, userCodeXpath);
+			String userName = processDataByXpath(document, nameSpaceURIMap, userNameXpath);
+			String deptCode = processDataByXpath(document, nameSpaceURIMap, deptCodeXpath);
+			if (messageId == null || userCode == null || userName == null || deptCode == null) {
+				throw new RuntimeException("xml中关键的参数不能为空！");
+			}
+			UserVo userVo = new UserVo();
+			userVo.setCoding(userCode);
+			userVo.setName(userName);
+			userVo.setOrgUnitCoding(deptCode);
+			userVo.setSource(Constants.SOURCE_SYNC);
+			// 保存消息id
+			userVo.setMessageId(messageId);
+			List<UserVo> userVoList = new ArrayList<UserVo>();
+			userVoList.add(userVo);
+			return userVoList;
+		} catch (DocumentException e) {
+			e.printStackTrace();
+			throw new RuntimeException("xml解析失败！");
+		}
+	}
+
+
+	@Override
+	public List<OperationReservation> paramToOperationReservation(String xmlStr) {
+		if (StringUtils.isEmpty(xmlStr)) {
+			throw new RuntimeException("参数message为空！");
+		}
+		// xml文件命名空间
+		Map<String, String> nameSpaceURIMap = new HashMap<String, String>();
+		nameSpaceURIMap.put("s", "urn:hl7-org:v3");
+		String actIdXpath = "/QUMT_IN020030UV01/s:controlActProcess/s:queryByParameter/s:actId/s:value/s:item/@extension";
+		try {
+			Document document = DocumentHelper.parseText(xmlStr);
+			String actId = processDataByXpath(document, nameSpaceURIMap, actIdXpath);
+			if (StringUtils.isBlank(actId)) {
+				throw new RuntimeException("xml中申请单编号参数不能为空！");
+			}
+			List<OperationReservation> list = new ArrayList<OperationReservation>();
+			OperationReservation operationReservation = new OperationReservation();
+			operationReservation.setSerialNumber(actId);
+			list.add(operationReservation);
+			return list;
+		} catch (DocumentException e) {
+			e.printStackTrace();
+			throw new RuntimeException("xml解析失败！");
+		}
+	}
+
+	@Override
+	public UseRecord syncUseRecord(String xmlStr) {
+		if (StringUtils.isBlank(xmlStr)) {
+			throw new RuntimeException("参数message为空！");
+		}
+		String messageIdXpath = "/req/message_id";
+		String codeXpath = "/req/message_cont/INPUT/code";
+		//String patientIdXpath = "/req/message_cont/INPUT/patient_id";
+		String inpatientnoXpath = "/req/message_cont/INPUT/inpatientno";
+		String excutorXpath = "/req/message_cont/INPUT/excutor";
+		String excutimeXpath = "/req/message_cont/INPUT/excutime";
+		String excutdeptnoXpath = "/req/message_cont/INPUT/excutdeptno";
+		try {
+			Document document = DocumentHelper.parseText(xmlStr);
+			String messageId = processDataByXpath(document, null, messageIdXpath);
+			// 器械包条码
+			String barcode = processDataByXpath(document, null, codeXpath);
+			// 患者标识
+			//String patientId = processDataByXpath(document, null, patientIdXpath);
+			// 患者住院号
+			String inpatientno = processDataByXpath(document, null, inpatientnoXpath);
+			String excutor = processDataByXpath(document, null, excutorXpath);
+			String excutime = processDataByXpath(document, null, excutimeXpath);
+			String excutdeptno = processDataByXpath(document, null, excutdeptnoXpath);
+			if (StringUtils.isBlank(messageId) || StringUtils.isBlank(barcode) || StringUtils.isBlank(inpatientno)) {
+				throw new RuntimeException("xml中关键参数不能为空！");
+			}
+			// 1、查询器械包实例
+			TousseInstance tousseInstance = new TousseInstance();
+			tousseInstance.setBarcode(barcode);
+			List<TousseInstance> list = new ArrayList<TousseInstance>();
+			list.add(tousseInstance);
+			// 2、生成使用记录
+			UseRecord useRecord = new UseRecord();
+			useRecord.setTousseInstanceList(list);
+			useRecord.setPatientIDCard(inpatientno);
+			useRecord.setDepartCoding(excutdeptno);
+			useRecord.setOperator(excutor);
+			// 存放使用记录录入时间
+			useRecord.setOperationTime(DateTools.coverStrToDate(excutime, "yyyyMMddHHmmss"));
+			// remark暂时存放请求消息的messageId
+			useRecord.setRemark(messageId);
+			return useRecord;
+		} catch (DocumentException e) {
+			e.printStackTrace();
+			throw new RuntimeException("xml解析失败！");
+		}
+	}
+
+	@Override
+	public TousseInstance tousseDetailQuery(String xmlStr) {
+		if (StringUtils.isBlank(xmlStr)) {
+			throw new RuntimeException("参数message为空！");
+		}
+		String messageIdXpath = "/req/message_id";
+		String barcodeXpath = "/req/message_cont/INPUT/code";
+		try {
+			Document document = DocumentHelper.parseText(xmlStr);
+			// 器械包条码
+			String barcode = processDataByXpath(document, null, barcodeXpath);
+			String messageId = processDataByXpath(document, null, messageIdXpath);
+			if (StringUtils.isBlank(messageId) || StringUtils.isBlank(barcode)) {
+				throw new RuntimeException("xml中关键参数不能为空！");
+			}
+			TousseInstance ti = new TousseInstance();
+			ti.setBarcode(barcode);
+			// remark暂时存放请求消息的messageId
+			ti.setRemark(messageId);
+			return ti;
+		} catch (DocumentException e) {
+			e.printStackTrace();
+			throw new RuntimeException("xml解析失败！");
+		}
+	}
+	
+}
Index: ssts-web/src/main/resources/spring/security/applicationContext-acegi-security.xml
===================================================================
diff -u -r23160 -r27131
--- ssts-web/src/main/resources/spring/security/applicationContext-acegi-security.xml	(.../applicationContext-acegi-security.xml)	(revision 23160)
+++ ssts-web/src/main/resources/spring/security/applicationContext-acegi-security.xml	(.../applicationContext-acegi-security.xml)	(revision 27131)
@@ -39,6 +39,7 @@
 			<intercept-url pattern="/logonForExpensiveGoods.jsp" access="permitAll"></intercept-url>
 			<intercept-url pattern="/logonSSOForGyey.jsp" access="permitAll"></intercept-url>
 			<intercept-url pattern="/logonSSOForCszxyy.jsp" access="permitAll"></intercept-url>
+			<intercept-url pattern="/logonSSOForDysyy.jsp" access="permitAll"></intercept-url>
 			<intercept-url pattern="/debug/**" access="permitAll"></intercept-url>
 			<intercept-url pattern="/buttjoint/**" access="permitAll"></intercept-url>
 			<intercept-url pattern="/disinfectsystem/qualitymonitoringWithNoLogon/**" access="permitAll"></intercept-url>
Index: ssts-web/src/main/resources/spring/projects/dysyy/webservice-cxf.xml
===================================================================
diff -u
--- ssts-web/src/main/resources/spring/projects/dysyy/webservice-cxf.xml	(revision 0)
+++ ssts-web/src/main/resources/spring/projects/dysyy/webservice-cxf.xml	(revision 27131)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:jaxws="http://cxf.apache.org/jaxws"
+    xmlns="http://www.springframework.org/schema/beans"
+    xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd" >
+
+    <!-- Import apache CXF bean definition 固定 -->
+
+    <import resource="classpath:META-INF/cxf/cxf.xml" />
+
+    <import resource="classpath:META-INF/cxf/cxf-servlet.xml" />
+    
+    <!-- 德阳市人民医院DYSYY-53二期合同接口开发,start -->
+    <bean id="HIPMessageService"
+        class="com.forgon.disinfectsystem.webservice.datasync.dysrmyy.HIPMessageWebServiceImpl">
+    </bean>
+    <jaxws:endpoint
+        address="/HIPMessageService"
+        implementor="#HIPMessageService" />
+	<!-- 德阳市人民医院DYSYY-53二期合同接口开发,end -->
+</beans>
\ No newline at end of file
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/dysrmyy/HIPMessageWebService.java
===================================================================
diff -u
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/dysrmyy/HIPMessageWebService.java	(revision 0)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/dysrmyy/HIPMessageWebService.java	(revision 27131)
@@ -0,0 +1,19 @@
+package com.forgon.disinfectsystem.webservice.datasync.dysrmyy;
+
+import javax.jws.WebMethod;
+import javax.jws.WebParam;
+import javax.jws.WebService;
+
+/**
+ * 德阳市人民医院DYSYY-53
+ * 二期合同接口开发
+ * @author zhoupeimian
+ * @since 2019-10-17
+ */
+@WebService(serviceName="HIPMessageWebService")
+public interface HIPMessageWebService {
+	
+	@WebMethod(operationName="HIPMessageServer")
+	public String HIPMessageServer(@WebParam(name="action") String action, @WebParam(name="message") String message);
+	
+}
Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/dysrmyy/HIPMessageWebServiceImpl.java
===================================================================
diff -u
--- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/dysrmyy/HIPMessageWebServiceImpl.java	(revision 0)
+++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/datasync/dysrmyy/HIPMessageWebServiceImpl.java	(revision 27131)
@@ -0,0 +1,508 @@
+package com.forgon.disinfectsystem.webservice.datasync.dysrmyy;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.UUID;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.forgon.directory.model.BarcodeDevice;
+import com.forgon.disinfectsystem.barcode.service.BarcodeManager;
+import com.forgon.disinfectsystem.datasynchronization.dao.SyncDataFromHIPDao;
+import com.forgon.disinfectsystem.datasynchronization.model.OrgUnitVo;
+import com.forgon.disinfectsystem.datasynchronization.model.PatientInfoVO;
+import com.forgon.disinfectsystem.datasynchronization.model.UserVo;
+import com.forgon.disinfectsystem.datasynchronization.service.DataSynchronizationManager;
+import com.forgon.disinfectsystem.entity.basedatamanager.materialinstance.MaterialInstance;
+import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
+import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
+import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
+import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
+import com.forgon.disinfectsystem.entity.useRecord.UseRecord;
+import com.forgon.disinfectsystem.operationreservation.service.OperationReservationManager;
+import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager;
+import com.forgon.disinfectsystem.useRecord.service.UseRecordManager;
+import com.forgon.tools.date.DateTools;
+import com.forgon.tools.hibernate.ObjectDao;
+
+public class HIPMessageWebServiceImpl implements HIPMessageWebService {
+	
+	private static Logger logger = Logger.getLogger(HIPMessageWebServiceImpl.class);
+	
+	@Autowired
+	private SyncDataFromHIPDao sycnDataFromHIPDao;
+	@Autowired
+	private DataSynchronizationManager dataSynchronizationManager;
+	@Autowired
+	private OperationReservationManager operationReservationManager;
+	@Autowired
+	private TousseInstanceManager tousseInstanceManager;
+	@Autowired
+	private BarcodeManager barcodeManager;
+	@Autowired
+	private ObjectDao objectDao;
+	@Autowired
+	private UseRecordManager useRecordManager;
+	
+	/**
+	 * 医疗卫生人员信息注册服务
+	 * @param action
+	 * @param message
+	 * @return
+	 */
+	public String organizationInfoRegister(String action, String message) {
+		logger.info("organizationInfoRegister ---> action : " + action + "; message : " + message);
+		// typeCode为处理结果，AA表示成功 AE表示失败
+		String typeCode = "AE";
+		// 处理结果说明
+		String returnStr = "";
+		// 消息ID
+		String messageId = "";
+		// guid
+		UUID uuid = UUID.randomUUID();
+		List<OrgUnitVo> orgUnitVoList = new ArrayList<OrgUnitVo>();
+		try {
+			orgUnitVoList = sycnDataFromHIPDao.paramToOrgUnitVos(action, message);
+		} catch (Exception e) {
+			e.printStackTrace();
+			returnStr = e.getMessage();
+			logger.info(returnStr);
+		}
+		if (CollectionUtils.isNotEmpty(orgUnitVoList)) {
+			typeCode = "AA";
+			returnStr = "同步成功";
+			OrgUnitVo orgUnitVo = orgUnitVoList.get(0);
+			messageId = orgUnitVo.getMessageId();
+			// 同步到数据库中
+			dataSynchronizationManager.processSyncOrgUnitData(new OrgUnitVo[] {orgUnitVo});
+		}
+		String returnMsg = "<MCCI_IN000002UV01 ITSVersion=\"XML_1.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"urn:hl7-org:v3\" xsi:schemaLocation=\"urn:hl7-org:v3 ../multicacheschemas/MCCI_IN000002UV01.xsd\">"
+				+ "<id root=\"2.16.156.10011.2.5.1.1\" extension=\"" + uuid.toString() + "\"/>"
+				+ "<creationTime value=\"" + DateTools.getCurrentDayByFormat("yyyyMMddHHmmss") + "\"/> "
+				+ "<interactionId root=\"2.16.156.10011.2.5.1.2\" extension=\"MCCI_IN000002UV01\"/> "
+				+ "<processingCode code=\"P\"/> <processingModeCode/> <acceptAckCode code=\"AL\"/><receiver typeCode=\"RCV\"> "
+				+ "<device classCode=\"DEV\" determinerCode=\"INSTANCE\"> "
+				+ "<id> <item root=\"2.16.156.10011.2.5.1.3\" extension=\"@111\"/> </id> </device> </receiver> "
+				+ "<sender typeCode=\"SND\"> <device classCode=\"DEV\" determinerCode=\"INSTANCE\"> "
+				+ "<id> <item root=\"2.16.156.10011.2.5.1.3\" extension=\"@222\"/> </id> </device> </sender> "
+				+ "<acknowledgement typeCode=\"" + typeCode + "\"><targetMessage> "
+				+ "<id root=\"2.16.156.10011.2.5.1.1\" extension=\"" + messageId + "\"/> </targetMessage> "
+				+ "<acknowledgementDetail> <text value=\"" + returnStr + "\"/> </acknowledgementDetail> </acknowledgement> </MCCI_IN000002UV01>";
+		logger.info("organizationInfoRegister ---> " + returnMsg);
+		return returnMsg;
+	}
+
+	/**
+	 * 医疗卫生人员信息更新服务
+	 * @param action
+	 * @param message
+	 * @return
+	 */
+	public String organizationInfoUpdate(String action, String message) {
+		return organizationInfoRegister(action, message);
+	}
+
+	/**
+	 * 医疗卫生机构(科室)信息注册服务
+	 * @param action
+	 * @param message
+	 * @return
+	 */
+	public String providerInfoRegister(String action, String message) {
+		logger.info("providerInfoRegister ---> action : " + action + "; message : " + message);
+		// typeCode为处理结果，AA表示成功 AE表示失败
+		String typeCode = "AE";
+		// 处理结果说明
+		String returnStr = "";
+		// 消息ID
+		String messageId = "";
+		// guid
+		UUID uuid = UUID.randomUUID();
+		List<UserVo> userList = new ArrayList<UserVo>();
+		try {
+			userList = sycnDataFromHIPDao.paramToUserVos(action, message);
+		} catch (Exception e) {
+			returnStr = e.getMessage();
+			logger.info(returnStr);
+			e.printStackTrace();
+		}
+		if (CollectionUtils.isNotEmpty(userList)) {
+			typeCode = "AA";
+			returnStr = "同步成功";
+			UserVo userVo = userList.get(0);
+			messageId = userVo.getMessageId();
+			// 同步到数据库中
+			dataSynchronizationManager.processSyncUserData(new UserVo[] {userVo});
+		}
+		StringBuilder returnMsg = new StringBuilder();
+		returnMsg.append("<MCCI_IN000002UV01 ITSVersion=\"XML_1.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"urn:hl7-org:v3\" xsi:schemaLocation=\"urn:hl7-org:v3 ../multicacheschemas/MCCI_IN000002UV01.xsd\">");
+		returnMsg.append("<id root=\"2.16.156.10011.2.5.1.1\" extension=\"" + uuid.toString() + "\"/>");
+		returnMsg.append("<creationTime value=\"" + DateTools.getCurrentDayByFormat("yyyyMMddHHmmss") + "\"/> ");
+		returnMsg.append("<interactionId root=\"2.16.156.10011.2.5.1.2\" extension=\"MCCI_IN000002UV01\"/> ");
+		returnMsg.append("<processingCode code=\"P\"/> <processingModeCode/> <acceptAckCode code=\"AL\"/><receiver typeCode=\"RCV\"> ");
+		returnMsg.append("<device classCode=\"DEV\" determinerCode=\"INSTANCE\"> ");
+		returnMsg.append("<id> <item root=\"2.16.156.10011.2.5.1.3\" extension=\"@111\"/> </id> </device> </receiver> ");
+		returnMsg.append("<sender typeCode=\"SND\"> <device classCode=\"DEV\" determinerCode=\"INSTANCE\"> ");
+		returnMsg.append("<id> <item root=\"2.16.156.10011.2.5.1.3\" extension=\"@222\"/> </id> </device> </sender> ");
+		returnMsg.append("<acknowledgement typeCode=\"" + typeCode + "\"><targetMessage> ");
+		returnMsg.append("<id root=\"2.16.156.10011.2.5.1.1\" extension=\"" + messageId + "\"/> </targetMessage> ");
+		returnMsg.append("<acknowledgementDetail> <text value=\"" + returnStr + "\"/> </acknowledgementDetail> </acknowledgement> </MCCI_IN000002UV01>");
+		String returnString = returnMsg.toString();
+		logger.info("providerInfoRegister ---> " + returnString);
+		return returnString;
+	}
+
+	/**
+	 * 医疗卫生机构(科室)信息更新服务
+	 * @param action
+	 * @param message
+	 * @return
+	 */
+	public String providerInfoUpdate(String action, String message) {
+		return providerInfoRegister(action, message);
+	}
+
+	/**
+	 * 器械包使用登记(消毒物料使用登记)
+	 * @param action
+	 * @param message
+	 * @return
+	 */
+	public String applyRegister(String action, String message) {
+		logger.info("applyRegister ---> action : " + action + "; message : " + message);
+		// typeCode 为处理结果， AA 表示成功 AE 表示失败
+		String typeCode = "AE";
+		// 处理结果说明
+		String returnStr = "患者消毒物料使用登记失败";
+		// 消息id
+		String messageId = "";
+		try {
+			UseRecord useRecord = sycnDataFromHIPDao.syncUseRecord(message);
+			if (useRecord != null) {
+				messageId = useRecord.getRemark();
+				List<TousseInstance> list = useRecord.getTousseInstanceList();
+				if (CollectionUtils.isNotEmpty(list)) {
+					TousseInstance ti = list.get(0);
+					BarcodeDevice bd = barcodeManager.getBarcodeByBarcode(ti.getBarcode());
+					if (bd instanceof TousseInstance) {
+						// 1、查询器械包实例
+						TousseInstance tousseInstance = (TousseInstance) bd;
+						if (!TousseInstance.STATUS_STERILED.equals(tousseInstance.getStatus())) {
+							throw new RuntimeException("患者消毒物料使用登记失败 ：消毒物料处于" + tousseInstance.getStatus() + "状态");
+						}
+						// 2、查询患者信息
+						// (可以调用手麻系统提供患者查询服务，或者调用HIS系统提供患者查询服务，实现其中一种即可，之前已经实现手麻系统提供患者查询服务，所以这里调用的是手麻系统提供患者查询服务)
+						PatientInfoVO[] patients = dataSynchronizationManager.findPatientInfoByHospitalNum(useRecord.getPatientIDCard());
+						if (patients == null || patients.length == 0) {
+							throw new RuntimeException("患者消毒物料使用登记失败 ：未找到住院号为" + useRecord.getHospitalNum() + "的患者信息");
+						}
+						PatientInfoVO patient = patients[0];
+						// 3、创建使用记录
+						UseRecord newUseRecord = new UseRecord();
+						newUseRecord.setHospitalNum(patient.getHospitalNumber());
+						newUseRecord.setTreatmentNum(patient.getClinicNumber());
+						newUseRecord.setPatientName(patient.getPatientName());
+						newUseRecord.setPatientAge(patient.getPatientAge());
+						newUseRecord.setPatientSex(patient.getPatientSex());
+						newUseRecord.setPatientIDCard(patient.getPatientIDCard());
+						newUseRecord.setDoctorName(patient.getDoctorName());
+						newUseRecord.setOperation(patient.getOperation());
+						newUseRecord.setOperationRoom(patient.getOpRoomId());
+						newUseRecord.setPatientArea(patient.getPatientArea());
+						newUseRecord.setRoomNumber(patient.getRoomNumber());
+						newUseRecord.setBedNumber(patient.getBedNumber());
+						newUseRecord.setDepart(patient.getAscriptionDepartment());
+						newUseRecord.setVisitId(patient.getVisitId());
+						newUseRecord.setWashHandNurse(patient.getWashHandNurse());
+						newUseRecord.setCircuitNurse(patient.getCircuitNurse());
+						// 登记人
+						newUseRecord.setOperator(useRecord.getOperator());
+						// 审核人
+						newUseRecord.setReviewer(useRecord.getOperator());
+						Date currentDate = new Date();
+						// 录入时间
+						newUseRecord.setEnteringDate(useRecord.getOperationTime());
+						// 审核时间
+						newUseRecord.setReviewTime(useRecord.getOperationTime());
+						newUseRecord.setApplicationTime(currentDate);
+						newUseRecord.setOperationTime(useRecord.getOperationTime());
+						// 使用记录转申请单
+						useRecordManager.saveAndReviewAndConvertUseRecordForm_TRANS_REQUIRED(
+								newUseRecord, useRecord.getOperator(), null, useRecord.getDepartCoding(), 
+								useRecord.getOperationTime(), InvoicePlan.TYPE_COMBO_FORM, 
+								useRecord.getOperator(), useRecord.getOperator());
+						// 登记人
+						newUseRecord.setOperator(useRecord.getOperator());
+						// 审核人
+						newUseRecord.setReviewer(useRecord.getOperator());
+						// 录入时间
+						newUseRecord.setEnteringDate(useRecord.getOperationTime());
+						// 审核时间
+						newUseRecord.setReviewTime(useRecord.getOperationTime());
+						objectDao.saveOrUpdate(newUseRecord);
+						tousseInstance.setUseRecord_id(newUseRecord.getId());
+						tousseInstance.setStatus(TousseInstance.STATUS_USED);
+						tousseInstance.setPatientName(patient.getPatientName());
+						tousseInstance.setDoctorName(patient.getDoctorName());
+						tousseInstance.setUseTime(useRecord.getOperationTime());
+						objectDao.saveOrUpdate(tousseInstance);
+						if (StringUtils.isNotBlank(messageId)) {
+							typeCode = "AA";
+							returnStr = "患者消毒物料使用登记成功";
+						}
+					} else {
+						returnStr = "该条码不是器械包条码";
+					}
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+			returnStr = e.getMessage();
+		}
+		StringBuilder returnMsg = new StringBuilder();
+		returnMsg.append("<res><message_id/><message_cont>");
+		returnMsg.append("<acknowledgement typeCode=\"" + typeCode + "\"> ");
+		returnMsg.append("<targetMessage><id root=\"2.16.156.10011.0\" extension=\"" + messageId + "\"/></targetMessage>");
+		returnMsg.append("<acknowledgementDetail><text>" + returnStr + "</text></acknowledgementDetail>");
+		returnMsg.append("</acknowledgement></message_cont></res>");
+		logger.info("applyRegister ---> " + returnMsg.toString());
+		return returnMsg.toString();
+	}
+
+	/**
+	 * 根据器械包条码查询消毒物料明细查询
+	 * @param action
+	 * @param message
+	 * @return
+	 */
+	public String tousseDetailQuery(String action, String message) {
+		logger.info("tousseDetailQuery ---> action : " + action + "; message : " + message);
+		// typeCode 为处理结果， AA 表示成功 AE 表示失败
+		String typeCode = "AE";
+		// 处理结果说明
+		String returnStr = "消毒物料明细查询失败";
+		// 消息id
+		String messageId = "";
+		// guid
+		UUID uuid = UUID.randomUUID();
+		try {
+			TousseInstance ti = sycnDataFromHIPDao.tousseDetailQuery(message);
+			BarcodeDevice bd = barcodeManager.getBarcodeByBarcode(ti.getBarcode());
+			if (bd instanceof TousseInstance) {
+				// 生成器械包信息xml
+				TousseInstance tousseInstance = (TousseInstance) bd;
+				TousseDefinition tousseDefinition = tousseInstance.getTousseDefinition();
+				if (tousseDefinition != null) {
+					List<MaterialInstance> materialInstances = tousseDefinition.getMaterialInstances();
+					messageId = ti.getRemark();
+					typeCode = "AA";
+					//String materialStr = "";
+					StringBuilder materialStr = new StringBuilder();
+					if (CollectionUtils.isNotEmpty(materialInstances)) {
+						for (MaterialInstance materialInstance : materialInstances) {
+							String detailspec = materialInstance.getSpecification() == null ? "" : materialInstance.getSpecification();
+							materialStr.append("<detail><detailcode>" + materialInstance.getMaterialDefinitionId() + "</detailcode>");
+							materialStr.append("<detailname>" + materialInstance.getMaterialName() + "</detailname>");
+							materialStr.append("<detailspec>" + detailspec + "</detailspec>");
+							materialStr.append("<number>" + materialInstance.getCount() + "</number></detail>");
+						}
+					}
+					StringBuilder returnStrSB = new StringBuilder();
+					returnStrSB.append("<text>");
+					returnStrSB.append("<code>" + tousseInstance.getBarcode() + "</code>");
+					returnStrSB.append("<pack_code>" + tousseDefinition.getId() + "</pack_code>");
+					returnStrSB.append("<pack_name>" + tousseInstance.getTousseName() + "</pack_name>");
+					returnStrSB.append("<distime>" + tousseInstance.getSterileEndTime() + "</distime>");
+					returnStrSB.append("<failtime>" + tousseInstance.getValidUntilStr() + "</failtime><list>");
+					returnStrSB.append(materialStr.toString());
+					returnStrSB.append("</list></text>");
+					returnStr = returnStrSB.toString();
+				}
+			}
+		} catch (RuntimeException e) {
+			e.printStackTrace();
+			returnStr = e.getMessage();
+		}
+		StringBuilder returnMsgSB = new StringBuilder();
+		returnMsgSB.append("<res><message_id>"+ uuid.toString() +"</message_id>"); 
+		returnMsgSB.append("<message_cont><acknowledgement typeCode=\"" + typeCode + "\">");
+		returnMsgSB.append("<targetMessage><id root=\"2.16.156.10011.0\" extension=\"" + messageId + "\"/></targetMessage>");
+		returnMsgSB.append("<acknowledgementDetail>" +  returnStr + "</acknowledgementDetail></acknowledgement></message_cont></res>");
+		logger.info("tousseDetailQuery ---> " + returnMsgSB.toString());
+		return returnMsgSB.toString();
+	}
+
+	/**
+	 * 医院质控管理需要按患者使用的消毒包条码，进行消毒供应处理步骤的追溯并显示相关信息
+	 * @param action
+	 * @param message
+	 * @return
+	 */
+	public String tousseTraceQuery(String action, String message) {
+		logger.info("tousseTraceQuery ---> action : " + action + "; message : " + message);
+		// typeCode 为处理结果， AA 表示成功 AE 表示失败
+		String typeCode = "AE";
+		// 处理结果说明
+		String returnStr = "消毒物料消毒追溯信息查询失败";
+		// 消息id
+		String messageId = "";
+		// guid
+		UUID uuid = UUID.randomUUID();
+		try {
+			// 临时从xml中解析，只存了器械包条码，remark暂时存放请求消息的messageId
+			TousseInstance ti = sycnDataFromHIPDao.tousseDetailQuery(message);
+			BarcodeDevice bd = barcodeManager.getBarcodeByBarcode(ti.getBarcode());
+			if (bd instanceof TousseInstance) {
+				// 生成器械包信息xml
+				TousseInstance tousseInstance = (TousseInstance) bd;
+				messageId = ti.getRemark();
+				typeCode = "AA";
+				StringBuilder recoverStrSB = new StringBuilder();
+				recoverStrSB.append("<recover><component>");
+				recoverStrSB.append("<check>" + (tousseInstance.getRecyclingOperator() == null ? "" : tousseInstance.getRecyclingOperator()) + "</check>");
+				recoverStrSB.append("<recoverperson>" + (tousseInstance.getRecyclingUser() == null ? "" : tousseInstance.getRecyclingUser()) + "</recoverperson>");
+				recoverStrSB.append("<recovertime>" + (tousseInstance.getRecyclingTime() == null ? "" : tousseInstance.getRecyclingTime()) + "</recovertime>");
+				recoverStrSB.append("<circuitnurse>无</circuitnurse>");
+				recoverStrSB.append("<operatingroom>无</operatingroom>");
+				recoverStrSB.append("</component></recover>");
+				
+				StringBuilder cleanstrSB = new StringBuilder();
+				cleanstrSB.append("<clean><component>");
+				cleanstrSB.append("<washmachinename>" + (tousseInstance.getDisinfectIdentification() == null ? "" : tousseInstance.getDisinfectIdentification()) + "</washmachinename>");
+				cleanstrSB.append("<washproced>" + (tousseInstance.getDisinfectProgram() == null ? "" : tousseInstance.getDisinfectProgram()) + "</washproced>");
+				cleanstrSB.append("<washbasket>" + (tousseInstance.getWashBasket() == null ? "" : tousseInstance.getWashBasket()) + "</washbasket>");
+				cleanstrSB.append("<operator>" + (tousseInstance.getWashOperator() == null ? "" : tousseInstance.getWashOperator()) + "</operator>");
+				cleanstrSB.append("<responsible></responsible>");
+				cleanstrSB.append("<location>" + (tousseInstance.getLocation() == null ? "" : tousseInstance.getLocation()) + "</location>");
+				cleanstrSB.append("<begintime>" + (tousseInstance.getWashStartTime() == null ? "" : tousseInstance.getWashStartTime()) + "</begintime>");
+				cleanstrSB.append("<endtime>" + (tousseInstance.getWashEndTime() == null ? "" : tousseInstance.getWashEndTime()) + "</endtime>");
+				cleanstrSB.append("<washparam>无</washparam>");
+				cleanstrSB.append("</component></clean>");
+				
+				StringBuilder packageStrSB = new StringBuilder();
+				packageStrSB.append("<package><component>");
+				packageStrSB.append("<packager>" + (tousseInstance.getWrapper() == null ? "" : tousseInstance.getWrapper()) + "</packager>");
+				packageStrSB.append("<packagetime>" + (tousseInstance.getOperationTimeStr() == null ? "" : tousseInstance.getOperationTimeStr()) + "</packagetime>");
+				packageStrSB.append("<packagetype>" + (tousseInstance.getPackageType() == null ? "" : tousseInstance.getPackageType()) + "</packagetype>");
+				packageStrSB.append("<checker>" + (tousseInstance.getReviewer() == null ? "" : tousseInstance.getReviewer()) + "</checker>");
+				packageStrSB.append("<checktime>" + (tousseInstance.getReviewTimeStr() == null ? "" : tousseInstance.getReviewTimeStr()) + "</checktime>");
+				packageStrSB.append("</component></package>");
+				
+				StringBuilder sterilizationstrSB = new StringBuilder();
+				sterilizationstrSB.append("<sterilization><component>");
+				sterilizationstrSB.append("<steribox>" + (tousseInstance.getSterilizerName() == null ? "" : tousseInstance.getSterilizerName()) + "</steribox>");
+				sterilizationstrSB.append("<steriprogram>" + (tousseInstance.getSterilingType() == null ? "" : tousseInstance.getSterilingType()) + "</steriprogram>");
+				sterilizationstrSB.append("<boxtime>" + (tousseInstance.getSterileFrequency() == null ? "" : tousseInstance.getSterileFrequency()) + "</boxtime>");
+				sterilizationstrSB.append("<sterior>" + (tousseInstance.getSterilizationUser() == null ? "" : tousseInstance.getSterilizationUser()) + "</sterior>");
+				sterilizationstrSB.append("<begintime>" + (tousseInstance.getSterileStartTime() == null ? "" : tousseInstance.getSterileStartTime()) + "</begintime>");
+				sterilizationstrSB.append("<endtime>" + (tousseInstance.getSterileEndTime() == null ? "" : tousseInstance.getSterileEndTime()) + "</endtime>");
+				sterilizationstrSB.append("<steribasket>" + (tousseInstance.getSterilizationBasket() == null ? "" : tousseInstance.getSterilizationBasket()) + "</steribasket>");
+				sterilizationstrSB.append("<sterilocation>无</sterilocation>");
+				sterilizationstrSB.append("<steriparam>无</steriparam>");
+				sterilizationstrSB.append("<effectivetime>" + (tousseInstance.getValidUntilStr() == null ? "" : tousseInstance.getValidUntilStr()) + "</effectivetime>");
+				sterilizationstrSB.append("</component></sterilization>");
+				
+				Invoice ip = tousseInstance.getInvoice(objectDao);
+				StringBuilder sendstrSB = new StringBuilder();
+				if (ip != null) {
+					sendstrSB.append("<send><component>");
+					sendstrSB.append("<serialnum>" + (ip.getSerialNumber() == null ? "" : ip.getSerialNumber()) + "</serialnum>");
+					sendstrSB.append("<applydept>" + (ip.getDepart() == null ? "" : ip.getDepart()) + "</applydept>");
+					sendstrSB.append("<applicant>" + (ip.getApplicant() == null ? "" : ip.getApplicant()) + "</applicant>");
+					sendstrSB.append("<applytime>" + (ip.getApplicationTime_YYYYMMDDHHMM() == null ? "" : ip.getApplicationTime_YYYYMMDDHHMM()) + "</applytime>");
+					sendstrSB.append("<sendtime>" + (ip.getSendTime_YYYYMMDDHHMM() == null ? "" : ip.getSendTime_YYYYMMDDHHMM()) + "</sendtime>");
+					sendstrSB.append("<sender>" + (ip.getSender() == null ? "" : ip.getSender()) + "</sender>");
+					sendstrSB.append("<signtime>" + (ip.getReceiptingTime_YYYYMMDDHHMM() == null ? "" : ip.getReceiptingTime_YYYYMMDDHHMM()) + "</signtime>");
+					sendstrSB.append("<signer>" + (ip.getReceiptor() == null ? "" : ip.getReceiptor()) + "</signer>");
+					sendstrSB.append("</component></send>");
+				}
+				
+				UseRecord ur = tousseInstance.getUseRecord(objectDao);
+				StringBuilder useStrSB = new StringBuilder();
+				if (ur != null) {
+					useStrSB.append("<use><component>");
+					useStrSB.append("<hospital>" + (ur.getHospitalNum() == null ? "" : ur.getHospitalNum()) + "</hospital>");
+					useStrSB.append("<outpatient>" + (ur.getTreatmentNum() == null ? "" : ur.getTreatmentNum()) + "</outpatient>");
+					useStrSB.append("<patientname>" + (ur.getPatientName() == null ? "" : ur.getPatientName()) + "</patientname>");
+					useStrSB.append("<patientcard>" + (ur.getPatientIDCard() == null ? "" : ur.getPatientIDCard()) + "</patientcard>");
+					useStrSB.append("<usetime>" + (ur.getOperationTimeStr() == null ? "" : ur.getOperationTimeStr()) + "</usetime>");
+					useStrSB.append("<operaname>" + (ur.getSurgeon() == null ? "" : ur.getSurgeon()) + "</operaname>");
+					useStrSB.append("<operadoctor>" + (ur.getDoctorName() == null ? "" : ur.getDoctorName()) + "</operadoctor>");
+					useStrSB.append("<operator>" + (ur.getOperator() == null ? "" : ur.getOperator()) + "</operator>");
+					useStrSB.append("<circuitnurse>" + (ur.getPatientName() == null ? "" : ur.getPatientName()) + "</circuitnurse>");
+					useStrSB.append("</component></use>");
+				}
+				
+				StringBuilder discardstrSB = new StringBuilder();
+				discardstrSB.append("<discard><component>");
+				discardstrSB.append("<discardtime>" + (tousseInstance.getWasteDateStr() == null ? "" : tousseInstance.getWasteDateStr()) + "</discardtime>");
+				discardstrSB.append("<discardreason>" + (tousseInstance.getWasteReason() == null ? "" : tousseInstance.getWasteReason()) + "</discardreason>");
+				discardstrSB.append("<operator>" + (tousseInstance.getOperateUser() == null ? "" : tousseInstance.getOperateUser()) + "</operator>");
+				discardstrSB.append("</component></discard>");
+				
+				StringBuilder returnStrSB = new StringBuilder();
+				returnStrSB.append("<text><OUTPUT>");
+				returnStrSB.append(recoverStrSB.toString());
+				returnStrSB.append(cleanstrSB.toString());
+				returnStrSB.append(packageStrSB.toString());
+				returnStrSB.append(sterilizationstrSB.toString());
+				returnStrSB.append(sendstrSB.toString());
+				returnStrSB.append(useStrSB.toString());
+				returnStrSB.append(discardstrSB.toString());
+				returnStrSB.append("</OUTPUT></text>");
+				returnStr = returnStrSB.toString();
+			}
+		} catch (RuntimeException e) {
+			e.printStackTrace();
+			returnStr = e.getMessage();
+		}
+		String returnMsg = 
+			"<res><message_id>"+ uuid.toString() +"</message_id>" + 
+			"<message_cont><acknowledgement typeCode=\"" + typeCode + "\">" +
+			"<targetMessage><id root=\"2.16.156.10011.0\" extension=\"" + messageId + "\"/></targetMessage>" +
+			"<acknowledgementDetail>" +  returnStr + "</acknowledgementDetail></acknowledgement></message_cont></res>";
+		logger.info("tousseTraceQuery ---> " + returnMsg);
+		return returnMsg;
+	}
+
+	
+	@Override
+	public String HIPMessageServer(String action, String message) {
+		if ("ProviderInfoRegister".equals(action)) {
+			return this.providerInfoRegister(action, message);
+		} else if ("ProviderInfoUpdate".equals(action)) {
+			return this.providerInfoUpdate(action, message);
+		} else if ("OrganizationInfoRegister".equals(action)) {
+			return this.organizationInfoRegister(action, message);
+		} else if ("OrganizationInfoUpdate".equals(action)) {
+			return this.organizationInfoUpdate(action, message);
+		} else if ("FJ_DETAILQUERY".equals(action)) {
+			return this.tousseDetailQuery(action, message);
+		} else if ("FJ_APPLYREGIS".equals(action)) {
+			return this.applyRegister(action, message);
+		} else if ("FJ_TRACEQUERY".equals(action)) {
+			return this.tousseTraceQuery(action, message);
+		} else {
+			logger.info("action : " + action + "; message : " + message);
+			// typeCode 为处理结果， AA 表示成功 AE 表示失败
+			String typeCode = "AE";
+			// 处理结果说明
+			String returnStr = "错误的action值";
+			// guid
+			UUID uuid = UUID.randomUUID();
+			StringBuilder returnMsgSB = new StringBuilder();
+			returnMsgSB.append("<res><message_id>" + uuid.toString() + "</message_id>");
+			returnMsgSB.append("<message_cont><acknowledgement typeCode=\"" + typeCode + "\">");
+			returnMsgSB.append("<targetMessage><id root=\"2.16.156.10011.0\" extension=\"\"/></targetMessage>");
+			returnMsgSB.append("<acknowledgementDetail>" +  returnStr + "</acknowledgementDetail></acknowledgement></message_cont></res>");
+			String returnMsg = returnMsgSB.toString();
+			logger.info("returnMsg : " + returnMsg);
+			return returnMsg;
+		}
+	}
+
+}
Index: ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/UserVo.java
===================================================================
diff -u -r14351 -r27131
--- ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/UserVo.java	(.../UserVo.java)	(revision 14351)
+++ ssts-datasync/src/main/java/com/forgon/disinfectsystem/datasynchronization/model/UserVo.java	(.../UserVo.java)	(revision 27131)
@@ -22,6 +22,11 @@
 	 */
 	private String source;
 	
+	/**
+     * 请求消息的Id(德阳市人民医院DYSYY-53二期合同接口开发)
+     */
+    private String messageId;
+	
 	public String getCoding() {
 		return coding;
 	}
@@ -107,4 +112,12 @@
 		this.status = status;
 	}
 
+	public String getMessageId() {
+		return messageId;
+	}
+
+	public void setMessageId(String messageId) {
+		this.messageId = messageId;
+	}
+
 }
Index: ssts-web/src/main/webapp/logonSSOForDysyy.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/logonSSOForDysyy.jsp	(revision 0)
+++ ssts-web/src/main/webapp/logonSSOForDysyy.jsp	(revision 27131)
@@ -0,0 +1,214 @@
+<%@page import="com.itextpdf.text.log.SysoLogger"%>
+<%@page import="com.forgon.security.model.User"%>
+<%@page import="com.forgon.disinfectsystem.common.CssdUtils"%>
+<%@page import="com.forgon.security.service.UserManager"%>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@page import="com.forgon.tools.SpringBeanManger"%>
+<%@page import="com.forgon.tools.Constants"%>
+<%@page import="net.sf.json.JSONObject" %>
+<%@page import="java.io.File" %>
+<%@page import="java.util.ArrayList" %>
+<%@page import="org.apache.commons.lang.StringUtils"%>
+<%@page import="com.forgon.disinfectsystem.datasynchronization.dao.dysrmyy.DatasyncConstant"%>
+<%@page import="com.forgon.disinfectsystem.datasynchronization.dao.dysrmyy.WebServiceClientHelper"%>
+<!DOCTYPE html>
+<%
+ArrayList message = new ArrayList();
+String sid = request.getParameter("sid");
+if(StringUtils.isNotBlank(sid)){
+	//String xmlInput = "<req><message_id>123546</message_id><message_cont><sid>" + sid + "</sid></message_cont></req>";
+	String xmlResult = CssdUtils.sendPostRequest(DatasyncConstant.HIPWebServiceAddress,  
+			WebServiceClientHelper.transferSpecialWordParam(
+			WebServiceClientHelper.buildCallWebServiceInputXml(DatasyncConstant.MethodName_GetUserInfo, sid)
+			), Constants.CHARSET_UTF8);
+	String userName = "";
+ 	try{
+		JSONObject json = (JSONObject)CssdUtils.xml2JsonCommon(xmlResult);
+		String typeCode = json.optJSONObject("message_cont")
+				.optJSONObject("acknowledgement").optString("@typeCode");
+		if("AA".equals(typeCode)){
+			String text = json.optJSONObject("message_cont")
+					.optJSONObject("acknowledgement")
+					.optJSONObject("acknowledgementDetail")
+					.optString("text");
+			JSONObject textJson = JSONObject.fromObject(text);
+			userName = textJson.optString("user_name");
+			if(userName == null){
+				message.add("xml的格式有误");
+			}
+			else if(userName.equals("")){
+				message.add("userName不能为空");
+			}
+		}
+		else{
+			message.add("xml的格式有误");
+		}
+	}
+	catch(Exception e) {
+		message.add("xml的格式有误");
+	}
+	
+	if(StringUtils.isNotBlank(userName)){
+		UserManager userManager=(UserManager)SpringBeanManger.getBean("userManager");
+		User user=userManager.getFirst("name", userName);
+		if(user==null){
+			message.add("用户:"+userName+"不存在");
+		}else{
+			pageContext.setAttribute("barcode", user.getBarcode());
+		}
+	}
+}else{
+	 message.add("sid不能为空");
+}
+pageContext.setAttribute("message", message);
+
+String companyName = CssdUtils.getSystemSetConfigByName("companyName");
+String companyNameStr = "";
+if(companyName == null || companyName.equals("forgon")){
+	companyNameStr = "©2016 广州孚峻信息技术有限公司 版权所有";
+}else if(companyName.equals("dingxiang")){
+	companyNameStr = "©2016 广州丁香软件有限公司 版权所有";
+}
+session.setAttribute("companyName", companyNameStr);
+String project = CssdUtils.getConfigProperty("project");
+session.setAttribute("profile", project);
+
+String imgPath =  "disinfectsystem/config/" + project + "/img/logo_" + project +".png";
+//System.out.println(application.getRealPath("/") + imgPath);
+File file = new File(application.getRealPath("/") + imgPath);
+if(file.exists()){
+	request.setAttribute("logoPath",imgPath);
+}else{
+	if(companyName == null || companyName.equals("forgon")){
+		request.setAttribute("logoPath","themes/portalPage/img/logo_Forgon.png");
+	}else if(companyName.equals("dingxiang")){
+		request.setAttribute("logoPath","themes/portalPage/img/logo_dingxiangsoft.png");
+	}
+}
+ 
+%>
+<html>
+<head>
+<link rel="apple-touch-icon-precomposed" href="ipadIcon.png"/>
+<link rel="icon" href="favicon.ico" />
+<meta name="apple-mobile-web-app-capable" content="yes" />
+<meta name="apple-mobile-web-app-status-bar-style" content="black-translucent" />
+<meta http-equiv="X-UA-Compatible" content="IE=8" />
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<title>消毒供应质量追溯管理系统</title>
+<%-- <link rel="stylesheet" type="text/css" href="${ctx}/themes/portalPage/css/login.css" /> --%>
+<script type="text/javascript" src="${ctx}/js/ui/common.js"></script>
+
+</head>
+
+<body onload=" setFieldFocus(document.getElementById('j_username_display'));autoMaxSize();autoLogin();">
+
+<form name="loginForm" action="j_spring_security_check" method="post" onsubmit="return checkSubmit();">
+<div style="height:118px;"></div>
+<div style="display:none;">
+    <c:if test="${(param.login_error == 1)}">账号或密码错误！请重新输入！</c:if>
+    <c:if test="${(param.login_error == 2)}">验证码错误，请重新输入！</c:if>
+    <c:if test="${(param.login_error == 3)}">该用户没有回收清点的权限，请重新输入！</c:if>
+    <c:if test="${(param.login_error == 4)}">注册码不正确或试用期已过！请与管理人员联系！</c:if>
+    <c:if test="${(param.login_error == 5)}">身份验证接口访问异常，请与系统管理员联系！</c:if>
+    <div class="login_n"  style="display:none;">
+      <input class="login_input" id="j_username_display" name="j_username_display" value="${barcode }" tabindex="1" type="text" maxlength="20" onfocus="this.select()" />
+      <input id="j_username" name="j_username" type="hidden" value="${barcode }" maxlength="20"/>
+      <span class="login_btn"><a href="#" onclick="checkSubmit();" tabindex="3"  onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('btn1','','${ctx}/themes/portalPage/img/btn3.gif',1)"><img style="vertical-align:middle;" src="${ctx}/themes/portalPage/img/btn1.gif" name="btn1" width="83" height="38" border="0" id="btn1" /></a></span>
+    </div>
+    <div class="login_p" style="display:none;">
+      <input class="login_input" id="j_password" name="j_password" tabindex="2" type="password" value="P@ssword" onfocus="this.select()" />
+    </div>
+</div>
+</form>
+</body>
+<script type="text/javascript" src="${ctx}/jquery/jquery-1.11.2.js"></script>
+<script type="text/javascript" src="${ctx}/js/number.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/default/config.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/common/cssdUtils.js"></script>
+<script type="text/javascript" src="${ctx}/js/configUtils.js"></script>
+<script type="text/javascript">
+if (top != self) {
+    top.location = self.location;
+}
+function autoMaxSize(){
+    self.moveTo(0,0);
+    self.resizeTo(screen.availWidth,screen.availHeight);
+}
+
+function MM_swapImgRestore() { //v3.0
+  var i,x,a=document.MM_sr; for(i=0;a&&i<a.length&&(x=a[i])&&x.oSrc;i++) x.src=x.oSrc;
+}
+function MM_preloadImages() { //v3.0
+  var d=document; if(d.images){ if(!d.MM_p) d.MM_p=new Array();
+    var i,j=d.MM_p.length,a=MM_preloadImages.arguments; for(i=0; i<a.length; i++)
+    if (a[i].indexOf("#")!=0){ d.MM_p[j]=new Image; d.MM_p[j++].src=a[i];}}
+}
+
+function MM_findObj(n, d) { //v4.01
+  var p,i,x;  if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) {
+    d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);}
+  if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n];
+  for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=MM_findObj(n,d.layers[i].document);
+  if(!x && d.getElementById) x=d.getElementById(n); return x;
+}
+
+function MM_swapImage() { //v3.0
+  var i,j=0,x,a=MM_swapImage.arguments; document.MM_sr=new Array; for(i=0;i<(a.length-2);i+=3)
+   if ((x=MM_findObj(a[i]))!=null){document.MM_sr[j++]=x; if(!x.oSrc) x.oSrc=x.src; x.src=a[i+2];}
+}
+
+    function submitForm(){
+    	document.loginForm.submit();
+    }
+	function checkSubmit() {
+		if (isFieldBlank(document.loginForm.j_username_display) == true) {
+			alert('<fmt:message key="error.required.login.username"/>');
+			document.loginForm.j_username_display.focus();
+			return false;
+		}
+		if (isFieldBlank(document.loginForm.j_password) == true) {
+			if (document.activeElement.id != 'j_username_display') {
+				alert('<fmt:message key="error.required.login.password"/>');
+			}
+			document.loginForm.j_password.focus();
+			return false;
+		}
+		document.loginForm.j_username.value = document.loginForm.j_username_display.value;
+		document.loginForm.submit();
+	}
+
+	function setFieldFocus(objField) {
+		try {
+			objField.focus();
+		} catch (e) {
+		}
+	}
+
+	function isFieldBlank(objField) {
+		if (typeof (objField[0]) == "object") {
+			objField = objField[0];
+		}
+		if (typeof (objField) == "object") {
+			if (objField.value == "") {
+				return true;
+			} else {
+				return false;
+			}
+		}
+		return true;
+	}
+	function autoLogin(){
+		var a='${message}';
+		if(a.length>2){
+			alert(a);
+		}else{
+			document.loginForm.submit();
+		}
+		
+	}
+</script>
+
+</html>
Index: ssts-web/src/main/resources/spring/security/applicationContext-acegi-security-standard.xml.back
===================================================================
diff -u -r25011 -r27131
--- ssts-web/src/main/resources/spring/security/applicationContext-acegi-security-standard.xml.back	(.../applicationContext-acegi-security-standard.xml.back)	(revision 25011)
+++ ssts-web/src/main/resources/spring/security/applicationContext-acegi-security-standard.xml.back	(.../applicationContext-acegi-security-standard.xml.back)	(revision 27131)
@@ -38,6 +38,7 @@
 			<intercept-url pattern="/logon.jsp" access="permitAll"></intercept-url>
 			<intercept-url pattern="/logonForExpensiveGoods.jsp" access="permitAll"></intercept-url>
 			<intercept-url pattern="/logonSSOForGyey.jsp" access="permitAll"></intercept-url>
+			<intercept-url pattern="/logonSSOForDysyy.jsp" access="permitAll"></intercept-url>
 			<intercept-url pattern="/logonSSOForGzzyyfy.jsp" access="permitAll"></intercept-url>
 			<intercept-url pattern="/logonSSOForCszxyy.jsp" access="permitAll"></intercept-url>
 			<intercept-url pattern="/logonSSOForSzszyy.jsp" access="permitAll"></intercept-url>