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 46d4ffd..3c32965 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
@@ -114,7 +114,7 @@ public class BookbuildingFacade {
 		if (yunRequest.getPregnantCertificateNum() != null)
 		{
 			patientsQuery.setCardNo(yunRequest.getPregnantCertificateNum());
-            //判断该身份证号码是否有孕妇建档 在该医院
+			//判断该身份证号码是否有孕妇建档 在该医院
 			List<Patients> patients =  yunBookbuildingService.queryPregnantWithQuery(patientsQuery);
 			if (CollectionUtils.isNotEmpty(patients))
 			{
@@ -159,7 +159,7 @@ public class BookbuildingFacade {
 		Date date = null;
 		if (yunRequest.getLastMenstrualPeriod()  != null)
 		{
-			 date = DateUtil.addWeek(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()),42);
+			date = DateUtil.addWeek(DateUtil.parseYMD(yunRequest.getLastMenstrualPeriod()),42);
 			Date currentDate = DateUtil.formatDate(new Date());
 			if (date.getTime() <= currentDate.getTime())
 			{
@@ -238,7 +238,7 @@ public class BookbuildingFacade {
 
 		if (type == ServiceObjEnums.YUNOBJ.getId())
 		{
-            //生成建档短信
+			//生成建档短信
 			createBuildSms(p);
 		}
 
@@ -246,7 +246,7 @@ public class BookbuildingFacade {
 		br.setErrormsg("成功");
 		br.setData(p.getId());
 		return br;
-		
+
 	}
 
 	/**
@@ -311,7 +311,7 @@ public class BookbuildingFacade {
 						sendList.add(temp);
 					}
 				}
-                 else if (temp.getServiceType() == ServiceTypeEnums.ALL_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId())
+				else if (temp.getServiceType() == ServiceTypeEnums.ALL_SERVICE.getId() && temp.getServiceStatus() == ServiceStatusEnums.ALL.getId())
 				{
 					sendList.add(temp);
 				}
@@ -320,7 +320,7 @@ public class BookbuildingFacade {
 			if (CollectionUtils.isNotEmpty(sendList))
 			{
 
-                //短信前缀
+				//短信前缀
 				String  messagePrefix = smsConfigFacade.getSmsPrefix(configModel, patient.getBookbuildingDoctor());
 				for (SmsTemplateModel templateModel : sendList)
 				{
@@ -477,7 +477,7 @@ public class BookbuildingFacade {
 			personService.updatePerson(pmodel, yunRequest.getPid());
 		}
 		patient.setId(id);
-        //加入产筛
+		//加入产筛
 		patientsService.validata(patient);
 
 
@@ -525,7 +525,7 @@ public class BookbuildingFacade {
 		if (!StringUtils.isEmpty(bookbuildingQueryRequest.getCardNo()))
 		{
 			patientsQuery.setCardNo(bookbuildingQueryRequest.getCardNo());
-			 patients =  yunBookbuildingService.queryPregnantWithQuery(patientsQuery,"bookbuildingDate", Sort.Direction.DESC);
+			patients =  yunBookbuildingService.queryPregnantWithQuery(patientsQuery,"bookbuildingDate", Sort.Direction.DESC);
 		}
 		//否则用就诊卡号 查询到这个孕妇的身份证号码 再用身份证号码查询该孕妇的所有建档 包括产妇记录
 		else if (!StringUtils.isEmpty(bookbuildingQueryRequest.getVcCardNo()))
@@ -944,7 +944,7 @@ public class BookbuildingFacade {
 		AntExChuQuery antExChuQuery = new AntExChuQuery();
 		antExChuQuery.setParentId(id);
 		antExChuQuery.setYn(YnEnums.YES.getId());
-        //获取初诊记录
+		//获取初诊记录
 		List<AntExChuModel> antExChulist = antenatalExaminationService.queryAntExChu(antExChuQuery);
 		String hospital = autoMatchFacade.getHospitalId(userId);
 		Patients patients = yunBookbuildingService.findOneById(id);
@@ -1056,20 +1056,20 @@ public class BookbuildingFacade {
 	}
 
 	public BaseListResponse 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,
-												  Integer page,
-												  Integer limit) {
+												String exDateEnd,
+												String name,
+												Integer weekStarts,
+												Integer weekEnds,
+												String hbsag,
+												String hbeag,
+												String hbeab,
+												String hbcab,
+												String syphilis,
+												String hiv,
+												String hcv,
+												String doctorNo,
+												Integer page,
+												Integer limit) {
 
 		String hospitalId = autoMatchFacade.getHospitalId(userId);
 
@@ -1123,82 +1123,82 @@ public class BookbuildingFacade {
 				" 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')";
-					countSql += " 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')";
-					countSql += " AND A.EXAMINE_DATE <= to_date('"+exDateEnd+"','yyyy-MM-dd')";
-				}
+		if (StringUtils.isNotEmpty(exDateStart))
+		{
+			sql += " AND A.EXAMINE_DATE>= to_date('"+exDateStart+"','yyyy-MM-dd')";
+			countSql += " 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')";
+			countSql += " AND A.EXAMINE_DATE <= to_date('"+exDateEnd+"','yyyy-MM-dd')";
+		}
 
-				if (StringUtils.isNotEmpty(name))
-				{
-					sql += " AND A.NAME  LIKE '%"+name+"%'";
-					countSql += " AND A.NAME  LIKE '%"+name+"%'";
-				}
+		if (StringUtils.isNotEmpty(name))
+		{
+			sql += " AND A.NAME  LIKE '%"+name+"%'";
+			countSql += " AND A.NAME  LIKE '%"+name+"%'";
+		}
 
-				if (weekStarts != null)
-				{
-					sql += " AND A.NOW_WEEKS>= "+weekStarts;
-					countSql += " AND A.NOW_WEEKS>= "+weekStarts;
-				}
+		if (weekStarts != null)
+		{
+			sql += " AND A.NOW_WEEKS>= "+weekStarts;
+			countSql += " AND A.NOW_WEEKS>= "+weekStarts;
+		}
 
-				if (weekEnds != null)
-				{
-					sql += " AND A.NOW_WEEKS <= "+weekEnds;
-					countSql += " AND A.NOW_WEEKS <= "+weekEnds;
-				}
+		if (weekEnds != null)
+		{
+			sql += " AND A.NOW_WEEKS <= "+weekEnds;
+			countSql += " AND A.NOW_WEEKS <= "+weekEnds;
+		}
 
-				if (StringUtils.isNotEmpty(hbsag))
-				{
-					sql += " AND A.HBSAG = "+hbsag;
-					countSql += " AND A.HBSAG = "+hbsag;
-				}
+		if (StringUtils.isNotEmpty(hbsag))
+		{
+			sql += " AND A.HBSAG = "+hbsag;
+			countSql += " AND A.HBSAG = "+hbsag;
+		}
 
-				if (StringUtils.isNotEmpty(hbeag))
-				{
-					sql += " AND A.HBEAG = "+hbeag;
-					countSql += " AND A.HBEAG = "+hbeag;
-				}
+		if (StringUtils.isNotEmpty(hbeag))
+		{
+			sql += " AND A.HBEAG = "+hbeag;
+			countSql += " AND A.HBEAG = "+hbeag;
+		}
 
-				if (StringUtils.isNotEmpty(hbeab))
-				{
-					sql += " AND A.HBEAB = "+hbeab;
-					countSql += " AND A.HBEAB = "+hbeab;
-				}
+		if (StringUtils.isNotEmpty(hbeab))
+		{
+			sql += " AND A.HBEAB = "+hbeab;
+			countSql += " AND A.HBEAB = "+hbeab;
+		}
 
-				if (StringUtils.isNotEmpty(hbcab))
-				{
-					sql += " AND A.HBCAB = "+hbcab;
-					countSql += " AND A.HBCAB = "+hbcab;
-				}
-				if (StringUtils.isNotEmpty(syphilis))
-				{
-					sql += " AND A.SYPHILIS = "+syphilis;
-					countSql += " AND A.SYPHILIS = "+syphilis;
-				}
+		if (StringUtils.isNotEmpty(hbcab))
+		{
+			sql += " AND A.HBCAB = "+hbcab;
+			countSql += " AND A.HBCAB = "+hbcab;
+		}
+		if (StringUtils.isNotEmpty(syphilis))
+		{
+			sql += " AND A.SYPHILIS = "+syphilis;
+			countSql += " AND A.SYPHILIS = "+syphilis;
+		}
 
-				if (StringUtils.isNotEmpty(hiv))
-				{
-					sql += " AND A.HIV = "+hiv;
-					countSql += " AND A.HIV = "+hiv;
-				}
+		if (StringUtils.isNotEmpty(hiv))
+		{
+			sql += " AND A.HIV = "+hiv;
+			countSql += " AND A.HIV = "+hiv;
+		}
 
-				if (StringUtils.isNotEmpty(hcv))
-				{
-					sql += " AND A.HCV = "+hcv;
-					countSql += " AND A.HCV = "+hcv;
-				}
-		        if (StringUtils.isNotEmpty(doctorNo))
-				{
-					sql += " AND A.DOCTOR_NO = "+doctorNo;
-					countSql += " AND A.DOCTOR_NO = "+doctorNo;
-				}
+		if (StringUtils.isNotEmpty(hcv))
+		{
+			sql += " AND A.HCV = "+hcv;
+			countSql += " AND A.HCV = "+hcv;
+		}
+		if (StringUtils.isNotEmpty(doctorNo))
+		{
+			sql += " AND A.DOCTOR_NO = "+doctorNo;
+			countSql += " AND A.DOCTOR_NO = "+doctorNo;
+		}
 
-		        sql+="  order by A.EXAMINE_DATE DESC,A.Name ASC,A.EXAMINE_ID DESC ) A WHERE ROWNUM <= "+end+" ) WHERE RN >=  "+start;
+		sql+="  order by A.EXAMINE_DATE DESC,A.Name ASC,A.EXAMINE_ID DESC ) A WHERE ROWNUM <= "+end+" ) WHERE RN >=  "+start;
 
 		logger.info(sql);
 		List<Map<String,Object>> list = JdbcUtil.getListDataBySql(sql);