diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
index 69a135f..02f9b0d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/AntenatalExaminationController.java
@@ -14,12 +14,16 @@ import com.lyms.platform.common.base.LoginContext;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.result.BaseListResponse;
 import com.lyms.platform.common.result.BaseResponse;
+import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.PropertiesUtils;
 import com.lyms.platform.operate.web.facade.AntExRecordFacade;
 import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade;
 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
 import com.lyms.platform.operate.web.request.*;
+import com.lyms.platform.permission.model.Organization;
 import com.lyms.platform.permission.service.CouponService;
+import com.lyms.platform.permission.service.OrganizationService;
+import com.lyms.platform.permission.service.UsersService;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -32,6 +36,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import java.awt.*;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -256,6 +261,10 @@ public class AntenatalExaminationController extends BaseController {
         return antenatalExaminationFacade.findAntExListTwo(exListQueryRequest, loginState.getId());
     }
 
+
+    @Autowired
+    private OrganizationService organizationService;
+
     /**
      * 产检管理接口
      *
@@ -265,6 +274,17 @@ public class AntenatalExaminationController extends BaseController {
     @ResponseBody
     @TokenRequired
     public BaseResponse findAntEx(@Valid AntExManagerQueryRequest antExManagerQueryRequest, HttpServletRequest request) {
+
+        /**
+         * 唐山零时限制
+         */
+        Organization organization = organizationService.getOrganization(usersService.getUsers(((LoginContext) request.getAttribute("loginContext")).getId()).getOrgId());
+        if ("4".equals(organization.getCityId()))
+        {
+            String date = DateUtil.getyyyy_MM_dd(DateUtil.addMonth(new Date(), -3))+" - "+DateUtil.getyyyy_MM_dd(new Date());
+            antExManagerQueryRequest.setcTime(date);
+        }
+
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
         return antExRecordFacade.findList(antExManagerQueryRequest, loginState.getId(), false, "true",antExManagerQueryRequest.isCurrent());
     }
@@ -296,7 +316,8 @@ public class AntenatalExaminationController extends BaseController {
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
         antExRecordFacade.exportFindAntEx(antExManagerQueryRequest, loginState.getId(), false, httpServletResponse);
     }
-
+    @Autowired
+    private UsersService usersService;
 
     /**
      * 产检区域管理接口
@@ -307,6 +328,16 @@ public class AntenatalExaminationController extends BaseController {
     @ResponseBody
     @TokenRequired
     public BaseResponse findRegionAntEx(@Valid AntExManagerQueryRequest antExManagerQueryRequest, HttpServletRequest request) {
+
+        /**
+         * 唐山零时限制
+         */
+        Organization organization = organizationService.getOrganization(usersService.getUsers(((LoginContext) request.getAttribute("loginContext")).getId()).getOrgId());
+        if ("4".equals(organization.getCityId()))
+        {
+            String date = DateUtil.getyyyy_MM_dd(DateUtil.addMonth(new Date(), -3))+" - "+DateUtil.getyyyy_MM_dd(new Date());
+            antExManagerQueryRequest.setcTime(date);
+        }
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
         return antExRecordFacade.findList(antExManagerQueryRequest, loginState.getId(), true, "true",antExManagerQueryRequest.isCurrent());
     }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
index 0e5a0a1..25f2831 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PuerperaManageController.java
@@ -11,10 +11,7 @@ import com.lyms.platform.common.enums.ServiceTypeEnums;
 import com.lyms.platform.common.result.BaseListResponse;
 import com.lyms.platform.common.result.BaseObjectResponse;
 import com.lyms.platform.common.result.BaseResponse;
-import com.lyms.platform.common.utils.BeanUtils;
-import com.lyms.platform.common.utils.ExcelUtil;
-import com.lyms.platform.common.utils.ExceptionUtils;
-import com.lyms.platform.common.utils.SystemConfig;
+import com.lyms.platform.common.utils.*;
 import com.lyms.platform.operate.web.facade.AntenatalExaminationFacade;
 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
 import com.lyms.platform.operate.web.facade.BasicConfigFacade;
@@ -25,6 +22,9 @@ import com.lyms.platform.operate.web.result.HealthHandbookExcelModel;
 import com.lyms.platform.operate.web.result.PatientManagerQueryModel;
 import com.lyms.platform.operate.web.result.PatientManagerResult;
 import com.lyms.platform.operate.web.service.RareBloodGroupService;
+import com.lyms.platform.permission.model.Organization;
+import com.lyms.platform.permission.service.OrganizationService;
+import com.lyms.platform.permission.service.UsersService;
 import com.lyms.platform.pojo.RareBloodGroupModel;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
@@ -131,6 +131,9 @@ public class PuerperaManageController extends BaseController {
         return baseResponse;
     }
 
+
+
+
     /**
      * 全部孕妇管理
      *
@@ -142,6 +145,16 @@ public class PuerperaManageController extends BaseController {
     @TokenRequired
     public BaseResponse queryAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) {
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        /**
+         * 唐山零时限制
+         */
+        Organization organization = organizationService.getOrganization(usersService.getUsers(((LoginContext) request.getAttribute("loginContext")).getId()).getOrgId());
+        if ("4".equals(organization.getCityId()))
+        {
+            String date = DateUtil.getyyyy_MM_dd(DateUtil.addMonth(new Date(), -3))+" - "+DateUtil.getyyyy_MM_dd(new Date());
+            patientsQueryRequest.setBuildTime(date);
+        }
+
         return patientFacade.queryHighRisk(patientsQueryRequest, null, 1, loginState.getId(), "true", Boolean.FALSE);
     }
 
@@ -510,9 +523,26 @@ public class PuerperaManageController extends BaseController {
     @TokenRequired
     public BaseResponse queryRegionAllPuerpera(@Valid RiskPatientsQueryRequest patientsQueryRequest, HttpServletRequest request) {
         LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+
+        /**
+         * 唐山零时限制
+         */
+        Organization organization = organizationService.getOrganization(usersService.getUsers(((LoginContext) request.getAttribute("loginContext")).getId()).getOrgId());
+        if ("4".equals(organization.getCityId()))
+        {
+            String date = DateUtil.getyyyy_MM_dd(DateUtil.addMonth(new Date(), -3))+" - "+DateUtil.getyyyy_MM_dd(new Date());
+            patientsQueryRequest.setBuildTime(date);
+        }
+
+
         return patientFacade.queryHighRisk(patientsQueryRequest, null, 1, loginState.getId(), "true", Boolean.TRUE);
     }
 
+    @Autowired
+    private OrganizationService organizationService;
+
+    @Autowired
+    private UsersService usersService;
     /**
      * @auther HuJiaqi
      * @createTime 2016年12月20日 15时03分
@@ -524,6 +554,17 @@ public class PuerperaManageController extends BaseController {
     public BaseListResponse patientManager(@RequestBody PatientManagerRequest patientManagerRequest, HttpServletRequest httpServletRequest) {
         BaseListResponse baseListResponse;
         try {
+
+            /**
+             * 唐山零时限制
+             */
+            Organization organization = organizationService.getOrganization(usersService.getUsers(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId()).getOrgId());
+            if ("4".equals(organization.getCityId()))
+            {
+                String date = DateUtil.getyyyy_MM_dd(DateUtil.addMonth(new Date(),-3))+" - "+DateUtil.getyyyy_MM_dd(new Date());
+                patientManagerRequest.setBookBuildingDate(date);
+            }
+
             patientManagerRequest.setOperatorId(((LoginContext) httpServletRequest.getAttribute("loginContext")).getId());
 //            PatientManagerResult patientManagerResult = patientFacade.patientManager(patientManagerRequest);
             PatientManagerResult patientManagerResult = patientFacade.patientManager(patientManagerRequest);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
index 2ee7357..b4d8a23 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
@@ -1289,7 +1289,7 @@ public class BabyBookbuildingFacade {
         bm.setmHighRiskReason(b.getmHighRiskReason());
         bm.setYn(YnEnums.YES.getId());
 
-        bm.setHighRiskInfo(b.getHighRiskInfo());
+        bm.setHighRiskInfo(CollectionUtils.isNotEmpty(b.getHighRiskInfo()) ? b.getHighRiskInfo() :  null);
         bm.setWeakSon(b.getWeakSon());
         bm.setWeakSonInfo(b.getWeakSonInfo());