diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FolviteRecordQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FolviteRecordQuery.java
index c32b3bd..c2b646b 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FolviteRecordQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/FolviteRecordQuery.java
@@ -34,6 +34,16 @@ public class FolviteRecordQuery extends BaseQuery {
 
     private Integer yn;
 
+    private  String hospitalId;
+
+    public String getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(String hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+
     public Integer getYn() {
         return yn;
     }
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
index 943b88e..996cb2a 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/FolviteReceiveMapper.xml
@@ -79,6 +79,9 @@ yn
             <if test="isconceive != null">
                 and f.isconceive=#{isconceive}
             </if>
+           <if test="hospitalId != null">
+                and f.hospitalId=#{hospitalId}
+            </if>
 
             <if test="startReceiveDate != null ">
                 AND  <![CDATA[ p.receive_date >= date_format(#{startReceiveDate},'%Y-%m-%d %H:%i:%S')  ]]>
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java
index 19c68ff..60c2c29 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/FolviteController.java
@@ -128,11 +128,15 @@ public class FolviteController extends BaseController {
                                          @Param("isconceive") Integer isconceive,
                                          @Param("receiveTime") String receiveTime,
                                          @Param("drawTime") String drawTime,
+                                         @Param("hospitalId") String hospitalId,
                                          @Param("page") Integer page,
                                          @Param("limit") Integer limit) {
 
         FolviteRecordQuery query = new FolviteRecordQuery();
         query.setYn(YnEnums.YES.getId());
+        if (StringUtils.isNotEmpty(hospitalId)) {
+            query.setHospitalId(hospitalId);
+        }
         if (null != isconceive) {
             query.setIsconceive(isconceive);
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
index 0652fa3..41fa6f3 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java
@@ -2616,7 +2616,7 @@ public class MatDeliverFacade {
 
                     String handDueWeek =  "";
                     Map<String, Object> handDueWeekMap = maternalDeliverModel.getHandDueWeek();
-                    if (handDueWeekMap != null && handDueWeekMap.size() > 0)
+                    if (handDueWeekMap != null && handDueWeekMap.size() > 0 && handDueWeekMap.get("week") != null && com.lyms.platform.common.utils.StringUtils.isNotEmpty(String.valueOf(handDueWeekMap.get("week"))))
                     {
                         handDueWeek = String.valueOf(handDueWeekMap.get("week"))+"孕周"+((handDueWeekMap.get("day") == null || String.valueOf(handDueWeekMap.get("day")).equals("0"))  ? "" : String.valueOf(handDueWeekMap.get("day"))+"天" );
                     }