Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/mmsrmyy/WebServiceClientHelper.java
===================================================================
diff -u -r31383 -r31396
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/mmsrmyy/WebServiceClientHelper.java	(.../WebServiceClientHelper.java)	(revision 31383)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/mmsrmyy/WebServiceClientHelper.java	(.../WebServiceClientHelper.java)	(revision 31396)
@@ -45,16 +45,19 @@
 		StringBuffer inputSb = new StringBuffer();
 		
 		if(StringUtils.equals(function, DatasyncConstant.FunctionName_DeptList)){
-			inputSb.append("<QUERY_TYPE>1</QUERY_TYPE>");
-			inputSb.append("<PAGE_NUMBER></PAGE_NUMBER>");
-			inputSb.append("<PAGE_SIZE></PAGE_SIZE>");
+			// <QUERY_TYPE>2</QUERY_TYPE>表示分页查询
+			// <PAGE_NUMBER>0</PAGE_NUMBER>页码
+			// <PAGE_SIZE>100</PAGE_SIZE>每页最多记录条数
+			inputSb.append("<QUERY_TYPE>2</QUERY_TYPE>");
+			inputSb.append("<PAGE_NUMBER>0</PAGE_NUMBER>");
+			inputSb.append("<PAGE_SIZE>100</PAGE_SIZE>");
 			inputSb.append("<UPDATE_DATE></UPDATE_DATE>");
 			inputSb.append("<BUSINESS_ID></BUSINESS_ID>");
 			return inputSb.toString();
 		}else if(StringUtils.equals(function, DatasyncConstant.FunctionName_UserList)){
-			inputSb.append("<QUERY_TYPE>1</QUERY_TYPE>");
-			inputSb.append("<PAGE_NUMBER></PAGE_NUMBER>");
-			inputSb.append("<PAGE_SIZE></PAGE_SIZE>");
+			inputSb.append("<QUERY_TYPE>2</QUERY_TYPE>");
+			inputSb.append("<PAGE_NUMBER>0</PAGE_NUMBER>");
+			inputSb.append("<PAGE_SIZE>100</PAGE_SIZE>");
 			inputSb.append("<UPDATE_DATE></UPDATE_DATE>");
 			inputSb.append("<BUSINESS_ID></BUSINESS_ID>");
 			return inputSb.toString();
Index: ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/mmsrmyy/SyncOrgUnitAndUserDaoImpl.java
===================================================================
diff -u -r31383 -r31396
--- ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/mmsrmyy/SyncOrgUnitAndUserDaoImpl.java	(.../SyncOrgUnitAndUserDaoImpl.java)	(revision 31383)
+++ ssts-datasync-default-impl/src/main/java/com/forgon/disinfectsystem/datasynchronization/dao/mmsrmyy/SyncOrgUnitAndUserDaoImpl.java	(.../SyncOrgUnitAndUserDaoImpl.java)	(revision 31396)
@@ -48,7 +48,36 @@
 			String encodingStyle = "utf-8";
 			String result = WebServiceClientHelper.axisInvokeWebservice(endpoint, targetNamespace, soapActionURI, method, paramName, input, encodingStyle);
 			logger.info("用户信息接口返回信息：" + result);
-			/*String result = "<Records>"
+			// <TotalPage>4062</TotalPage>
+			// 接口限制每次最多只能查询100条记录；所以需要根据页码循环同步接口
+			int pageSizeStartIndex = result.indexOf("<TotalPage>");
+			if(pageSizeStartIndex == -1){
+				logger.info("用户信息接口返回信息没有<TotalPage>(查询结果总页数)标签！");
+				return null;
+			}
+			int pageSizeEndIndex = result.indexOf("</TotalPage>");
+			if(pageSizeEndIndex == -1 || pageSizeEndIndex < pageSizeStartIndex){
+				logger.info("用户信息接口返回信息没有</TotalPage>(查询结果总页数)标签");
+				return null;
+			}
+			String pageSize = result.substring(pageSizeStartIndex + "<TotalPage>".length(), pageSizeEndIndex);
+			int size = Integer.parseInt(pageSize);
+			if(size <= 0){
+				logger.info("用户信息接口查询结果总页数为0");
+				return null;
+			}
+			logger.info("用户信息接口查询结果总页数为:" + size);
+			for (int j=0; j<size; j++) {
+				StringBuffer inputSb = new StringBuffer();
+				inputSb.append("<QUERY_TYPE>2</QUERY_TYPE>");
+				inputSb.append("<PAGE_NUMBER>" + j + "</PAGE_NUMBER>");
+				inputSb.append("<PAGE_SIZE>100</PAGE_SIZE>");
+				inputSb.append("<UPDATE_DATE></UPDATE_DATE>");
+				inputSb.append("<BUSINESS_ID></BUSINESS_ID>");
+				String inputXml = inputSb.toString();
+				logger.info("用户信息接口请求信息：" + inputXml);
+				result = WebServiceClientHelper.axisInvokeWebservice(endpoint, targetNamespace, soapActionURI, method, paramName, inputXml, encodingStyle);
+				/*String result = "<Records>"
 					+ "<Record>"
 					+ "<STAFF_NAME>测试用户003</STAFF_NAME>"
 					+ "<STAFF_CODE>CSYH003</STAFF_CODE>"
@@ -60,58 +89,57 @@
 					+ "<SUBOR_DEPT_ID>CSKS004</SUBOR_DEPT_ID>"
 					+ "</Record>"
 					+ "</Records>";*/
-			//由于返回的xml数据格式可能有问题导致解析有点问题,现换成为文本方案截取
-			int startIndex = result.indexOf("<Records>");
-			if(startIndex == -1){
-				logger.info("用户信息接口返回信息没有<Records>标签！");
-				return null;
-			}
-			int endIndex = result.indexOf("</Records>");
-			if(endIndex == -1 || endIndex < startIndex){
-				logger.info("用户信息接口返回信息没有</Records>标签");
-				return null;
-			}
-			String xmlString = result.substring(startIndex + "<Records>".length(), endIndex);
-			if(StringUtils.isBlank(xmlString)){
-				logger.info("用户信息接口返回信息为空！" + xmlString);
-				return null;
-			}
-			xmlString = "<Records>" + xmlString + "</Records>";
-			
-			Document document = DocumentHelper.parseText(xmlString);
-			String itemXpath = "/Records/Record";	// 返回结果可能存在多条住院病人信息
-			XPath xpath = document.createXPath(itemXpath);
-			@SuppressWarnings("unchecked")
-			List<Node> nodeList = xpath.selectNodes(document, xpath);
-			if(CollectionUtils.isNotEmpty(nodeList)){
-				for(int i=1;i<=nodeList.size();i++){
-					String msgXpath = "/Records/Record[" + i + "]";
-					// 用户编码
-					String codingXpath = msgXpath + "/STAFF_CODE";
-					// 用户名称
-					String nameXpath = msgXpath + "/STAFF_NAME";
-					// 用户所属科室编码
-					String orgUnitCodingXpath = msgXpath + "/SUBOR_DEPT_ID";
-					
-					String coding = WebServiceClientHelper.processDataByXpath(document, codingXpath);
-					String name = WebServiceClientHelper.processDataByXpath(document, nameXpath);
-					String orgUnitCoding = WebServiceClientHelper.processDataByXpath(document, orgUnitCodingXpath);
-					UserVo userVo = new UserVo();
-					userVo.setCoding(coding);
-					userVo.setName(name);
-					userVo.setOrgUnitCoding(orgUnitCoding);
-					
-					//如果人员工号或名称为空,则忽略该条数据
-					if(StringUtils.isBlank(userVo.getName()) || StringUtils.isBlank(userVo.getCoding())){
-						continue;
+				//由于返回的xml数据格式可能有问题导致解析有点问题,现换成为文本方案截取
+				int startIndex = result.indexOf("<Records>");
+				if(startIndex == -1){
+					logger.info("用户信息接口返回信息没有<Records>标签！");
+					continue;
+				}
+				int endIndex = result.indexOf("</Records>");
+				if(endIndex == -1 || endIndex < startIndex){
+					logger.info("用户信息接口返回信息没有</Records>标签");
+					continue;
+				}
+				String xmlString = result.substring(startIndex + "<Records>".length(), endIndex);
+				if(StringUtils.isBlank(xmlString)){
+					logger.info("用户信息接口返回信息为空！" + xmlString);
+					continue;
+				}
+				xmlString = "<Records>" + xmlString + "</Records>";
+				
+				Document document = DocumentHelper.parseText(xmlString);
+				String itemXpath = "/Records/Record";	// 返回结果可能存在多条住院病人信息
+				XPath xpath = document.createXPath(itemXpath);
+				@SuppressWarnings("unchecked")
+				List<Node> nodeList = xpath.selectNodes(document, xpath);
+				if(CollectionUtils.isNotEmpty(nodeList)){
+					for(int i=1;i<=nodeList.size();i++){
+						String msgXpath = "/Records/Record[" + i + "]";
+						// 用户编码
+						String codingXpath = msgXpath + "/STAFF_CODE";
+						// 用户名称
+						String nameXpath = msgXpath + "/STAFF_NAME";
+						// 用户所属科室编码
+						String orgUnitCodingXpath = msgXpath + "/SUBOR_DEPT_ID";
+						
+						String coding = WebServiceClientHelper.processDataByXpath(document, codingXpath);
+						String name = WebServiceClientHelper.processDataByXpath(document, nameXpath);
+						String orgUnitCoding = WebServiceClientHelper.processDataByXpath(document, orgUnitCodingXpath);
+						UserVo userVo = new UserVo();
+						userVo.setCoding(coding);
+						userVo.setName(name);
+						userVo.setOrgUnitCoding(orgUnitCoding);
+						
+						//如果人员工号或名称为空,则忽略该条数据
+						if(StringUtils.isBlank(userVo.getName()) || StringUtils.isBlank(userVo.getCoding())){
+							continue;
+						}
+						userVoList.add(userVo);
 					}
-					userVoList.add(userVo);
 				}
-				userVoArray = new UserVo[nodeList.size()];
-				userVoList.toArray(userVoArray);
-			}else{
-				throw new RuntimeException("未找到人员数据...");
 			}
+			userVoArray = new UserVo[userVoList.size()];
+			userVoList.toArray(userVoArray);
 		}catch(Exception e){
 			ByteArrayOutputStream baos = new ByteArrayOutputStream();		
 			e.printStackTrace(new PrintStream(baos));
@@ -141,7 +169,35 @@
 			String encodingStyle = "utf-8";
 			String result = WebServiceClientHelper.axisInvokeWebservice(endpoint, targetNamespace, soapActionURI, method, paramName, input, encodingStyle);
 			logger.info("科室信息接口返回信息：" + result);
-			/*String result = "<Records>"
+			// <TotalPage>4062</TotalPage>
+			// 接口限制每次最多只能查询100条记录；所以需要根据页码循环同步接口
+			int pageSizeStartIndex = result.indexOf("<TotalPage>");
+			if(pageSizeStartIndex == -1){
+				logger.info("科室信息接口返回信息没有<TotalPage>标签！");
+				return null;
+			}
+			int pageSizeEndIndex = result.indexOf("</TotalPage>");
+			if(pageSizeEndIndex == -1 || pageSizeEndIndex < pageSizeStartIndex){
+				logger.info("科室信息接口返回信息没有</TotalPage>标签");
+				return null;
+			}
+			String pageSize = result.substring(pageSizeStartIndex + "<TotalPage>".length(), pageSizeEndIndex);
+			int size = Integer.parseInt(pageSize);
+			if(size <= 0){
+				logger.info("科室信息接口查询结果总页数为0");
+				return null;
+			}
+			logger.info("科室信息接口查询结果总页数为:" + size);
+			for (int j=0; j<size; j++) {
+
+				StringBuffer inputSb = new StringBuffer();
+				inputSb.append("<QUERY_TYPE>2</QUERY_TYPE>");
+				inputSb.append("<PAGE_NUMBER>" + j + "</PAGE_NUMBER>");
+				inputSb.append("<PAGE_SIZE>100</PAGE_SIZE>");
+				inputSb.append("<UPDATE_DATE></UPDATE_DATE>");
+				inputSb.append("<BUSINESS_ID></BUSINESS_ID>");
+				result = WebServiceClientHelper.axisInvokeWebservice(endpoint, targetNamespace, soapActionURI, method, paramName, inputSb.toString(), encodingStyle);
+				/*String result = "<Records>"
 					+ "<Record>"
 					+ "<DEPT_NAME>测试科室003</DEPT_NAME>"
 					+ "<DEPT_CODE>CSKS003</DEPT_CODE>"
@@ -153,61 +209,60 @@
 					+ "<SUBOR_DEPT_ID>0</SUBOR_DEPT_ID>"
 					+ "</Record>"
 					+ "</Records>";*/
-			//由于返回的xml数据格式可能有问题导致解析有点问题,现换成为文本方案截取
-			int startIndex = result.indexOf("<Records>");
-			if(startIndex == -1){
-				logger.info("科室信息接口返回信息没有<return>标签！");
-				return null;
-			}
-			int endIndex = result.indexOf("</Records>");
-			if(endIndex == -1 || endIndex < startIndex){
-				logger.info("科室信息接口返回信息没有</Records>标签");
-				return null;
-			}
-			String xmlString = result.substring(startIndex + "<Records>".length(), endIndex);
-			if(StringUtils.isBlank(xmlString)){
-				logger.info("科室信息接口返回信息为空！" + xmlString);
-				return null;
-			}
-			xmlString = "<Records>" + xmlString + "</Records>";
-			Document document = DocumentHelper.parseText(xmlString);
-			String itemXpath = "/Records/Record";	// 返回结果可能存在多条住院病人信息
-			XPath xpath = document.createXPath(itemXpath);
-			@SuppressWarnings("unchecked")
-			List<Node> nodeList = xpath.selectNodes(document, xpath);
-			if(CollectionUtils.isNotEmpty(nodeList)){
-				for(int i=1;i<=nodeList.size();i++){
-					String msgXpath = "/Records/Record[" + i + "]";
-					// 科室编码
-					String codingXpath = msgXpath + "/DEPT_CODE";
-					// 科室名称
-					String nameXpath = msgXpath + "/DEPT_NAME";
-					// 上级科室编码
-					String orgUnitCodingXpath = msgXpath + "/SUBOR_DEPT_ID";
-					
-					String coding = WebServiceClientHelper.processDataByXpath(document, codingXpath);
-					String name = WebServiceClientHelper.processDataByXpath(document, nameXpath);
-					String orgUnitCoding = WebServiceClientHelper.processDataByXpath(document, orgUnitCodingXpath);
-					OrgUnitVo orgVo = new OrgUnitVo();
-					orgVo.setCoding(coding );
-					orgVo.setName(name);
-					orgVo.setParentCoding(orgUnitCoding);
-					
-					//科室编码与上级科室编码相同时,默认其上级科室编码为空
-					if(StringUtils.equals(orgVo.getCoding(), orgVo.getParentCoding())){
-						orgVo.setParentCoding(null);
+				//由于返回的xml数据格式可能有问题导致解析有点问题,现换成为文本方案截取
+				int startIndex = result.indexOf("<Records>");
+				if(startIndex == -1){
+					logger.info("科室信息接口返回信息没有<return>标签！");
+					continue;
+				}
+				int endIndex = result.indexOf("</Records>");
+				if(endIndex == -1 || endIndex < startIndex){
+					logger.info("科室信息接口返回信息没有</Records>标签");
+					continue;
+				}
+				String xmlString = result.substring(startIndex + "<Records>".length(), endIndex);
+				if(StringUtils.isBlank(xmlString)){
+					logger.info("科室信息接口返回信息为空！" + xmlString);
+					continue;
+				}
+				xmlString = "<Records>" + xmlString + "</Records>";
+				Document document = DocumentHelper.parseText(xmlString);
+				String itemXpath = "/Records/Record";	// 返回结果可能存在多条住院病人信息
+				XPath xpath = document.createXPath(itemXpath);
+				@SuppressWarnings("unchecked")
+				List<Node> nodeList = xpath.selectNodes(document, xpath);
+				if(CollectionUtils.isNotEmpty(nodeList)){
+					for(int i=1;i<=nodeList.size();i++){
+						String msgXpath = "/Records/Record[" + i + "]";
+						// 科室编码
+						String codingXpath = msgXpath + "/DEPT_CODE";
+						// 科室名称
+						String nameXpath = msgXpath + "/DEPT_NAME";
+						// 上级科室编码
+						String orgUnitCodingXpath = msgXpath + "/SUBOR_DEPT_ID";
+
+						String coding = WebServiceClientHelper.processDataByXpath(document, codingXpath);
+						String name = WebServiceClientHelper.processDataByXpath(document, nameXpath);
+						String orgUnitCoding = WebServiceClientHelper.processDataByXpath(document, orgUnitCodingXpath);
+						OrgUnitVo orgVo = new OrgUnitVo();
+						orgVo.setCoding(coding );
+						orgVo.setName(name);
+						orgVo.setParentCoding(orgUnitCoding);
+
+						//科室编码与上级科室编码相同时,默认其上级科室编码为空
+						if(StringUtils.equals(orgVo.getCoding(), orgVo.getParentCoding())){
+							orgVo.setParentCoding(null);
+						}
+						//如果科室编码或名称为空,则忽略该条数据
+						if(StringUtils.isBlank(orgVo.getCoding()) || StringUtils.isBlank(orgVo.getName())){
+							continue;
+						}
+						orgUnitVoList.add(orgVo);
 					}
-					//如果科室编码或名称为空,则忽略该条数据
-					if(StringUtils.isBlank(orgVo.getCoding()) || StringUtils.isBlank(orgVo.getName())){
-						continue;
-					}
-					orgUnitVoList.add(orgVo);
 				}
-				orgUnitVoArray = new OrgUnitVo[nodeList.size()];
-				orgUnitVoList.toArray(orgUnitVoArray);
-			}else{
-				throw new RuntimeException("未找到科室数据...");
 			}
+			orgUnitVoArray = new OrgUnitVo[orgUnitVoList.size()];
+			orgUnitVoList.toArray(orgUnitVoArray);
 		}catch(Exception e){
 			ByteArrayOutputStream baos = new ByteArrayOutputStream();		
 			e.printStackTrace(new PrintStream(baos));