diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/changehospital/HighriskChangeHospitalService.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/changehospital/HighriskChangeHospitalService.java
index 87942a3..60b32f7 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/changehospital/HighriskChangeHospitalService.java
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/changehospital/HighriskChangeHospitalService.java
@@ -1,8 +1,8 @@
 package com.lyms.hospital.service.changehospital;
 
 import java.io.Serializable;
-import java.util.List;
 
+import com.baomidou.mybatisplus.plugins.Page;
 import com.lyms.hospital.entity.changehospital.HighriskChangeHospital;
 import com.lyms.web.service.BaseService;
 
@@ -58,7 +58,7 @@ public interface HighriskChangeHospitalService extends BaseService<HighriskChang
    * <li>修改人：
    * <li>修改时间：
    */
-  public List<HighriskChangeHospital> listOfIn(String orgId,Integer pageNo,Integer pageSize);
+  public Page<HighriskChangeHospital> pageOfIn(String orgId,Page<HighriskChangeHospital> page);
   
   /**
    * <li>@Description:查询“转出”列表
@@ -69,6 +69,7 @@ public interface HighriskChangeHospitalService extends BaseService<HighriskChang
    * <li>修改人：
    * <li>修改时间：
    */
-  public List<HighriskChangeHospital> listOfOut(String orgId,Integer pageNo,Integer pageSize);
+  public Page<HighriskChangeHospital> pageOfOut(String orgId,Page<HighriskChangeHospital> page);
+  
   
 }
diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/changehospital/impl/HighriskChangeHospitalServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/changehospital/impl/HighriskChangeHospitalServiceImpl.java
index 1a3ba52..b3934be 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/changehospital/impl/HighriskChangeHospitalServiceImpl.java
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/changehospital/impl/HighriskChangeHospitalServiceImpl.java
@@ -58,19 +58,20 @@ public class HighriskChangeHospitalServiceImpl extends ServiceImpl<HighriskChang
 	}
 
 	@Override
-	public List<HighriskChangeHospital> listOfIn(String orgId, Integer pageNo, Integer pageSize) {
-		return this.listOfInOrOut(orgId, "INTO_ORGID",pageNo,pageSize);
+	public Page<HighriskChangeHospital> pageOfIn(String orgId, Page<HighriskChangeHospital> page) {
+		return this.pageOfInOrOut(orgId, "INTO_ORGID",page);
 	}
 
 	@Override
-	public List<HighriskChangeHospital> listOfOut(String orgId, Integer pageNo, Integer pageSize) {
-		return this.listOfInOrOut(orgId, "OUT_ORGID",pageNo,pageSize);
+	public Page<HighriskChangeHospital> pageOfOut(String orgId, Page<HighriskChangeHospital> page) {
+		return this.pageOfInOrOut(orgId, "OUT_ORGID",page);
 	}
 
-	private List<HighriskChangeHospital> listOfInOrOut(String orgId, String flag, Integer pageNo, Integer pageSize) {
-		List<HighriskChangeHospital> list = baseMapper.selectPage(
-				new Page<HighriskChangeHospital>(pageNo==null?1:pageNo, pageSize==null?10:pageSize),
+	private Page<HighriskChangeHospital> pageOfInOrOut(String orgId, String flag, Page<HighriskChangeHospital> page) {
+		List<HighriskChangeHospital> list = baseMapper.selectPage(page,
 				new EntityWrapper<HighriskChangeHospital>().eq(flag, orgId).orderBy("CREATE_TIME", false));
-		return list;
+		page.setRecords(list);
+		return page;
 	}
+	
 }
diff --git a/parent/hospital.web/src/test/java/test/hospital/service/HighriskChangeHospitalTest.java b/parent/hospital.web/src/test/java/test/hospital/service/HighriskChangeHospitalTest.java
index 504be32..08038b5 100644
--- a/parent/hospital.web/src/test/java/test/hospital/service/HighriskChangeHospitalTest.java
+++ b/parent/hospital.web/src/test/java/test/hospital/service/HighriskChangeHospitalTest.java
@@ -1,10 +1,9 @@
 package test.hospital.service;
 
-import java.util.List;
-
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
+import com.baomidou.mybatisplus.plugins.Page;
 import com.lyms.hospital.entity.changehospital.HighriskChangeHospital;
 import com.lyms.hospital.service.changehospital.HighriskChangeHospitalService;
 
@@ -39,10 +38,8 @@ public class HighriskChangeHospitalTest extends BaseServiceTest {
 	
 	@Test
 	public void list(){
-		List<HighriskChangeHospital> list = service.listOfIn("1", 2, 3);
-		for(HighriskChangeHospital c : list){
-			System.out.println(c.getWomanId()+"-"+c.getCreateTime());
-		}
+		Page<HighriskChangeHospital> page = service.pageOfIn("1", new Page<HighriskChangeHospital>(2,3));
+		outJson(page);
 		/*
 			cs033012-Thu Mar 30 15:11:38 CST 2017
 			cs033017-Thu Mar 30 15:11:38 CST 2017
@@ -54,7 +51,60 @@ public class HighriskChangeHospitalTest extends BaseServiceTest {
 			cs033016-Thu Mar 30 15:11:38 CST 2017
 			cs033010-Thu Mar 30 15:11:37 CST 2017
 			cs033011-Thu Mar 30 15:11:37 CST 2017
+			
+			{
+			    "asc": true,
+			    "condition": {},
+			    "current": 2,
+			    "limit": 2147483647,
+			    "offset": 0,
+			    "offsetCurrent": 3,
+			    "optimizeCount": false,
+			    "pages": 10,
+			    "records": [
+			        {
+			            "applyDoctorid": "doctorID1",
+			            "changeway": "转院方式",
+			            "createId": "doctorID1",
+			            "createTime": 1490857898000,
+			            "description": "病情描述",
+			            "id": "7E24B219E8D0417582292C3AFFF8319E",
+			            "intoOrgid": "1",
+			            "outOrgid": "2",
+			            "status": 1,
+			            "womanId": "cs033018"
+			        },
+			        {
+			            "applyDoctorid": "doctorID1",
+			            "changeway": "转院方式",
+			            "createId": "doctorID1",
+			            "createTime": 1490857898000,
+			            "description": "病情描述",
+			            "id": "8C04A1E4D203482D8FEC1381EC4D1F12",
+			            "intoOrgid": "1",
+			            "outOrgid": "2",
+			            "status": 1,
+			            "womanId": "cs033019"
+			        },
+			        {
+			            "applyDoctorid": "doctorID1",
+			            "changeway": "转院方式",
+			            "createId": "doctorID1",
+			            "createTime": 1490857898000,
+			            "description": "病情描述",
+			            "id": "A9573F7251A849B5BCF34B50A3DE12A5",
+			            "intoOrgid": "1",
+			            "outOrgid": "2",
+			            "status": 1,
+			            "womanId": "cs033013"
+			        }
+			    ],
+			    "searchCount": true,
+			    "size": 3,
+			    "total": 30
+			}
 		 */
 	}
 
+
 }