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 c4044ee..cd46508 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
@@ -166,9 +166,37 @@ public class BookbuildingController extends BaseController{
     @RequestMapping(value = "/queryChanJianReport", method = RequestMethod.GET)
     @ResponseBody
     @TokenRequired
-    public BaseObjectResponse queryChanJianReport(HttpServletRequest request){
+    public BaseObjectResponse queryChanJianReport(HttpServletRequest request,
+                                                  @RequestParam(required = false) String exDateStart,
+                                                  @RequestParam(required = false) String exDateEnd,
+                                                  @RequestParam(required = false) String name,
+                                                  @RequestParam(required = false) Integer weekStarts,
+                                                  @RequestParam(required = false) Integer weekEnds,
+                                                  @RequestParam(required = false) String hbsab,
+                                                  @RequestParam(required = false) String hbeag,
+                                                  @RequestParam(required = false) String hbeab,
+                                                  @RequestParam(required = false) String hbcab,
+                                                  @RequestParam(required = false) String syphilis,
+                                                  @RequestParam(required = false) String hiv,
+                                                  @RequestParam(required = false) String hcv,
+                                                  @RequestParam(required = false) String doctorNo
+                                                  ){
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
-        BaseObjectResponse objectResponse = bookbuildingFacade.queryChanJianReport(loginState.getId());
+        BaseObjectResponse objectResponse = bookbuildingFacade.queryChanJianReport(loginState.getId(),
+                exDateStart,
+                exDateEnd,
+                name,
+                 weekStarts,
+                weekEnds,
+                hbsab,
+                 hbeag,
+                hbeab,
+                hbcab,
+                syphilis,
+                hiv,
+                hcv,
+                doctorNo
+        );
         return objectResponse;
     }
 }
\ No newline at end of file
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 040a4fb..a3a15fc 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
@@ -1049,14 +1049,26 @@ public class BookbuildingFacade {
 		return objectResponse;
 	}
 
-	public BaseObjectResponse queryChanJianReport(Integer userId) {
+	public BaseObjectResponse queryChanJianReport(Integer userId, String exDateStart,
+												  String exDateEnd,
+												  String name,
+												  Integer weekStarts,
+												  Integer weekEnds,
+												  String hbsag,
+												  String hbeag,
+												  String hbeab,
+												  String hbcab,
+												  String syphilis,
+												  String hiv,
+												  String hcv,
+												  String doctorNo) {
 
 		String hospitalId = autoMatchFacade.getHospitalId(userId);
 		String sql = "SELECT A.EXAMINE_DATE,\n" +
 				"       A.NAME,\n" +
 				"       A.AGE,\n" +
 				"       A.NOW_WEEKS,\n" +
-				"       A.NOW_WEEKS_DAY,\n" +
+				"       A.NOW_WEEKS_DAY, \n" +
 				"       B.EDD_DATE,\n" +
 				"       A.HBSAG,\n" +
 				"       A.HBSAB,\n" +
@@ -1075,11 +1087,81 @@ public class BookbuildingFacade {
 				"       DECODE(B.IS_VIP_ID,1,'增值服务','标准服务') AS SERVICE_STATUS,\n" +
 				"       A.SUGGESTION,\n" +
 				"       B.TEL_NO,\n" +
-				"       B.HOME_ADDR\n" +
-				" FROM ODS_F_AUXILIARY_EXAMI A\n" +
-				" INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.RECORD_ID=B.RECORD_ID\n" +
-				" INNER JOIN ODS_D_HOSPITAL C ON A.HOSPITAL_NO=C.HOSPITAL_NO\n" +
-				" WHERE C.YCY_STSTEM_ID= '"+hospitalId+"'";
+				"       B.HOME_ADDR,\n" +
+				"       B.STREET_VALLAGE_ID,\n" +
+				"       B.STREET_VALLAGE,\n" +
+				"       B.AREA_COUNTY_ID,\n" +
+				"       B.AREA_COUNTY,\n" +
+				"       B.CITY_ID,\n" +
+				"       B.CITY,\n" +
+				"       B.PROVINCE_ID,\n" +
+				"       B.PROVINCE\n" +
+				"FROM ODS_F_AUXILIARY_EXAMI A\n" +
+				"INNER JOIN ODS_F_GRAVIDA_RECORD B ON A.RECORD_ID=B.RECORD_ID\n" +
+				"INNER JOIN ODS_D_HOSPITAL C ON A.HOSPITAL_NO=C.HOSPITAL_NO AND C.VER_NO=2\n" +
+				"WHERE C.YCY_STSTEM_ID= '"+hospitalId +"'";
+				if (StringUtils.isNotEmpty(exDateStart))
+				{
+					sql += " AND A.EXAMINE_DATE>= to_date('"+exDateStart+"','yyyy-MM-dd')";
+				}
+				if (StringUtils.isNotEmpty(exDateEnd))
+				{
+					sql += " AND A.EXAMINE_DATE <= to_date('"+exDateEnd+"','yyyy-MM-dd')";
+				}
+
+				if (StringUtils.isNotEmpty(name))
+				{
+					sql += " AND A.NAME  LIKE '%"+name+"%'";
+				}
+
+				if (weekStarts != null)
+				{
+					sql += " AND A.NOW_WEEKS>= "+weekStarts;
+				}
+
+				if (weekEnds != null)
+				{
+					sql += " AND A.NOW_WEEKS>= "+weekEnds;
+				}
+
+				if (StringUtils.isNotEmpty(hbsag))
+				{
+					sql += " AND A.HBSAG = "+hbsag;
+				}
+
+				if (StringUtils.isNotEmpty(hbeag))
+				{
+					sql += " AND A.HBEAG = "+hbeag;
+				}
+
+				if (StringUtils.isNotEmpty(hbeab))
+				{
+					sql += " AND A.HBEAB = "+hbeab;
+				}
+
+				if (StringUtils.isNotEmpty(hbcab))
+				{
+					sql += " AND A.HBCAB = "+hbcab;
+				}
+				if (StringUtils.isNotEmpty(syphilis))
+				{
+					sql += " AND A.SYPHILIS = "+syphilis;
+				}
+
+				if (StringUtils.isNotEmpty(hiv))
+				{
+					sql += " AND A.HIV = "+hiv;
+				}
+
+				if (StringUtils.isNotEmpty(hcv))
+				{
+					sql += " AND A.HCV = "+hcv;
+				}
+		        if (StringUtils.isNotEmpty(doctorNo))
+				{
+					sql += " AND A.DOCTOR_NO = "+doctorNo;
+				}
+
 		List<Map<String,Object>> list = JdbcUtil.getListDataBySql(sql);
 		BaseObjectResponse objectResponse = new BaseObjectResponse();
 		objectResponse.setData(list);