From de9ea6fd853b6c97cd6534354ed51d4c18036805 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Sat, 8 Oct 2016 20:20:51 +0800
Subject: [PATCH] code update

---
 .../operate/web/controller/BookbuildingController.java   |  9 +++++++--
 .../platform/operate/web/facade/BookbuildingFacade.java  | 16 ++++++++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java
index cd46508..9fbeea5 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/BookbuildingController.java
@@ -179,7 +179,9 @@ public class BookbuildingController extends BaseController{
                                                   @RequestParam(required = false) String syphilis,
                                                   @RequestParam(required = false) String hiv,
                                                   @RequestParam(required = false) String hcv,
-                                                  @RequestParam(required = false) String doctorNo
+                                                  @RequestParam(required = false) String doctorNo,
+                                                  @RequestParam(required = false) Integer page,
+                                                  @RequestParam(required = false) Integer limit
                                                   ){
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
         BaseObjectResponse objectResponse = bookbuildingFacade.queryChanJianReport(loginState.getId(),
@@ -195,7 +197,10 @@ public class BookbuildingController extends BaseController{
                 syphilis,
                 hiv,
                 hcv,
-                doctorNo
+                doctorNo,
+                page,
+                limit
+
         );
         return objectResponse;
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
index a3a15fc..75ad9a1 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
@@ -1061,10 +1061,21 @@ public class BookbuildingFacade {
 												  String syphilis,
 												  String hiv,
 												  String hcv,
-												  String doctorNo) {
+												  String doctorNo,
+												  Integer page,
+												  Integer limit) {
 
 		String hospitalId = autoMatchFacade.getHospitalId(userId);
-		String sql = "SELECT A.EXAMINE_DATE,\n" +
+
+		int start = 0;
+		int end = 1000;
+		if (page != null && limit != null)
+		{
+			start = (page -1) * limit+1;
+			end = page*limit;
+		}
+
+		String sql = "SELECT * FROM ( SELECT A.*, ROWNUM RN FROM ( SELECT A.EXAMINE_DATE,\n" +
 				"       A.NAME,\n" +
 				"       A.AGE,\n" +
 				"       A.NOW_WEEKS,\n" +
@@ -1161,6 +1172,7 @@ public class BookbuildingFacade {
 				{
 					sql += " AND A.DOCTOR_NO = "+doctorNo;
 				}
+		        sql+=" ) A WHERE ROWNUM <= "+end+" ) WHERE RN >=  "+start;
 
 		List<Map<String,Object>> list = JdbcUtil.getListDataBySql(sql);
 		BaseObjectResponse objectResponse = new BaseObjectResponse();
-- 
1.8.3.1