diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IMatdeliverFollowModelDao.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IMatdeliverFollowModelDao.java
new file mode 100644
index 0000000..617847f
--- /dev/null
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/IMatdeliverFollowModelDao.java
@@ -0,0 +1,23 @@
+package com.lyms.platform.biz.dal;
+
+import com.lyms.platform.common.dao.operator.MongoQuery;
+import com.lyms.platform.common.dao.operator.Page;
+import com.lyms.platform.pojo.MatdeliverFollowModel;
+
+import java.util.List;
+
+public interface IMatdeliverFollowModelDao {
+    public MatdeliverFollowModel addMatdeliverFollowModel(MatdeliverFollowModel obj);
+
+    public void updateMatdeliverFollowModel(MatdeliverFollowModel obj, String id);
+
+    public void deleteMatdeliverFollowModel(String id);
+
+    public MatdeliverFollowModel getMatdeliverFollowModel(String id);
+
+    public int queryMatdeliverFollowModelCount(MongoQuery query);
+
+    public List<MatdeliverFollowModel> queryMatdeliverFollowModel(MongoQuery query);
+
+    public Page<MatdeliverFollowModel> findPage(MongoQuery query);
+}
\ No newline at end of file
diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/MatdeliverFollowModelDaoImpl.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/MatdeliverFollowModelDaoImpl.java
new file mode 100644
index 0000000..328260b
--- /dev/null
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/dal/impl/MatdeliverFollowModelDaoImpl.java
@@ -0,0 +1,44 @@
+package com.lyms.platform.biz.dal.impl;
+
+import com.lyms.platform.biz.dal.IMatdeliverFollowModelDao;
+import com.lyms.platform.common.dao.BaseMongoDAOImpl;
+import com.lyms.platform.common.dao.operator.MongoCondition;
+import com.lyms.platform.common.dao.operator.MongoOper;
+import com.lyms.platform.common.dao.operator.MongoQuery;
+import com.lyms.platform.common.dao.operator.Page;
+import com.lyms.platform.pojo.MatdeliverFollowModel;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+
+@Repository("matdeliverFollowModelDao")
+public class MatdeliverFollowModelDaoImpl extends BaseMongoDAOImpl<MatdeliverFollowModel> implements IMatdeliverFollowModelDao {
+    public MatdeliverFollowModel addMatdeliverFollowModel(MatdeliverFollowModel obj) {
+        return save(obj);
+    }
+
+    public void updateMatdeliverFollowModel(MatdeliverFollowModel obj, String id) {
+        update(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery(), obj);
+    }
+
+    public void deleteMatdeliverFollowModel(String id) {
+        delete(new MongoQuery(new MongoCondition("id", id, MongoOper.IS)).convertToMongoQuery());
+    }
+
+    public MatdeliverFollowModel getMatdeliverFollowModel(String id) {
+        return findById(id);
+    }
+
+    public int queryMatdeliverFollowModelCount(MongoQuery query) {
+        return (int) count(query.convertToMongoQuery());
+    }
+
+    public List<MatdeliverFollowModel> queryMatdeliverFollowModel(MongoQuery query) {
+        return find(query.convertToMongoQuery());
+    }
+
+    public Page<MatdeliverFollowModel> findPage(MongoQuery query) {
+        return findPage(query.convertToMongoQuery());
+    }
+}
diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MatDeliverFollowService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MatDeliverFollowService.java
new file mode 100644
index 0000000..e17b1dc
--- /dev/null
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/MatDeliverFollowService.java
@@ -0,0 +1,56 @@
+package com.lyms.platform.biz.service;
+
+import com.lyms.platform.biz.dal.IMatdeliverFollowModelDao;
+import com.lyms.platform.common.dao.operator.MongoQuery;
+import com.lyms.platform.pojo.MatdeliverFollowModel;
+import com.lyms.platform.query.MatDeliverFollowQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ *  产妇随访
+ */
+@Service
+public class MatDeliverFollowService {
+    @Autowired
+    private IMatdeliverFollowModelDao iMatdeliverFollowModelDao;
+
+    /**
+     *
+     * 增加一条随访记录
+     *
+     * @param deliverModel 产妇随访记录
+     *
+     * @return
+     */
+    public MatdeliverFollowModel addMatDeliverFollow(MatdeliverFollowModel deliverModel) {
+        return iMatdeliverFollowModelDao.addMatdeliverFollowModel(deliverModel);
+    }
+
+    public List<MatdeliverFollowModel> query(MatDeliverFollowQuery deliverQuery){
+        return iMatdeliverFollowModelDao.queryMatdeliverFollowModel(deliverQuery.convertToQuery().addOrder(Sort.Direction.DESC, "created"));
+    }
+    public void deleteOne(String id){
+        iMatdeliverFollowModelDao.deleteMatdeliverFollowModel(id);
+    }
+    public void updateOne(MatdeliverFollowModel deliverModel,String id){
+        iMatdeliverFollowModelDao.updateMatdeliverFollowModel(deliverModel, id);
+    }
+
+    public int count(MatDeliverFollowQuery matDeliverQuery){
+        return iMatdeliverFollowModelDao.queryMatdeliverFollowModelCount(matDeliverQuery.convertToQuery());
+    }
+    public MatdeliverFollowModel getOneMatDeliverFollow(String id){
+        return iMatdeliverFollowModelDao.getMatdeliverFollowModel(id);
+    }
+
+    public List<MatdeliverFollowModel> pageQuery(MatDeliverFollowQuery matDeliverQuery) {
+        MongoQuery mongoQuery = matDeliverQuery.convertToQuery();
+        matDeliverQuery.mysqlBuild(iMatdeliverFollowModelDao.queryMatdeliverFollowModelCount(matDeliverQuery.convertToQuery()));
+        mongoQuery.start(matDeliverQuery.getOffset()).end(matDeliverQuery.getLimit());
+        return iMatdeliverFollowModelDao.queryMatdeliverFollowModel(mongoQuery.addOrder(Sort.Direction.DESC, "dueDate1"));
+    }
+}
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/PostpartumFollowMakeMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/PostpartumFollowMakeMapper.java
deleted file mode 100644
index 0829af0..0000000
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/PostpartumFollowMakeMapper.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.lyms.platform.permission.dao.master;
-
-import com.lyms.platform.permission.model.PostpartumFollowMake;
-import com.lyms.platform.permission.model.PostpartumFollowMakeQuery;
-
-import java.util.List;
-
-public interface PostpartumFollowMakeMapper {
-    public void addPostpartumFollowMake(PostpartumFollowMake obj);
-
-    public void updatePostpartumFollowMake(PostpartumFollowMake obj);
-
-    public void deletePostpartumFollowMake(String id);
-
-    public PostpartumFollowMake getPostpartumFollowMake(String id);
-
-    public int queryPostpartumFollowMakeCount(PostpartumFollowMakeQuery query);
-
-    public List<PostpartumFollowMake> queryPostpartumFollowMake(PostpartumFollowMakeQuery query);
-
-}
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/PostpartumInfoMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/PostpartumInfoMapper.java
deleted file mode 100644
index 3a0403e..0000000
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/PostpartumInfoMapper.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.lyms.platform.permission.dao.master;
-
-import com.lyms.platform.permission.model.PostpartumInfo;
-import com.lyms.platform.permission.model.PostpartumInfoQuery;
-
-import java.util.List;
-
-public interface PostpartumInfoMapper {
-    public void addPostpartumInfo(PostpartumInfo obj);
-
-    public void updatePostpartumInfo(PostpartumInfo obj);
-
-    public void deletePostpartumInfo(String id);
-
-    public PostpartumInfo getPostpartumInfo(String id);
-
-    public int queryPostpartumInfoCount(PostpartumInfoQuery query);
-
-    public List<PostpartumInfo> queryPostpartumInfo(PostpartumInfoQuery query);
-
-}
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PostpartumFollowMake.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PostpartumFollowMake.java
deleted file mode 100644
index 5fafcd6..0000000
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PostpartumFollowMake.java
+++ /dev/null
@@ -1,342 +0,0 @@
-package com.lyms.platform.permission.model;
-
-import java.util.Date;
-
-public class PostpartumFollowMake {
-    /**
-     * id
-     */
-    private String id;
-    /**
-     * 医院ID
-     */
-    private String hospitalId;
-    /**
-     * 分娩日期
-     */
-    private Date deliveryDate;
-    /**
-     * 分娩记录id
-     */
-    private String deliverId;
-    /**
-     * 孕妇id
-     */
-    private String parentid;
-    /**
-     * pid
-     */
-    private String pid;
-    /**
-     * 预约联系结果（1-成功、2-失败）
-     */
-    private Integer contactResult;
-    /**
-     * 预约访视类型（1-上门访视、2-电话访视）
-     */
-    private Integer makeType;
-    /**
-     * 预约备注信息
-     */
-    private String makeRemark;
-    /**
-     * 预约操作员
-     */
-    private String makeCreateUser;
-    /**
-     * 预约操作日期
-     */
-    private Date makeCreateDate;
-    /**
-     * 预约失败理由（1-无人接听电话、2-拒绝访视、3-其他）
-     */
-    private Integer contactReason;
-    /**
-     * 预约访视日期
-     */
-    private Date makeVisitDate;
-    /**
-     * 访视结果（1-成功、2-失败）
-     */
-    private Integer visitResult;
-    /**
-     * 访视失败理由（1-无人接听电话、2-上门无人答应、3-改为下次访视、4-其他）
-     */
-    private Integer visitReason;
-    /**
-     * 产妇随访确认（1-待确认、2-已确认）
-     */
-    private Integer visitAffirm;
-    /**
-     * 访视日期
-     */
-    private Date visitDate;
-    /**
-     * 访视医生
-     */
-    private String visitDoctor;
-    /**
-     * 访视状态（1-待访视、2-已访视）
-     */
-    private Integer visitStatus;
-    /**
-     * 访视备注
-     */
-    private String visitRemark;
-    /**
-     * 访视操作员
-     */
-    private String visitCreateUser;
-    /**
-     * 访视操作日期
-     */
-    private Date visitCreateDate;
-    /**
-     * 下次访视日期
-     */
-    private Date nextVisitDate;
-    /**
-     * 是否结案 1-未结案、2-已结案
-     */
-    private Integer isClose;
-
-    public String getId() {
-        return id;
-    }
-
-
-    public void setId(String id) {
-        this.id = id;
-
-    }
-
-    public String getHospitalId() {
-        return hospitalId;
-    }
-
-
-    public void setHospitalId(String hospitalId) {
-        this.hospitalId = hospitalId;
-
-    }
-
-    public Date getDeliveryDate() {
-        return deliveryDate;
-    }
-
-
-    public void setDeliveryDate(Date deliveryDate) {
-        this.deliveryDate = deliveryDate;
-
-    }
-
-    public String getDeliverId() {
-        return deliverId;
-    }
-
-
-    public void setDeliverId(String deliverId) {
-        this.deliverId = deliverId;
-
-    }
-
-    public String getParentid() {
-        return parentid;
-    }
-
-
-    public void setParentid(String parentid) {
-        this.parentid = parentid;
-
-    }
-
-    public String getPid() {
-        return pid;
-    }
-
-
-    public void setPid(String pid) {
-        this.pid = pid;
-
-    }
-
-    public Integer getContactResult() {
-        return contactResult;
-    }
-
-
-    public void setContactResult(Integer contactResult) {
-        this.contactResult = contactResult;
-
-    }
-
-    public Integer getMakeType() {
-        return makeType;
-    }
-
-
-    public void setMakeType(Integer makeType) {
-        this.makeType = makeType;
-
-    }
-
-    public String getMakeRemark() {
-        return makeRemark;
-    }
-
-
-    public void setMakeRemark(String makeRemark) {
-        this.makeRemark = makeRemark;
-
-    }
-
-    public String getMakeCreateUser() {
-        return makeCreateUser;
-    }
-
-
-    public void setMakeCreateUser(String makeCreateUser) {
-        this.makeCreateUser = makeCreateUser;
-
-    }
-
-    public Date getMakeCreateDate() {
-        return makeCreateDate;
-    }
-
-
-    public void setMakeCreateDate(Date makeCreateDate) {
-        this.makeCreateDate = makeCreateDate;
-
-    }
-
-    public Integer getContactReason() {
-        return contactReason;
-    }
-
-
-    public void setContactReason(Integer contactReason) {
-        this.contactReason = contactReason;
-
-    }
-
-    public Date getMakeVisitDate() {
-        return makeVisitDate;
-    }
-
-
-    public void setMakeVisitDate(Date makeVisitDate) {
-        this.makeVisitDate = makeVisitDate;
-
-    }
-
-    public Integer getVisitResult() {
-        return visitResult;
-    }
-
-
-    public void setVisitResult(Integer visitResult) {
-        this.visitResult = visitResult;
-
-    }
-
-    public Integer getVisitReason() {
-        return visitReason;
-    }
-
-
-    public void setVisitReason(Integer visitReason) {
-        this.visitReason = visitReason;
-
-    }
-
-    public Integer getVisitAffirm() {
-        return visitAffirm;
-    }
-
-
-    public void setVisitAffirm(Integer visitAffirm) {
-        this.visitAffirm = visitAffirm;
-
-    }
-
-    public Date getVisitDate() {
-        return visitDate;
-    }
-
-
-    public void setVisitDate(Date visitDate) {
-        this.visitDate = visitDate;
-
-    }
-
-    public String getVisitDoctor() {
-        return visitDoctor;
-    }
-
-
-    public void setVisitDoctor(String visitDoctor) {
-        this.visitDoctor = visitDoctor;
-
-    }
-
-    public Integer getVisitStatus() {
-        return visitStatus;
-    }
-
-
-    public void setVisitStatus(Integer visitStatus) {
-        this.visitStatus = visitStatus;
-
-    }
-
-    public String getVisitRemark() {
-        return visitRemark;
-    }
-
-
-    public void setVisitRemark(String visitRemark) {
-        this.visitRemark = visitRemark;
-
-    }
-
-    public String getVisitCreateUser() {
-        return visitCreateUser;
-    }
-
-
-    public void setVisitCreateUser(String visitCreateUser) {
-        this.visitCreateUser = visitCreateUser;
-
-    }
-
-    public Date getVisitCreateDate() {
-        return visitCreateDate;
-    }
-
-
-    public void setVisitCreateDate(Date visitCreateDate) {
-        this.visitCreateDate = visitCreateDate;
-
-    }
-
-    public Date getNextVisitDate() {
-        return nextVisitDate;
-    }
-
-
-    public void setNextVisitDate(Date nextVisitDate) {
-        this.nextVisitDate = nextVisitDate;
-
-    }
-
-    public Integer getIsClose() {
-        return isClose;
-    }
-
-
-    public void setIsClose(Integer isClose) {
-        this.isClose = isClose;
-
-    }
-}
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PostpartumFollowMakeQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PostpartumFollowMakeQuery.java
deleted file mode 100644
index d446df1..0000000
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PostpartumFollowMakeQuery.java
+++ /dev/null
@@ -1,346 +0,0 @@
-package com.lyms.platform.permission.model;
-
-
-import com.lyms.platform.common.dao.BaseQuery;
-
-import java.util.Date;
-
-
-public class PostpartumFollowMakeQuery extends BaseQuery {
-    /**
-     * id
-     */
-    private String id;
-    /**
-     * 医院ID
-     */
-    private String hospitalId;
-    /**
-     * 分娩日期
-     */
-    private Date deliveryDate;
-    /**
-     * 分娩记录id
-     */
-    private String deliverId;
-    /**
-     * 孕妇id
-     */
-    private String parentid;
-    /**
-     * pid
-     */
-    private String pid;
-    /**
-     * 预约联系结果（1-成功、2-失败）
-     */
-    private Integer contactResult;
-    /**
-     * 预约访视类型（1-上门访视、2-电话访视）
-     */
-    private Integer makeType;
-    /**
-     * 预约备注信息
-     */
-    private String makeRemark;
-    /**
-     * 预约操作员
-     */
-    private String makeCreateUser;
-    /**
-     * 预约操作日期
-     */
-    private Date makeCreateDate;
-    /**
-     * 预约失败理由（1-无人接听电话、2-拒绝访视、3-其他）
-     */
-    private Integer contactReason;
-    /**
-     * 预约访视日期
-     */
-    private Date makeVisitDate;
-    /**
-     * 访视结果（1-成功、2-失败）
-     */
-    private Integer visitResult;
-    /**
-     * 访视失败理由（1-无人接听电话、2-上面无人答应、3-改为无人答应、4-其他）
-     */
-    private Integer visitReason;
-    /**
-     * 产妇随访确认（1-待确认、2-已确认）
-     */
-    private Integer visitAffirm;
-    /**
-     * 访视日期
-     */
-    private Date visitDate;
-    /**
-     * 访视医生
-     */
-    private String visitDoctor;
-    /**
-     * 访视状态（1-待访视、2-已访视）
-     */
-    private Integer visitStatus;
-    /**
-     * 访视备注
-     */
-    private String visitRemark;
-    /**
-     * 访视操作员
-     */
-    private String visitCreateUser;
-    /**
-     * 访视操作日期
-     */
-    private Date visitCreateDate;
-    /**
-     * 下次访视日期
-     */
-    private Date nextVisitDate;
-    /**
-     * 是否结案 1-未结案、2-已结案
-     */
-    private Integer isClose;
-
-    public String getId() {
-        return id;
-    }
-
-
-    public void setId(String id) {
-        this.id = id;
-
-    }
-
-    public String getHospitalId() {
-        return hospitalId;
-    }
-
-
-    public void setHospitalId(String hospitalId) {
-        this.hospitalId = hospitalId;
-
-    }
-
-    public Date getDeliveryDate() {
-        return deliveryDate;
-    }
-
-
-    public void setDeliveryDate(Date deliveryDate) {
-        this.deliveryDate = deliveryDate;
-
-    }
-
-    public String getDeliverId() {
-        return deliverId;
-    }
-
-
-    public void setDeliverId(String deliverId) {
-        this.deliverId = deliverId;
-
-    }
-
-    public String getParentid() {
-        return parentid;
-    }
-
-
-    public void setParentid(String parentid) {
-        this.parentid = parentid;
-
-    }
-
-    public String getPid() {
-        return pid;
-    }
-
-
-    public void setPid(String pid) {
-        this.pid = pid;
-
-    }
-
-    public Integer getContactResult() {
-        return contactResult;
-    }
-
-
-    public void setContactResult(Integer contactResult) {
-        this.contactResult = contactResult;
-
-    }
-
-    public Integer getMakeType() {
-        return makeType;
-    }
-
-
-    public void setMakeType(Integer makeType) {
-        this.makeType = makeType;
-
-    }
-
-    public String getMakeRemark() {
-        return makeRemark;
-    }
-
-
-    public void setMakeRemark(String makeRemark) {
-        this.makeRemark = makeRemark;
-
-    }
-
-    public String getMakeCreateUser() {
-        return makeCreateUser;
-    }
-
-
-    public void setMakeCreateUser(String makeCreateUser) {
-        this.makeCreateUser = makeCreateUser;
-
-    }
-
-    public Date getMakeCreateDate() {
-        return makeCreateDate;
-    }
-
-
-    public void setMakeCreateDate(Date makeCreateDate) {
-        this.makeCreateDate = makeCreateDate;
-
-    }
-
-    public Integer getContactReason() {
-        return contactReason;
-    }
-
-
-    public void setContactReason(Integer contactReason) {
-        this.contactReason = contactReason;
-
-    }
-
-    public Date getMakeVisitDate() {
-        return makeVisitDate;
-    }
-
-
-    public void setMakeVisitDate(Date makeVisitDate) {
-        this.makeVisitDate = makeVisitDate;
-
-    }
-
-    public Integer getVisitResult() {
-        return visitResult;
-    }
-
-
-    public void setVisitResult(Integer visitResult) {
-        this.visitResult = visitResult;
-
-    }
-
-    public Integer getVisitReason() {
-        return visitReason;
-    }
-
-
-    public void setVisitReason(Integer visitReason) {
-        this.visitReason = visitReason;
-
-    }
-
-    public Integer getVisitAffirm() {
-        return visitAffirm;
-    }
-
-
-    public void setVisitAffirm(Integer visitAffirm) {
-        this.visitAffirm = visitAffirm;
-
-    }
-
-    public Date getVisitDate() {
-        return visitDate;
-    }
-
-
-    public void setVisitDate(Date visitDate) {
-        this.visitDate = visitDate;
-
-    }
-
-    public String getVisitDoctor() {
-        return visitDoctor;
-    }
-
-
-    public void setVisitDoctor(String visitDoctor) {
-        this.visitDoctor = visitDoctor;
-
-    }
-
-    public Integer getVisitStatus() {
-        return visitStatus;
-    }
-
-
-    public void setVisitStatus(Integer visitStatus) {
-        this.visitStatus = visitStatus;
-
-    }
-
-    public String getVisitRemark() {
-        return visitRemark;
-    }
-
-
-    public void setVisitRemark(String visitRemark) {
-        this.visitRemark = visitRemark;
-
-    }
-
-    public String getVisitCreateUser() {
-        return visitCreateUser;
-    }
-
-
-    public void setVisitCreateUser(String visitCreateUser) {
-        this.visitCreateUser = visitCreateUser;
-
-    }
-
-    public Date getVisitCreateDate() {
-        return visitCreateDate;
-    }
-
-
-    public void setVisitCreateDate(Date visitCreateDate) {
-        this.visitCreateDate = visitCreateDate;
-
-    }
-
-    public Date getNextVisitDate() {
-        return nextVisitDate;
-    }
-
-
-    public void setNextVisitDate(Date nextVisitDate) {
-        this.nextVisitDate = nextVisitDate;
-
-    }
-
-    public Integer getIsClose() {
-        return isClose;
-    }
-
-
-    public void setIsClose(Integer isClose) {
-        this.isClose = isClose;
-
-    }
-}
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PostpartumInfo.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PostpartumInfo.java
deleted file mode 100644
index 192928a..0000000
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PostpartumInfo.java
+++ /dev/null
@@ -1,287 +0,0 @@
-package com.lyms.platform.permission.model;
-
-import java.util.Date;
-
-public class PostpartumInfo {
-    /**
-     * id
-     */
-    private String id;
-    /**
-     * 产后随访预约记录id
-     */
-    private String postFollowId;
-    /**
-     * 分娩日期
-     */
-    private Date fmDate;
-    /**
-     * 出院日期
-     */
-    private Date leaveDate;
-    /**
-     * 体温
-     */
-    private String temperature;
-    /**
-     * 一般健康状况
-     */
-    private String fitnessDesc;
-    /**
-     * 一般心理状况
-     */
-    private String mentalityDesc;
-    /**
-     * 血压低
-     */
-    private Integer bpv;
-    /**
-     * 血压高
-     */
-    private Integer bpk;
-    /**
-     * 乳房
-     */
-    private String breast;
-    /**
-     * 恶露
-     */
-    private String lochia;
-    /**
-     * 子宫
-     */
-    private String matrix;
-    /**
-     * 伤口
-     */
-    private String wound;
-    /**
-     * 其他
-     */
-    private String otherDesc;
-    /**
-     * 分类(1-未见异常、2-异常)
-     */
-    private Integer healthType;
-    /**
-     * 指导意见
-     */
-    private String guideSuggest;
-    /**
-     * 指导意见其他
-     */
-    private String guideOtherDesc;
-    /**
-     * 是否转诊转诊（1-无、2-有）
-     */
-    private Integer isReferral;
-    /**
-     * 转诊原因
-     */
-    private String referralReason;
-    /**
-     * 科室及机构
-     */
-    private String hospital;
-
-
-    public String getId() {
-        return id;
-    }
-
-
-    public void setId(String id) {
-        this.id = id;
-
-    }
-
-    public String getPostFollowId() {
-        return postFollowId;
-    }
-
-
-    public void setPostFollowId(String postFollowId) {
-        this.postFollowId = postFollowId;
-
-    }
-
-    public Date getFmDate() {
-        return fmDate;
-    }
-
-
-    public void setFmDate(Date fmDate) {
-        this.fmDate = fmDate;
-
-    }
-
-    public Date getLeaveDate() {
-        return leaveDate;
-    }
-
-
-    public void setLeaveDate(Date leaveDate) {
-        this.leaveDate = leaveDate;
-
-    }
-
-    public String getTemperature() {
-        return temperature;
-    }
-
-
-    public void setTemperature(String temperature) {
-        this.temperature = temperature;
-
-    }
-
-    public String getFitnessDesc() {
-        return fitnessDesc;
-    }
-
-
-    public void setFitnessDesc(String fitnessDesc) {
-        this.fitnessDesc = fitnessDesc;
-
-    }
-
-    public String getMentalityDesc() {
-        return mentalityDesc;
-    }
-
-
-    public void setMentalityDesc(String mentalityDesc) {
-        this.mentalityDesc = mentalityDesc;
-
-    }
-
-    public Integer getBpv() {
-        return bpv;
-    }
-
-
-    public void setBpv(Integer bpv) {
-        this.bpv = bpv;
-
-    }
-
-    public Integer getBpk() {
-        return bpk;
-    }
-
-
-    public void setBpk(Integer bpk) {
-        this.bpk = bpk;
-
-    }
-
-    public String getBreast() {
-        return breast;
-    }
-
-
-    public void setBreast(String breast) {
-        this.breast = breast;
-
-    }
-
-    public String getLochia() {
-        return lochia;
-    }
-
-
-    public void setLochia(String lochia) {
-        this.lochia = lochia;
-
-    }
-
-    public String getMatrix() {
-        return matrix;
-    }
-
-
-    public void setMatrix(String matrix) {
-        this.matrix = matrix;
-
-    }
-
-    public String getWound() {
-        return wound;
-    }
-
-
-    public void setWound(String wound) {
-        this.wound = wound;
-
-    }
-
-    public String getOtherDesc() {
-        return otherDesc;
-    }
-
-
-    public void setOtherDesc(String otherDesc) {
-        this.otherDesc = otherDesc;
-
-    }
-
-    public Integer getHealthType() {
-        return healthType;
-    }
-
-
-    public void setHealthType(Integer healthType) {
-        this.healthType = healthType;
-
-    }
-
-    public String getGuideSuggest() {
-        return guideSuggest;
-    }
-
-
-    public void setGuideSuggest(String guideSuggest) {
-        this.guideSuggest = guideSuggest;
-
-    }
-
-    public String getGuideOtherDesc() {
-        return guideOtherDesc;
-    }
-
-
-    public void setGuideOtherDesc(String guideOtherDesc) {
-        this.guideOtherDesc = guideOtherDesc;
-
-    }
-
-    public Integer getIsReferral() {
-        return isReferral;
-    }
-
-
-    public void setIsReferral(Integer isReferral) {
-        this.isReferral = isReferral;
-
-    }
-
-    public String getReferralReason() {
-        return referralReason;
-    }
-
-
-    public void setReferralReason(String referralReason) {
-        this.referralReason = referralReason;
-
-    }
-
-    public String getHospital() {
-        return hospital;
-    }
-
-
-    public void setHospital(String hospital) {
-        this.hospital = hospital;
-
-    }
-}
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PostpartumInfoQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PostpartumInfoQuery.java
deleted file mode 100644
index 540d51e..0000000
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/PostpartumInfoQuery.java
+++ /dev/null
@@ -1,290 +0,0 @@
-package com.lyms.platform.permission.model;
-
-
-import com.lyms.platform.common.dao.BaseQuery;
-
-import java.util.Date;
-
-
-public class PostpartumInfoQuery extends BaseQuery {
-    /**
-     * id
-     */
-    private String id;
-    /**
-     * 产后随访预约记录id
-     */
-    private String postFollowId;
-    /**
-     * 分娩日期
-     */
-    private Date fmDate;
-    /**
-     * 出院日期
-     */
-    private Date leaveDate;
-    /**
-     * 体温
-     */
-    private String temperature;
-    /**
-     * 一般健康状况
-     */
-    private String fitnessDesc;
-    /**
-     * 一般心理状况
-     */
-    private String mentalityDesc;
-    /**
-     * 血压低
-     */
-    private Integer bpv;
-    /**
-     * 血压高
-     */
-    private Integer bpk;
-    /**
-     * 乳房
-     */
-    private String breast;
-    /**
-     * 恶露
-     */
-    private String lochia;
-    /**
-     * 子宫
-     */
-    private String matrix;
-    /**
-     * 伤口
-     */
-    private String wound;
-    /**
-     * 其他
-     */
-    private String otherDesc;
-    /**
-     * 分类(1-未见异常、2-异常)
-     */
-    private Integer healthType;
-    /**
-     * 指导意见
-     */
-    private String guideSuggest;
-    /**
-     * 指导意见其他
-     */
-    private String guideOtherDesc;
-    /**
-     * 是否转诊转诊（1-无、2-有）
-     */
-    private Integer isReferral;
-    /**
-     * 转诊原因
-     */
-    private String referralReason;
-    /**
-     * 科室及机构
-     */
-    private String hospital;
-
-    public String getId() {
-        return id;
-    }
-
-
-    public void setId(String id) {
-        this.id = id;
-
-    }
-
-    public String getPostFollowId() {
-        return postFollowId;
-    }
-
-
-    public void setPostFollowId(String postFollowId) {
-        this.postFollowId = postFollowId;
-
-    }
-
-    public Date getFmDate() {
-        return fmDate;
-    }
-
-
-    public void setFmDate(Date fmDate) {
-        this.fmDate = fmDate;
-
-    }
-
-    public Date getLeaveDate() {
-        return leaveDate;
-    }
-
-
-    public void setLeaveDate(Date leaveDate) {
-        this.leaveDate = leaveDate;
-
-    }
-
-    public String getTemperature() {
-        return temperature;
-    }
-
-
-    public void setTemperature(String temperature) {
-        this.temperature = temperature;
-
-    }
-
-    public String getFitnessDesc() {
-        return fitnessDesc;
-    }
-
-
-    public void setFitnessDesc(String fitnessDesc) {
-        this.fitnessDesc = fitnessDesc;
-
-    }
-
-    public String getMentalityDesc() {
-        return mentalityDesc;
-    }
-
-
-    public void setMentalityDesc(String mentalityDesc) {
-        this.mentalityDesc = mentalityDesc;
-
-    }
-
-    public Integer getBpv() {
-        return bpv;
-    }
-
-
-    public void setBpv(Integer bpv) {
-        this.bpv = bpv;
-
-    }
-
-    public Integer getBpk() {
-        return bpk;
-    }
-
-
-    public void setBpk(Integer bpk) {
-        this.bpk = bpk;
-
-    }
-
-    public String getBreast() {
-        return breast;
-    }
-
-
-    public void setBreast(String breast) {
-        this.breast = breast;
-
-    }
-
-    public String getLochia() {
-        return lochia;
-    }
-
-
-    public void setLochia(String lochia) {
-        this.lochia = lochia;
-
-    }
-
-    public String getMatrix() {
-        return matrix;
-    }
-
-
-    public void setMatrix(String matrix) {
-        this.matrix = matrix;
-
-    }
-
-    public String getWound() {
-        return wound;
-    }
-
-
-    public void setWound(String wound) {
-        this.wound = wound;
-
-    }
-
-    public String getOtherDesc() {
-        return otherDesc;
-    }
-
-
-    public void setOtherDesc(String otherDesc) {
-        this.otherDesc = otherDesc;
-
-    }
-
-    public Integer getHealthType() {
-        return healthType;
-    }
-
-
-    public void setHealthType(Integer healthType) {
-        this.healthType = healthType;
-
-    }
-
-    public String getGuideSuggest() {
-        return guideSuggest;
-    }
-
-
-    public void setGuideSuggest(String guideSuggest) {
-        this.guideSuggest = guideSuggest;
-
-    }
-
-    public String getGuideOtherDesc() {
-        return guideOtherDesc;
-    }
-
-
-    public void setGuideOtherDesc(String guideOtherDesc) {
-        this.guideOtherDesc = guideOtherDesc;
-
-    }
-
-    public Integer getIsReferral() {
-        return isReferral;
-    }
-
-
-    public void setIsReferral(Integer isReferral) {
-        this.isReferral = isReferral;
-
-    }
-
-    public String getReferralReason() {
-        return referralReason;
-    }
-
-
-    public void setReferralReason(String referralReason) {
-        this.referralReason = referralReason;
-
-    }
-
-    public String getHospital() {
-        return hospital;
-    }
-
-
-    public void setHospital(String hospital) {
-        this.hospital = hospital;
-
-    }
-}
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PostpartumFollowMakeService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PostpartumFollowMakeService.java
deleted file mode 100644
index 89ee518..0000000
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PostpartumFollowMakeService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.lyms.platform.permission.service;
-
-import com.lyms.platform.permission.model.PostpartumFollowMake;
-import com.lyms.platform.permission.model.PostpartumFollowMakeQuery;
-
-import java.util.List;
-
-public interface PostpartumFollowMakeService {
-    public void addPostpartumFollowMake(PostpartumFollowMake obj);
-
-    public void updatePostpartumFollowMake(PostpartumFollowMake obj);
-
-    public void deletePostpartumFollowMake(String id);
-
-    public PostpartumFollowMake getPostpartumFollowMake(String id);
-
-    public int queryPostpartumFollowMakeCount(PostpartumFollowMakeQuery query);
-
-    public List<PostpartumFollowMake> queryPostpartumFollowMake(PostpartumFollowMakeQuery query);
-
-}
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PostpartumInfoService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PostpartumInfoService.java
deleted file mode 100644
index 1acff7d..0000000
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/PostpartumInfoService.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.lyms.platform.permission.service;
-
-import com.lyms.platform.permission.model.PostpartumInfo;
-import com.lyms.platform.permission.model.PostpartumInfoQuery;
-
-import java.util.List;
-
-public interface PostpartumInfoService {
-    public void addPostpartumInfo(PostpartumInfo obj);
-
-    public void updatePostpartumInfo(PostpartumInfo obj);
-
-    public void deletePostpartumInfo(String id);
-
-    public PostpartumInfo getPostpartumInfo(String id);
-
-    public int queryPostpartumInfoCount(PostpartumInfoQuery query);
-
-    public List<PostpartumInfo> queryPostpartumInfo(PostpartumInfoQuery query);
-
-}
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PostpartumFollowMakeServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PostpartumFollowMakeServiceImpl.java
deleted file mode 100644
index 11acb01..0000000
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PostpartumFollowMakeServiceImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.lyms.platform.permission.service.impl;
-
-import com.lyms.platform.permission.dao.master.PostpartumFollowMakeMapper;
-import com.lyms.platform.permission.model.PostpartumFollowMake;
-import com.lyms.platform.permission.model.PostpartumFollowMakeQuery;
-import com.lyms.platform.permission.service.PostpartumFollowMakeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class PostpartumFollowMakeServiceImpl implements PostpartumFollowMakeService {
-
-    @Autowired
-    private PostpartumFollowMakeMapper postpartumFollowMakeMapper;
-
-    @Override
-    public void addPostpartumFollowMake(PostpartumFollowMake obj) {
-        postpartumFollowMakeMapper.addPostpartumFollowMake(obj);
-    }
-
-    @Override
-    public void updatePostpartumFollowMake(PostpartumFollowMake obj) {
-        postpartumFollowMakeMapper.updatePostpartumFollowMake(obj);
-    }
-
-    @Override
-    public void deletePostpartumFollowMake(String id) {
-        postpartumFollowMakeMapper.deletePostpartumFollowMake(id);
-    }
-
-    @Override
-    public PostpartumFollowMake getPostpartumFollowMake(String id) {
-        return postpartumFollowMakeMapper.getPostpartumFollowMake(id);
-    }
-
-    @Override
-    public int queryPostpartumFollowMakeCount(PostpartumFollowMakeQuery query) {
-        return postpartumFollowMakeMapper.queryPostpartumFollowMakeCount(query);
-    }
-
-    @Override
-    public List<PostpartumFollowMake> queryPostpartumFollowMake(PostpartumFollowMakeQuery query) {
-        if (query.getNeed() != null) {
-            query.mysqlBuild(postpartumFollowMakeMapper.queryPostpartumFollowMakeCount(query));
-        }
-        return postpartumFollowMakeMapper.queryPostpartumFollowMake(query);
-    }
-
-}
\ No newline at end of file
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PostpartumInfoServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PostpartumInfoServiceImpl.java
deleted file mode 100644
index 984efc8..0000000
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/PostpartumInfoServiceImpl.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package com.lyms.platform.permission.service.impl;
-
-import com.lyms.platform.permission.dao.master.PostpartumInfoMapper;
-import com.lyms.platform.permission.model.PostpartumInfo;
-import com.lyms.platform.permission.model.PostpartumInfoQuery;
-import com.lyms.platform.permission.service.PostpartumInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-public class PostpartumInfoServiceImpl implements PostpartumInfoService {
-
-    @Autowired
-    private PostpartumInfoMapper postpartumInfoMapper;
-
-    @Override
-    public void addPostpartumInfo(PostpartumInfo obj) {
-        postpartumInfoMapper.addPostpartumInfo(obj);
-    }
-
-    @Override
-    public void updatePostpartumInfo(PostpartumInfo obj) {
-        postpartumInfoMapper.updatePostpartumInfo(obj);
-    }
-
-    @Override
-    public void deletePostpartumInfo(String id) {
-        postpartumInfoMapper.deletePostpartumInfo(id);
-    }
-
-    @Override
-    public PostpartumInfo getPostpartumInfo(String id) {
-        return postpartumInfoMapper.getPostpartumInfo(id);
-    }
-
-    @Override
-    public int queryPostpartumInfoCount(PostpartumInfoQuery query) {
-        return postpartumInfoMapper.queryPostpartumInfoCount(query);
-    }
-
-    @Override
-    public List<PostpartumInfo> queryPostpartumInfo(PostpartumInfoQuery query) {
-        if (query.getNeed() != null) {
-            query.mysqlBuild(postpartumInfoMapper.queryPostpartumInfoCount(query));
-        }
-        return postpartumInfoMapper.queryPostpartumInfo(query);
-    }
-
-}
\ No newline at end of file
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/PostpartumFollowMake.xml b/platform-biz-service/src/main/resources/mainOrm/master/PostpartumFollowMake.xml
deleted file mode 100644
index b3c611c..0000000
--- a/platform-biz-service/src/main/resources/mainOrm/master/PostpartumFollowMake.xml
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.lyms.platform.permission.dao.master.PostpartumFollowMakeMapper">
-
-<resultMap id="PostpartumFollowMakeResultMap" type="com.lyms.platform.permission.model.PostpartumFollowMake">
-<id column="id" property="id" jdbcType="VARCHAR" />
-<result column="hospital_id" property="hospitalId" jdbcType="VARCHAR" />
-<result column="delivery_date" property="deliveryDate" jdbcType="TIMESTAMP" />
-<result column="deliver_id" property="deliverId" jdbcType="VARCHAR" />
-<result column="parentId" property="parentid" jdbcType="VARCHAR" />
-<result column="pid" property="pid" jdbcType="VARCHAR" />
-<result column="contact_result" property="contactResult" jdbcType="INTEGER" />
-<result column="make_type" property="makeType" jdbcType="INTEGER" />
-<result column="make_remark" property="makeRemark" jdbcType="VARCHAR" />
-<result column="make_create_user" property="makeCreateUser" jdbcType="VARCHAR" />
-<result column="make_create_date" property="makeCreateDate" jdbcType="TIMESTAMP" />
-<result column="contact_reason" property="contactReason" jdbcType="INTEGER" />
-<result column="make_visit_date" property="makeVisitDate" jdbcType="TIMESTAMP" />
-<result column="visit_result" property="visitResult" jdbcType="INTEGER" />
-<result column="visit_reason" property="visitReason" jdbcType="INTEGER" />
-<result column="visit_affirm" property="visitAffirm" jdbcType="INTEGER" />
-<result column="visit_date" property="visitDate" jdbcType="TIMESTAMP" />
-<result column="visit_doctor" property="visitDoctor" jdbcType="VARCHAR" />
-<result column="visit_status" property="visitStatus" jdbcType="INTEGER" />
-<result column="visit_remark" property="visitRemark" jdbcType="VARCHAR" />
-<result column="visit_create_user" property="visitCreateUser" jdbcType="VARCHAR" />
-<result column="visit_create_date" property="visitCreateDate" jdbcType="TIMESTAMP" />
-<result column="next_visit_date" property="nextVisitDate" jdbcType="TIMESTAMP" />
-<result column="is_close" property="isClose" jdbcType="INTEGER" />
-</resultMap>
-
-
-
-<insert id="addPostpartumFollowMake" parameterType="com.lyms.platform.permission.model.PostpartumFollowMake">
-insert into postpartum_follow_make (id,hospital_id,delivery_date,deliver_id,parentId,pid,contact_result,make_type,make_remark,make_create_user,make_create_date,contact_reason,make_visit_date,visit_result,visit_reason,visit_affirm,visit_date,visit_doctor,visit_status,visit_remark,visit_create_user,visit_create_date,next_visit_date,is_close) values (#{id},#{hospitalId},#{deliveryDate},#{deliverId},#{parentid},#{pid},#{contactResult},#{makeType},#{makeRemark},#{makeCreateUser},#{makeCreateDate},#{contactReason},#{makeVisitDate},#{visitResult},#{visitReason},#{visitAffirm},#{visitDate},#{visitDoctor},#{visitStatus},#{visitRemark},#{visitCreateUser},#{visitCreateDate},#{nextVisitDate},#{isClose})
-</insert>
-
-
-
-<update id="updatePostpartumFollowMake" parameterType="com.lyms.platform.permission.model.PostpartumFollowMake">
-update postpartum_follow_make <set><if test="hospitalId != null and hospitalId != ''">
-hospital_id = #{hospitalId,jdbcType=VARCHAR},
-</if>
-<if test="deliveryDate != null">
-delivery_date = #{deliveryDate,jdbcType=TIMESTAMP},
-</if>
-<if test="deliverId != null and deliverId != ''">
-deliver_id = #{deliverId,jdbcType=VARCHAR},
-</if>
-<if test="parentid != null and parentid != ''">
-parentId = #{parentid,jdbcType=VARCHAR},
-</if>
-<if test="pid != null and pid != ''">
-pid = #{pid,jdbcType=VARCHAR},
-</if>
-<if test="contactResult != null and contactResult >= 0">
-contact_result = #{contactResult,jdbcType=INTEGER},
-</if>
-<if test="makeType != null and makeType >= 0">
-make_type = #{makeType,jdbcType=INTEGER},
-</if>
-<if test="makeRemark != null and makeRemark != ''">
-make_remark = #{makeRemark,jdbcType=VARCHAR},
-</if>
-<if test="makeCreateUser != null and makeCreateUser != ''">
-make_create_user = #{makeCreateUser,jdbcType=VARCHAR},
-</if>
-<if test="makeCreateDate != null">
-make_create_date = #{makeCreateDate,jdbcType=TIMESTAMP},
-</if>
-<if test="contactReason != null and contactReason >= 0">
-contact_reason = #{contactReason,jdbcType=INTEGER},
-</if>
-<if test="makeVisitDate != null">
-make_visit_date = #{makeVisitDate,jdbcType=TIMESTAMP},
-</if>
-<if test="visitResult != null and visitResult >= 0">
-visit_result = #{visitResult,jdbcType=INTEGER},
-</if>
-<if test="visitReason != null and visitReason >= 0">
-visit_reason = #{visitReason,jdbcType=INTEGER},
-</if>
-<if test="visitAffirm != null and visitAffirm >= 0">
-visit_affirm = #{visitAffirm,jdbcType=INTEGER},
-</if>
-<if test="visitDate != null">
-visit_date = #{visitDate,jdbcType=TIMESTAMP},
-</if>
-<if test="visitDoctor != null and visitDoctor != ''">
-visit_doctor = #{visitDoctor,jdbcType=VARCHAR},
-</if>
-<if test="visitStatus != null and visitStatus >= 0">
-visit_status = #{visitStatus,jdbcType=INTEGER},
-</if>
-<if test="visitRemark != null and visitRemark != ''">
-visit_remark = #{visitRemark,jdbcType=VARCHAR},
-</if>
-<if test="visitCreateUser != null and visitCreateUser != ''">
-visit_create_user = #{visitCreateUser,jdbcType=VARCHAR},
-</if>
-<if test="visitCreateDate != null">
-visit_create_date = #{visitCreateDate,jdbcType=TIMESTAMP},
-</if>
-<if test="nextVisitDate != null">
-next_visit_date = #{nextVisitDate,jdbcType=TIMESTAMP},
-</if>
-<if test="isClose != null and isClose >= 0">
-is_close = #{isClose,jdbcType=INTEGER},
-</if>
-</set>
-where id = #{id,jdbcType=VARCHAR}
-</update>
-
-
-<delete id="deletePostpartumFollowMake" parameterType="java.lang.String">
-delete from postpartum_follow_make where id = #{id,jdbcType=VARCHAR}
-</delete>
-
-
-
-<select id="getPostpartumFollowMake" resultMap="PostpartumFollowMakeResultMap" parameterType="java.lang.String">
-select id,hospital_id,delivery_date,deliver_id,parentId,pid,contact_result,make_type,make_remark,make_create_user,make_create_date,contact_reason,make_visit_date,visit_result,visit_reason,visit_affirm,visit_date,visit_doctor,visit_status,visit_remark,visit_create_user,visit_create_date,next_visit_date,is_close
- from postpartum_follow_make where id = #{id,jdbcType=VARCHAR}
-</select>
-
-
-<sql id="orderAndLimit">
-<if test="sort != null and sort != '' ">
-order by ${sort} 
-<if test="need != null">
-limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER}
-</if>
-</if>
-</sql>
-
-
-
-<sql id="PostpartumFollowMakeCondition">
-<where>
- 1 = 1 
-<if test="id != null and id != ''">
-and id = #{id,jdbcType=VARCHAR} 
-</if>
-<if test="hospitalId != null and hospitalId != ''">
-and hospital_id = #{hospitalId,jdbcType=VARCHAR} 
-</if>
-<if test="deliveryDate != null">
-and delivery_date = #{deliveryDate,jdbcType=TIMESTAMP} 
-</if>
-<if test="deliverId != null and deliverId != ''">
-and deliver_id = #{deliverId,jdbcType=VARCHAR} 
-</if>
-<if test="parentid != null and parentid != ''">
-and parentId = #{parentid,jdbcType=VARCHAR} 
-</if>
-<if test="pid != null and pid != ''">
-and pid = #{pid,jdbcType=VARCHAR} 
-</if>
-<if test="contactResult != null and contactResult >= 0">
-and contact_result = #{contactResult,jdbcType=INTEGER} 
-</if>
-<if test="makeType != null and makeType >= 0">
-and make_type = #{makeType,jdbcType=INTEGER} 
-</if>
-<if test="makeRemark != null and makeRemark != ''">
-and make_remark = #{makeRemark,jdbcType=VARCHAR} 
-</if>
-<if test="makeCreateUser != null and makeCreateUser != ''">
-and make_create_user = #{makeCreateUser,jdbcType=VARCHAR} 
-</if>
-<if test="makeCreateDate != null">
-and make_create_date = #{makeCreateDate,jdbcType=TIMESTAMP} 
-</if>
-<if test="contactReason != null and contactReason >= 0">
-and contact_reason = #{contactReason,jdbcType=INTEGER} 
-</if>
-<if test="makeVisitDate != null">
-and make_visit_date = #{makeVisitDate,jdbcType=TIMESTAMP} 
-</if>
-<if test="visitResult != null and visitResult >= 0">
-and visit_result = #{visitResult,jdbcType=INTEGER} 
-</if>
-<if test="visitReason != null and visitReason >= 0">
-and visit_reason = #{visitReason,jdbcType=INTEGER} 
-</if>
-<if test="visitAffirm != null and visitAffirm >= 0">
-and visit_affirm = #{visitAffirm,jdbcType=INTEGER} 
-</if>
-<if test="visitDate != null">
-and visit_date = #{visitDate,jdbcType=TIMESTAMP} 
-</if>
-<if test="visitDoctor != null and visitDoctor != ''">
-and visit_doctor = #{visitDoctor,jdbcType=VARCHAR} 
-</if>
-<if test="visitStatus != null and visitStatus >= 0">
-and visit_status = #{visitStatus,jdbcType=INTEGER} 
-</if>
-<if test="visitRemark != null and visitRemark != ''">
-and visit_remark = #{visitRemark,jdbcType=VARCHAR} 
-</if>
-<if test="visitCreateUser != null and visitCreateUser != ''">
-and visit_create_user = #{visitCreateUser,jdbcType=VARCHAR} 
-</if>
-<if test="visitCreateDate != null">
-and visit_create_date = #{visitCreateDate,jdbcType=TIMESTAMP} 
-</if>
-<if test="nextVisitDate != null">
-and next_visit_date = #{nextVisitDate,jdbcType=TIMESTAMP} 
-</if>
-<if test="isClose != null and isClose >= 0">
-and is_close = #{isClose,jdbcType=INTEGER} 
-</if>
-</where>
-</sql>
-
-
-
-<select id="queryPostpartumFollowMake" resultMap="PostpartumFollowMakeResultMap" parameterType="com.lyms.platform.permission.model.PostpartumFollowMakeQuery">
-select id,hospital_id,delivery_date,deliver_id,parentId,pid,contact_result,make_type,make_remark,make_create_user,make_create_date,contact_reason,make_visit_date,visit_result,visit_reason,visit_affirm,visit_date,visit_doctor,visit_status,visit_remark,visit_create_user,visit_create_date,next_visit_date,is_close
- from postpartum_follow_make 
-<include refid="PostpartumFollowMakeCondition" />
-<include refid="orderAndLimit" />
-</select>
-
-
-
-<select id="queryPostpartumFollowMakeCount" resultType="int" parameterType="com.lyms.platform.permission.model.PostpartumFollowMakeQuery">
-select count(1) from postpartum_follow_make
-<include refid="PostpartumFollowMakeCondition" />
-</select>
-
-
-
-</mapper>
\ No newline at end of file
diff --git a/platform-biz-service/src/main/resources/mainOrm/master/PostpartumInfo.xml b/platform-biz-service/src/main/resources/mainOrm/master/PostpartumInfo.xml
deleted file mode 100644
index 693ce0d..0000000
--- a/platform-biz-service/src/main/resources/mainOrm/master/PostpartumInfo.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.lyms.platform.permission.dao.master.PostpartumInfoMapper">
-
-<resultMap id="PostpartumInfoResultMap" type="com.lyms.platform.permission.model.PostpartumInfo">
-<id column="id" property="id" jdbcType="VARCHAR" />
-<result column="post_follow_id" property="postFollowId" jdbcType="VARCHAR" />
-<result column="fm_date" property="fmDate" jdbcType="TIMESTAMP" />
-<result column="leave_date" property="leaveDate" jdbcType="TIMESTAMP" />
-<result column="temperature" property="temperature" jdbcType="VARCHAR" />
-<result column="fitness_desc" property="fitnessDesc" jdbcType="VARCHAR" />
-<result column="mentality_desc" property="mentalityDesc" jdbcType="VARCHAR" />
-<result column="bpv" property="bpv" jdbcType="INTEGER" />
-<result column="bpk" property="bpk" jdbcType="INTEGER" />
-<result column="breast" property="breast" jdbcType="VARCHAR" />
-<result column="lochia" property="lochia" jdbcType="VARCHAR" />
-<result column="matrix" property="matrix" jdbcType="VARCHAR" />
-<result column="wound" property="wound" jdbcType="VARCHAR" />
-<result column="other_desc" property="otherDesc" jdbcType="VARCHAR" />
-<result column="health_type" property="healthType" jdbcType="INTEGER" />
-<result column="guide_suggest" property="guideSuggest" jdbcType="VARCHAR" />
-<result column="guide_other_desc" property="guideOtherDesc" jdbcType="VARCHAR" />
-<result column="is_referral" property="isReferral" jdbcType="INTEGER" />
-<result column="referral_reason" property="referralReason" jdbcType="VARCHAR" />
-<result column="hospital" property="hospital" jdbcType="VARCHAR" />
-</resultMap>
-
-
-
-<insert id="addPostpartumInfo" parameterType="com.lyms.platform.permission.model.PostpartumInfo">
-insert into postpartum_info (id,post_follow_id,fm_date,leave_date,temperature,fitness_desc,mentality_desc,bpv,bpk,breast,lochia,matrix,wound,other_desc,health_type,guide_suggest,guide_other_desc,is_referral,referral_reason,hospital) values (#{id},#{postFollowId},#{fmDate},#{leaveDate},#{temperature},#{fitnessDesc},#{mentalityDesc},#{bpv},#{bpk},#{breast},#{lochia},#{matrix},#{wound},#{otherDesc},#{healthType},#{guideSuggest},#{guideOtherDesc},#{isReferral},#{referralReason},#{hospital})
-</insert>
-
-
-
-<update id="updatePostpartumInfo" parameterType="com.lyms.platform.permission.model.PostpartumInfo">
-update postpartum_info <set><if test="postFollowId != null and postFollowId != ''">
-post_follow_id = #{postFollowId,jdbcType=VARCHAR},
-</if>
-<if test="fmDate != null">
-fm_date = #{fmDate,jdbcType=TIMESTAMP},
-</if>
-<if test="leaveDate != null">
-leave_date = #{leaveDate,jdbcType=TIMESTAMP},
-</if>
-<if test="temperature != null and temperature != ''">
-temperature = #{temperature,jdbcType=VARCHAR},
-</if>
-<if test="fitnessDesc != null and fitnessDesc != ''">
-fitness_desc = #{fitnessDesc,jdbcType=VARCHAR},
-</if>
-<if test="mentalityDesc != null and mentalityDesc != ''">
-mentality_desc = #{mentalityDesc,jdbcType=VARCHAR},
-</if>
-<if test="bpv != null and bpv >= 0">
-bpv = #{bpv,jdbcType=INTEGER},
-</if>
-<if test="bpk != null and bpk >= 0">
-bpk = #{bpk,jdbcType=INTEGER},
-</if>
-<if test="breast != null and breast != ''">
-breast = #{breast,jdbcType=VARCHAR},
-</if>
-<if test="lochia != null and lochia != ''">
-lochia = #{lochia,jdbcType=VARCHAR},
-</if>
-<if test="matrix != null and matrix != ''">
-matrix = #{matrix,jdbcType=VARCHAR},
-</if>
-<if test="wound != null and wound != ''">
-wound = #{wound,jdbcType=VARCHAR},
-</if>
-<if test="otherDesc != null and otherDesc != ''">
-other_desc = #{otherDesc,jdbcType=VARCHAR},
-</if>
-<if test="healthType != null and healthType >= 0">
-health_type = #{healthType,jdbcType=INTEGER},
-</if>
-<if test="guideSuggest != null and guideSuggest != ''">
-guide_suggest = #{guideSuggest,jdbcType=VARCHAR},
-</if>
-<if test="guideOtherDesc != null and guideOtherDesc != ''">
-guide_other_desc = #{guideOtherDesc,jdbcType=VARCHAR},
-</if>
-<if test="isReferral != null and isReferral >= 0">
-is_referral = #{isReferral,jdbcType=INTEGER},
-</if>
-<if test="referralReason != null and referralReason != ''">
-referral_reason = #{referralReason,jdbcType=VARCHAR},
-</if>
-<if test="hospital != null and hospital != ''">
-hospital = #{hospital,jdbcType=VARCHAR},
-</if>
-</set>
-where id = #{id,jdbcType=VARCHAR}
-</update>
-
-
-<delete id="deletePostpartumInfo" parameterType="java.lang.String">
-delete from postpartum_info where id = #{id,jdbcType=VARCHAR}
-</delete>
-
-
-
-<select id="getPostpartumInfo" resultMap="PostpartumInfoResultMap" parameterType="java.lang.String">
-select id,post_follow_id,fm_date,leave_date,temperature,fitness_desc,mentality_desc,bpv,bpk,breast,lochia,matrix,wound,other_desc,health_type,guide_suggest,guide_other_desc,is_referral,referral_reason,hospital
- from postpartum_info where id = #{id,jdbcType=VARCHAR}
-</select>
-
-
-<sql id="orderAndLimit">
-<if test="sort != null and sort != '' ">
-order by ${sort} 
-<if test="need != null">
-limit #{offset, jdbcType=INTEGER} , #{limit, jdbcType=INTEGER}
-</if>
-</if>
-</sql>
-
-
-
-<sql id="PostpartumInfoCondition">
-<where>
- 1 = 1 
-<if test="id != null and id != ''">
-and id = #{id,jdbcType=VARCHAR} 
-</if>
-<if test="postFollowId != null and postFollowId != ''">
-and post_follow_id = #{postFollowId,jdbcType=VARCHAR} 
-</if>
-<if test="fmDate != null">
-and fm_date = #{fmDate,jdbcType=TIMESTAMP} 
-</if>
-<if test="leaveDate != null">
-and leave_date = #{leaveDate,jdbcType=TIMESTAMP} 
-</if>
-<if test="temperature != null and temperature != ''">
-and temperature = #{temperature,jdbcType=VARCHAR} 
-</if>
-<if test="fitnessDesc != null and fitnessDesc != ''">
-and fitness_desc = #{fitnessDesc,jdbcType=VARCHAR} 
-</if>
-<if test="mentalityDesc != null and mentalityDesc != ''">
-and mentality_desc = #{mentalityDesc,jdbcType=VARCHAR} 
-</if>
-<if test="bpv != null and bpv >= 0">
-and bpv = #{bpv,jdbcType=INTEGER} 
-</if>
-<if test="bpk != null and bpk >= 0">
-and bpk = #{bpk,jdbcType=INTEGER} 
-</if>
-<if test="breast != null and breast != ''">
-and breast = #{breast,jdbcType=VARCHAR} 
-</if>
-<if test="lochia != null and lochia != ''">
-and lochia = #{lochia,jdbcType=VARCHAR} 
-</if>
-<if test="matrix != null and matrix != ''">
-and matrix = #{matrix,jdbcType=VARCHAR} 
-</if>
-<if test="wound != null and wound != ''">
-and wound = #{wound,jdbcType=VARCHAR} 
-</if>
-<if test="otherDesc != null and otherDesc != ''">
-and other_desc = #{otherDesc,jdbcType=VARCHAR} 
-</if>
-<if test="healthType != null and healthType >= 0">
-and health_type = #{healthType,jdbcType=INTEGER} 
-</if>
-<if test="guideSuggest != null and guideSuggest != ''">
-and guide_suggest = #{guideSuggest,jdbcType=VARCHAR} 
-</if>
-<if test="guideOtherDesc != null and guideOtherDesc != ''">
-and guide_other_desc = #{guideOtherDesc,jdbcType=VARCHAR} 
-</if>
-<if test="isReferral != null and isReferral >= 0">
-and is_referral = #{isReferral,jdbcType=INTEGER} 
-</if>
-<if test="referralReason != null and referralReason != ''">
-and referral_reason = #{referralReason,jdbcType=VARCHAR} 
-</if>
-<if test="hospital != null and hospital != ''">
-and hospital = #{hospital,jdbcType=VARCHAR} 
-</if>
-</where>
-</sql>
-
-
-
-<select id="queryPostpartumInfo" resultMap="PostpartumInfoResultMap" parameterType="com.lyms.platform.permission.model.PostpartumInfoQuery">
-select id,post_follow_id,fm_date,leave_date,temperature,fitness_desc,mentality_desc,bpv,bpk,breast,lochia,matrix,wound,other_desc,health_type,guide_suggest,guide_other_desc,is_referral,referral_reason,hospital
- from postpartum_info 
-<include refid="PostpartumInfoCondition" />
-<include refid="orderAndLimit" />
-</select>
-
-
-
-<select id="queryPostpartumInfoCount" resultType="int" parameterType="com.lyms.platform.permission.model.PostpartumInfoQuery">
-select count(1) from postpartum_info
-<include refid="PostpartumInfoCondition" />
-</select>
-
-
-
-</mapper>
\ No newline at end of file
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowModel.java
new file mode 100644
index 0000000..142f4c7
--- /dev/null
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MatdeliverFollowModel.java
@@ -0,0 +1,615 @@
+package com.lyms.platform.pojo;
+
+import com.lyms.platform.common.result.BaseModel;
+import org.springframework.data.mongodb.core.mapping.Document;
+
+import java.util.Date;
+
+/**
+ * 产妇访视
+ */
+@Document(collection = "lyms_matdeliver_follow")
+public class MatdeliverFollowModel extends BaseModel {
+    /**
+     * id
+     */
+    private String id;
+    /**
+     * 医院ID
+     */
+    private String hospitalId;
+    /**
+     * 分娩日期
+     */
+    private Date deliveryDate;
+    /**
+     * 分娩记录id
+     */
+    private String deliverId;
+    /**
+     * 孕妇id
+     */
+    private String parentid;
+    /**
+     * pid
+     */
+    private String pid;
+    /**
+     * 预约联系结果（1-成功、2-失败）
+     */
+    private Integer contactResult;
+    /**
+     * 预约访视类型（1-上门访视、2-电话访视）
+     */
+    private Integer makeType;
+    /**
+     * 预约备注信息
+     */
+    private String makeRemark;
+    /**
+     * 预约操作员
+     */
+    private String makeCreateUser;
+    /**
+     * 预约操作日期
+     */
+    private Date makeCreateDate;
+    /**
+     * 预约失败理由
+     */
+    private Integer contactReason;
+    /**
+     * 预约访视日期
+     */
+    private Date makeVisitDate;
+    /**
+     * 访视结果（1-成功、2-失败）
+     */
+    private Integer visitResult;
+    /**
+     * 访视失败理由（1-无人接听电话、2-上面无人答应、3-改为无人答应、4-其他）
+     */
+    private Integer visitReason;
+    /**
+     * 产妇随访确认
+     */
+    private Integer visitAffirm;
+    /**
+     * 访视日期
+     */
+    private Date visitDate;
+    /**
+     * 访视医生
+     */
+    private String visitDoctor;
+    /**
+     * 访视状态（1-待访视、2-已访视）
+     */
+    private Integer visitStatus;
+    /**
+     * 访视备注
+     */
+    private String visitRemark;
+    /**
+     * 访视操作员
+     */
+    private String visitCreateUser;
+    /**
+     * 访视操作日期
+     */
+    private Date visitCreateDate;
+    /**
+     * 下次访视日期
+     */
+    private Date nextVisitDate;
+    /**
+     * 是否结案 1-未结案、2-已结案
+     */
+    private Integer isClose;
+    /**
+     * 产后随访预约记录id
+     */
+    private String postFollowId;
+    /**
+     * 分娩日期
+     */
+    private Date fmDate;
+    /**
+     * 出院日期
+     */
+    private Date leaveDate;
+    /**
+     * 体温
+     */
+    private String temperature;
+    /**
+     * 一般健康状况
+     */
+    private String fitnessDesc;
+    /**
+     * 一般心理状况
+     */
+    private String mentalityDesc;
+    /**
+     * 血压低
+     */
+    private Integer bpv;
+    /**
+     * 血压高
+     */
+    private Integer bpk;
+    /**
+     * 乳房
+     */
+    private String breast;
+    /**
+     * 恶露
+     */
+    private String lochia;
+    /**
+     * 子宫
+     */
+    private String matrix;
+    /**
+     * 伤口
+     */
+    private String wound;
+    /**
+     * 其他
+     */
+    private String otherDesc;
+    /**
+     * 分类(1-未见异常、2-异常)
+     */
+    private Integer healthType;
+    /**
+     * 指导意见
+     */
+    private String guideSuggest;
+    /**
+     * 指导意见其他
+     */
+    private String guideOtherDesc;
+    /**
+     * 是否转诊转诊（1-无、2-有）
+     */
+    private Integer isRefer;
+    /**
+     * 转诊原因
+     */
+    private String referReason;
+    /**
+     * 科室及机构
+     */
+    private String referHospital;
+
+    public String getId() {
+        return id;
+    }
+
+
+    public void setId(String id) {
+        this.id = id;
+
+    }
+
+    public String getHospitalId() {
+        return hospitalId;
+    }
+
+
+    public void setHospitalId(String hospitalId) {
+        this.hospitalId = hospitalId;
+
+    }
+
+    public Date getDeliveryDate() {
+        return deliveryDate;
+    }
+
+
+    public void setDeliveryDate(Date deliveryDate) {
+        this.deliveryDate = deliveryDate;
+
+    }
+
+    public String getDeliverId() {
+        return deliverId;
+    }
+
+
+    public void setDeliverId(String deliverId) {
+        this.deliverId = deliverId;
+
+    }
+
+    public String getParentid() {
+        return parentid;
+    }
+
+
+    public void setParentid(String parentid) {
+        this.parentid = parentid;
+
+    }
+
+    public String getPid() {
+        return pid;
+    }
+
+
+    public void setPid(String pid) {
+        this.pid = pid;
+
+    }
+
+    public Integer getContactResult() {
+        return contactResult;
+    }
+
+
+    public void setContactResult(Integer contactResult) {
+        this.contactResult = contactResult;
+
+    }
+
+    public Integer getMakeType() {
+        return makeType;
+    }
+
+
+    public void setMakeType(Integer makeType) {
+        this.makeType = makeType;
+
+    }
+
+    public String getMakeRemark() {
+        return makeRemark;
+    }
+
+
+    public void setMakeRemark(String makeRemark) {
+        this.makeRemark = makeRemark;
+
+    }
+
+    public String getMakeCreateUser() {
+        return makeCreateUser;
+    }
+
+
+    public void setMakeCreateUser(String makeCreateUser) {
+        this.makeCreateUser = makeCreateUser;
+
+    }
+
+    public Date getMakeCreateDate() {
+        return makeCreateDate;
+    }
+
+
+    public void setMakeCreateDate(Date makeCreateDate) {
+        this.makeCreateDate = makeCreateDate;
+
+    }
+
+    public Integer getContactReason() {
+        return contactReason;
+    }
+
+
+    public void setContactReason(Integer contactReason) {
+        this.contactReason = contactReason;
+
+    }
+
+    public Date getMakeVisitDate() {
+        return makeVisitDate;
+    }
+
+
+    public void setMakeVisitDate(Date makeVisitDate) {
+        this.makeVisitDate = makeVisitDate;
+
+    }
+
+    public Integer getVisitResult() {
+        return visitResult;
+    }
+
+
+    public void setVisitResult(Integer visitResult) {
+        this.visitResult = visitResult;
+
+    }
+
+    public Integer getVisitReason() {
+        return visitReason;
+    }
+
+
+    public void setVisitReason(Integer visitReason) {
+        this.visitReason = visitReason;
+
+    }
+
+    public Integer getVisitAffirm() {
+        return visitAffirm;
+    }
+
+
+    public void setVisitAffirm(Integer visitAffirm) {
+        this.visitAffirm = visitAffirm;
+
+    }
+
+    public Date getVisitDate() {
+        return visitDate;
+    }
+
+
+    public void setVisitDate(Date visitDate) {
+        this.visitDate = visitDate;
+
+    }
+
+    public String getVisitDoctor() {
+        return visitDoctor;
+    }
+
+
+    public void setVisitDoctor(String visitDoctor) {
+        this.visitDoctor = visitDoctor;
+
+    }
+
+    public Integer getVisitStatus() {
+        return visitStatus;
+    }
+
+
+    public void setVisitStatus(Integer visitStatus) {
+        this.visitStatus = visitStatus;
+
+    }
+
+    public String getVisitRemark() {
+        return visitRemark;
+    }
+
+
+    public void setVisitRemark(String visitRemark) {
+        this.visitRemark = visitRemark;
+
+    }
+
+    public String getVisitCreateUser() {
+        return visitCreateUser;
+    }
+
+
+    public void setVisitCreateUser(String visitCreateUser) {
+        this.visitCreateUser = visitCreateUser;
+
+    }
+
+    public Date getVisitCreateDate() {
+        return visitCreateDate;
+    }
+
+
+    public void setVisitCreateDate(Date visitCreateDate) {
+        this.visitCreateDate = visitCreateDate;
+
+    }
+
+    public Date getNextVisitDate() {
+        return nextVisitDate;
+    }
+
+
+    public void setNextVisitDate(Date nextVisitDate) {
+        this.nextVisitDate = nextVisitDate;
+
+    }
+
+    public Integer getIsClose() {
+        return isClose;
+    }
+
+
+    public void setIsClose(Integer isClose) {
+        this.isClose = isClose;
+
+    }
+
+    public String getPostFollowId() {
+        return postFollowId;
+    }
+
+
+    public void setPostFollowId(String postFollowId) {
+        this.postFollowId = postFollowId;
+
+    }
+
+    public Date getFmDate() {
+        return fmDate;
+    }
+
+
+    public void setFmDate(Date fmDate) {
+        this.fmDate = fmDate;
+
+    }
+
+    public Date getLeaveDate() {
+        return leaveDate;
+    }
+
+
+    public void setLeaveDate(Date leaveDate) {
+        this.leaveDate = leaveDate;
+
+    }
+
+    public String getTemperature() {
+        return temperature;
+    }
+
+
+    public void setTemperature(String temperature) {
+        this.temperature = temperature;
+
+    }
+
+    public String getFitnessDesc() {
+        return fitnessDesc;
+    }
+
+
+    public void setFitnessDesc(String fitnessDesc) {
+        this.fitnessDesc = fitnessDesc;
+
+    }
+
+    public String getMentalityDesc() {
+        return mentalityDesc;
+    }
+
+
+    public void setMentalityDesc(String mentalityDesc) {
+        this.mentalityDesc = mentalityDesc;
+
+    }
+
+    public Integer getBpv() {
+        return bpv;
+    }
+
+
+    public void setBpv(Integer bpv) {
+        this.bpv = bpv;
+
+    }
+
+    public Integer getBpk() {
+        return bpk;
+    }
+
+
+    public void setBpk(Integer bpk) {
+        this.bpk = bpk;
+
+    }
+
+    public String getBreast() {
+        return breast;
+    }
+
+
+    public void setBreast(String breast) {
+        this.breast = breast;
+
+    }
+
+    public String getLochia() {
+        return lochia;
+    }
+
+
+    public void setLochia(String lochia) {
+        this.lochia = lochia;
+
+    }
+
+    public String getMatrix() {
+        return matrix;
+    }
+
+
+    public void setMatrix(String matrix) {
+        this.matrix = matrix;
+
+    }
+
+    public String getWound() {
+        return wound;
+    }
+
+
+    public void setWound(String wound) {
+        this.wound = wound;
+
+    }
+
+    public String getOtherDesc() {
+        return otherDesc;
+    }
+
+
+    public void setOtherDesc(String otherDesc) {
+        this.otherDesc = otherDesc;
+
+    }
+
+    public Integer getHealthType() {
+        return healthType;
+    }
+
+
+    public void setHealthType(Integer healthType) {
+        this.healthType = healthType;
+
+    }
+
+    public String getGuideSuggest() {
+        return guideSuggest;
+    }
+
+
+    public void setGuideSuggest(String guideSuggest) {
+        this.guideSuggest = guideSuggest;
+
+    }
+
+    public String getGuideOtherDesc() {
+        return guideOtherDesc;
+    }
+
+
+    public void setGuideOtherDesc(String guideOtherDesc) {
+        this.guideOtherDesc = guideOtherDesc;
+
+    }
+
+    public Integer getIsRefer() {
+        return isRefer;
+    }
+
+
+    public void setIsRefer(Integer isRefer) {
+        this.isRefer = isRefer;
+
+    }
+
+    public String getReferReason() {
+        return referReason;
+    }
+
+
+    public void setReferReason(String referReason) {
+        this.referReason = referReason;
+
+    }
+
+    public String getReferHospital() {
+        return referHospital;
+    }
+
+
+    public void setReferHospital(String referHospital) {
+        this.referHospital = referHospital;
+
+    }
+}
\ No newline at end of file
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverFollowQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverFollowQuery.java
new file mode 100644
index 0000000..5a91a93
--- /dev/null
+++ b/platform-dal/src/main/java/com/lyms/platform/query/MatDeliverFollowQuery.java
@@ -0,0 +1,565 @@
+package com.lyms.platform.query;
+
+import com.lyms.platform.common.base.IConvertToNativeQuery;
+import com.lyms.platform.common.dao.BaseQuery;
+import com.lyms.platform.common.dao.operator.MongoCondition;
+import com.lyms.platform.common.dao.operator.MongoOper;
+import com.lyms.platform.common.dao.operator.MongoQuery;
+import org.apache.commons.lang.StringUtils;
+
+import java.util.Date;
+
+/**
+ * @auther yangfei
+ * @createTime 2017年11月24日 17时07分
+ * @discription
+ */
+public class MatDeliverFollowQuery extends BaseQuery implements IConvertToNativeQuery {
+    /**
+     * id
+     */
+    private String id;
+    /**
+     * 医院ID
+     */
+    private String hospitalId;
+    /**
+     * 分娩日期
+     */
+    private Date deliveryDate;
+    /**
+     * 分娩记录id
+     */
+    private String deliverId;
+    /**
+     * 孕妇id
+     */
+    private String parentid;
+    /**
+     * pid
+     */
+    private String pid;
+    /**
+     * 预约联系结果（1-成功、2-失败）
+     */
+    private Integer contactResult;
+    /**
+     * 预约访视类型（1-上门访视、2-电话访视）
+     */
+    private Integer makeType;
+    /**
+     * 预约备注信息
+     */
+    private String makeRemark;
+    /**
+     * 预约操作员
+     */
+    private String makeCreateUser;
+    /**
+     * 预约操作日期
+     */
+    private Date makeCreateDate;
+    /**
+     * 预约失败理由
+     */
+    private Integer contactReason;
+    /**
+     * 预约访视日期
+     */
+    private Date makeVisitDate;
+    /**
+     * 访视结果（1-成功、2-失败）
+     */
+    private Integer visitResult;
+    /**
+     * 访视失败理由（1-无人接听电话、2-上面无人答应、3-改为无人答应、4-其他）
+     */
+    private Integer visitReason;
+    /**
+     * 产妇随访确认
+     */
+    private Integer visitAffirm;
+    /**
+     * 访视日期
+     */
+    private Date visitDate;
+    /**
+     * 访视医生
+     */
+    private String visitDoctor;
+    /**
+     * 访视状态（1-待访视、2-已访视）
+     */
+    private Integer visitStatus;
+    /**
+     * 访视备注
+     */
+    private String visitRemark;
+    /**
+     * 访视操作员
+     */
+    private String visitCreateUser;
+    /**
+     * 访视操作日期
+     */
+    private Date visitCreateDate;
+    /**
+     * 下次访视日期
+     */
+    private Date nextVisitDate;
+    /**
+     * 是否结案 1-未结案、2-已结案
+     */
+    private Integer isClose;
+    /**
+     * 产后随访预约记录id
+     */
+    private String postFollowId;
+    /**
+     * 分娩日期
+     */
+    private Date fmDate;
+    /**
+     * 出院日期
+     */
+    private Date leaveDate;
+    /**
+     * 体温
+     */
+    private String temperature;
+    /**
+     * 一般健康状况
+     */
+    private String fitnessDesc;
+    /**
+     * 一般心理状况
+     */
+    private String mentalityDesc;
+    /**
+     * 血压低
+     */
+    private Integer bpv;
+    /**
+     * 血压高
+     */
+    private Integer bpk;
+    /**
+     * 乳房
+     */
+    private String breast;
+    /**
+     * 恶露
+     */
+    private String lochia;
+    /**
+     * 子宫
+     */
+    private String matrix;
+    /**
+     * 伤口
+     */
+    private String wound;
+    /**
+     * 其他
+     */
+    private String otherDesc;
+    /**
+     * 分类(1-未见异常、2-异常)
+     */
+    private Integer healthType;
+    /**
+     * 指导意见
+     */
+    private String guideSuggest;
+    /**
+     * 指导意见其他
+     */
+    private String guideOtherDesc;
+    /**
+     * 是否转诊转诊（1-无、2-有）
+     */
+    private Integer isRefer;
+    /**
+     * 转诊原因
+     */
+    private String referReason;
+    /**
+     * 科室及机构
+     */
+    private String referHospital;
+
+    /**
+     * @return
+     */
+    @Override
+    public MongoQuery convertToQuery() {
+        MongoCondition condition = MongoCondition.newInstance();
+        if (StringUtils.isNotBlank(id)) {
+            condition = condition.and("id", id, MongoOper.IS);
+        }
+        if (StringUtils.isNotBlank(hospitalId)) {
+            condition = condition.and("hospitalId",hospitalId , MongoOper.IS);
+        }
+        if (StringUtils.isNotBlank(deliverId)) {
+            condition = condition.and("deliverId",deliverId , MongoOper.IS);
+        }
+        if (StringUtils.isNotBlank(parentid)) {
+            condition = condition.and("parentid",parentid , MongoOper.IS);
+        }
+        if (StringUtils.isNotBlank(pid)) {
+            condition = condition.and("pid",pid , MongoOper.IS);
+        }
+        if (contactResult!=null) {
+            condition = condition.and("contactResult",contactResult , MongoOper.IS);
+        }
+        if (visitResult!=null) {
+            condition = condition.and("visitResult", visitResult, MongoOper.IS);
+        }
+
+        return condition.toMongoQuery();
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(String hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+
+    public Date getDeliveryDate() {
+        return deliveryDate;
+    }
+
+    public void setDeliveryDate(Date deliveryDate) {
+        this.deliveryDate = deliveryDate;
+    }
+
+    public String getDeliverId() {
+        return deliverId;
+    }
+
+    public void setDeliverId(String deliverId) {
+        this.deliverId = deliverId;
+    }
+
+    public String getParentid() {
+        return parentid;
+    }
+
+    public void setParentid(String parentid) {
+        this.parentid = parentid;
+    }
+
+    public String getPid() {
+        return pid;
+    }
+
+    public void setPid(String pid) {
+        this.pid = pid;
+    }
+
+    public Integer getContactResult() {
+        return contactResult;
+    }
+
+    public void setContactResult(Integer contactResult) {
+        this.contactResult = contactResult;
+    }
+
+    public Integer getMakeType() {
+        return makeType;
+    }
+
+    public void setMakeType(Integer makeType) {
+        this.makeType = makeType;
+    }
+
+    public String getMakeRemark() {
+        return makeRemark;
+    }
+
+    public void setMakeRemark(String makeRemark) {
+        this.makeRemark = makeRemark;
+    }
+
+    public String getMakeCreateUser() {
+        return makeCreateUser;
+    }
+
+    public void setMakeCreateUser(String makeCreateUser) {
+        this.makeCreateUser = makeCreateUser;
+    }
+
+    public Date getMakeCreateDate() {
+        return makeCreateDate;
+    }
+
+    public void setMakeCreateDate(Date makeCreateDate) {
+        this.makeCreateDate = makeCreateDate;
+    }
+
+    public Integer getContactReason() {
+        return contactReason;
+    }
+
+    public void setContactReason(Integer contactReason) {
+        this.contactReason = contactReason;
+    }
+
+    public Date getMakeVisitDate() {
+        return makeVisitDate;
+    }
+
+    public void setMakeVisitDate(Date makeVisitDate) {
+        this.makeVisitDate = makeVisitDate;
+    }
+
+    public Integer getVisitResult() {
+        return visitResult;
+    }
+
+    public void setVisitResult(Integer visitResult) {
+        this.visitResult = visitResult;
+    }
+
+    public Integer getVisitReason() {
+        return visitReason;
+    }
+
+    public void setVisitReason(Integer visitReason) {
+        this.visitReason = visitReason;
+    }
+
+    public Integer getVisitAffirm() {
+        return visitAffirm;
+    }
+
+    public void setVisitAffirm(Integer visitAffirm) {
+        this.visitAffirm = visitAffirm;
+    }
+
+    public Date getVisitDate() {
+        return visitDate;
+    }
+
+    public void setVisitDate(Date visitDate) {
+        this.visitDate = visitDate;
+    }
+
+    public String getVisitDoctor() {
+        return visitDoctor;
+    }
+
+    public void setVisitDoctor(String visitDoctor) {
+        this.visitDoctor = visitDoctor;
+    }
+
+    public Integer getVisitStatus() {
+        return visitStatus;
+    }
+
+    public void setVisitStatus(Integer visitStatus) {
+        this.visitStatus = visitStatus;
+    }
+
+    public String getVisitRemark() {
+        return visitRemark;
+    }
+
+    public void setVisitRemark(String visitRemark) {
+        this.visitRemark = visitRemark;
+    }
+
+    public String getVisitCreateUser() {
+        return visitCreateUser;
+    }
+
+    public void setVisitCreateUser(String visitCreateUser) {
+        this.visitCreateUser = visitCreateUser;
+    }
+
+    public Date getVisitCreateDate() {
+        return visitCreateDate;
+    }
+
+    public void setVisitCreateDate(Date visitCreateDate) {
+        this.visitCreateDate = visitCreateDate;
+    }
+
+    public Date getNextVisitDate() {
+        return nextVisitDate;
+    }
+
+    public void setNextVisitDate(Date nextVisitDate) {
+        this.nextVisitDate = nextVisitDate;
+    }
+
+    public Integer getIsClose() {
+        return isClose;
+    }
+
+    public void setIsClose(Integer isClose) {
+        this.isClose = isClose;
+    }
+
+    public String getPostFollowId() {
+        return postFollowId;
+    }
+
+    public void setPostFollowId(String postFollowId) {
+        this.postFollowId = postFollowId;
+    }
+
+    public Date getFmDate() {
+        return fmDate;
+    }
+
+    public void setFmDate(Date fmDate) {
+        this.fmDate = fmDate;
+    }
+
+    public Date getLeaveDate() {
+        return leaveDate;
+    }
+
+    public void setLeaveDate(Date leaveDate) {
+        this.leaveDate = leaveDate;
+    }
+
+    public String getTemperature() {
+        return temperature;
+    }
+
+    public void setTemperature(String temperature) {
+        this.temperature = temperature;
+    }
+
+    public String getFitnessDesc() {
+        return fitnessDesc;
+    }
+
+    public void setFitnessDesc(String fitnessDesc) {
+        this.fitnessDesc = fitnessDesc;
+    }
+
+    public String getMentalityDesc() {
+        return mentalityDesc;
+    }
+
+    public void setMentalityDesc(String mentalityDesc) {
+        this.mentalityDesc = mentalityDesc;
+    }
+
+    public Integer getBpv() {
+        return bpv;
+    }
+
+    public void setBpv(Integer bpv) {
+        this.bpv = bpv;
+    }
+
+    public Integer getBpk() {
+        return bpk;
+    }
+
+    public void setBpk(Integer bpk) {
+        this.bpk = bpk;
+    }
+
+    public String getBreast() {
+        return breast;
+    }
+
+    public void setBreast(String breast) {
+        this.breast = breast;
+    }
+
+    public String getLochia() {
+        return lochia;
+    }
+
+    public void setLochia(String lochia) {
+        this.lochia = lochia;
+    }
+
+    public String getMatrix() {
+        return matrix;
+    }
+
+    public void setMatrix(String matrix) {
+        this.matrix = matrix;
+    }
+
+    public String getWound() {
+        return wound;
+    }
+
+    public void setWound(String wound) {
+        this.wound = wound;
+    }
+
+    public String getOtherDesc() {
+        return otherDesc;
+    }
+
+    public void setOtherDesc(String otherDesc) {
+        this.otherDesc = otherDesc;
+    }
+
+    public Integer getHealthType() {
+        return healthType;
+    }
+
+    public void setHealthType(Integer healthType) {
+        this.healthType = healthType;
+    }
+
+    public String getGuideSuggest() {
+        return guideSuggest;
+    }
+
+    public void setGuideSuggest(String guideSuggest) {
+        this.guideSuggest = guideSuggest;
+    }
+
+    public String getGuideOtherDesc() {
+        return guideOtherDesc;
+    }
+
+    public void setGuideOtherDesc(String guideOtherDesc) {
+        this.guideOtherDesc = guideOtherDesc;
+    }
+
+    public Integer getIsRefer() {
+        return isRefer;
+    }
+
+    public void setIsRefer(Integer isRefer) {
+        this.isRefer = isRefer;
+    }
+
+    public String getReferReason() {
+        return referReason;
+    }
+
+    public void setReferReason(String referReason) {
+        this.referReason = referReason;
+    }
+
+    public String getReferHospital() {
+        return referHospital;
+    }
+
+    public void setReferHospital(String referHospital) {
+        this.referHospital = referHospital;
+    }
+}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatdeliverFollowController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatdeliverFollowController.java
new file mode 100644
index 0000000..bbb4edd
--- /dev/null
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatdeliverFollowController.java
@@ -0,0 +1,115 @@
+package com.lyms.platform.operate.web.controller;
+
+import com.lyms.platform.common.annotation.TokenRequired;
+import com.lyms.platform.common.base.BaseController;
+import com.lyms.platform.common.base.LoginContext;
+import com.lyms.platform.common.result.BaseListResponse;
+import com.lyms.platform.common.result.BaseResponse;
+import com.lyms.platform.operate.web.facade.MatdeliverFollowFacade;
+import com.lyms.platform.operate.web.request.MatDeliverFollowAddRequest;
+import com.lyms.platform.operate.web.request.PostpartumFollowMakeRequest;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * <p>
+ * 产后随访预约记录  前端控制器
+ * </p>
+ *
+ * @author yangfei
+ * @since 2017-11-21
+ */
+@Controller
+@RequestMapping("/postpartumFollowMake")
+public class MatdeliverFollowController extends BaseController {
+    @Autowired
+    private MatdeliverFollowFacade matdeliverFollowFacade;
+
+    /**
+     * 初始化接口
+     *
+     * @return
+     */
+    @ResponseBody
+    @TokenRequired
+    @RequestMapping(value = "/init", method = RequestMethod.GET)
+    public BaseResponse postpartumFollowMakeInit(HttpServletRequest request) {
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+
+        return matdeliverFollowFacade.postpartumFollowMakeInit(loginState.getId());
+    }
+
+    /**
+     * 新增产后随访详情
+     *
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @TokenRequired
+    @RequestMapping(value = "/addPostpartumInfo", method = RequestMethod.POST)
+    public BaseResponse addPostpartumInfo(HttpServletRequest request, MatDeliverFollowAddRequest matDeliverFollowAddRequest) {
+        Integer userId = getUserId(request);
+        return matdeliverFollowFacade.addMatDeliverFollow(matDeliverFollowAddRequest, userId);
+    }
+
+    // /**
+    //  * 查询分娩记录、随访记录
+    //  * @param pid 产妇pid
+    //  * @param id 分娩记录id
+    //  * @param request
+    //  * @return
+    //  */
+    // @ResponseBody
+    // @TokenRequired
+    // @RequestMapping(method = RequestMethod.GET)
+    // public BaseResponse findpostpartumFollowMakeList(String pid, String id, HttpServletRequest request) {
+    //     LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+    //
+    //     return postpartumFollowMakeFacade.findPostpartumFollowMakeList(pid, id, loginState.getId());
+    // }
+
+    // @ResponseBody
+    // @TokenRequired
+    // @RequestMapping(method = RequestMethod.POST)
+    // public BaseResponse addOrUpdatePostpartumFollowMake(PostpartumFollowMake ps, HttpServletRequest request) {
+    //     LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+    //     try {
+    //         if (StringUtils.isEmpty(ps.getId())) {
+    //             return postpartumFollowMakeFacade.addPostpartumFollowMake(ps, loginState.getId());
+    //         } else {
+    //             return postpartumFollowMakeFacade.updatePostpartumFollowMake(ps, loginState.getId());
+    //         }
+    //     } catch (Exception e) {
+    //         BaseResponse baseResponse = new BaseResponse();
+    //         baseResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
+    //         baseResponse.setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION);
+    //         return baseResponse;
+    //     }
+    //
+    // }
+
+    // @ResponseBody
+    // @TokenRequired
+    // @RequestMapping(value = "/{id}", method = RequestMethod.GET)
+    // public BaseResponse findOnePostpartumFollowMake(@PathVariable String id) {
+    //     return postpartumFollowMakeFacade.findOnePostpartumFollowMake(id);
+    // }
+
+    @ResponseBody
+    @TokenRequired
+    @RequestMapping(value = "/list", method = RequestMethod.GET)
+    public BaseListResponse getPostpartumFollowMake(
+            PostpartumFollowMakeRequest postpartumFollowMakeRequest,
+            HttpServletRequest request
+    ) {
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
+        return matdeliverFollowFacade.getPostpartumFollowMake(postpartumFollowMakeRequest, loginState.getId());
+    }
+
+}
\ No newline at end of file
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostpartumFollowMakeController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostpartumFollowMakeController.java
deleted file mode 100644
index 2476ae8..0000000
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostpartumFollowMakeController.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.lyms.platform.operate.web.controller;
-
-import com.lyms.platform.common.annotation.TokenRequired;
-import com.lyms.platform.common.base.BaseController;
-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.StringUtils;
-import com.lyms.platform.operate.web.facade.PostpartumFollowMakeFacade;
-import com.lyms.platform.operate.web.request.PostpartumFollowMakeRequest;
-import com.lyms.platform.permission.model.PostpartumFollowMake;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * <p>
- * 产后随访预约记录  前端控制器
- * </p>
- *
- * @author yangfei
- * @since 2017-11-21
- */
-@Controller
-@RequestMapping("/postpartumFollowMake")
-public class PostpartumFollowMakeController extends BaseController {
-    @Autowired
-    private PostpartumFollowMakeFacade postpartumFollowMakeFacade;
-
-    /**
-     * 初始化接口
-     *
-     * @return
-     */
-    @ResponseBody
-    @TokenRequired
-    @RequestMapping(value = "/init", method = RequestMethod.GET)
-    public BaseResponse postpartumFollowMakeInit(HttpServletRequest request) {
-        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
-
-        return postpartumFollowMakeFacade.postpartumFollowMakeInit(loginState.getId());
-    }
-
-    /**
-     * @param pid
-     * @param request
-     * @return
-     */
-    @ResponseBody
-    @TokenRequired
-    @RequestMapping(method = RequestMethod.GET)
-    public BaseResponse findPatientServiceList(String pid, HttpServletRequest request) {
-        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
-        return postpartumFollowMakeFacade.findPostpartumFollowMakeList(pid, loginState.getId());
-    }
-
-    @ResponseBody
-    @TokenRequired
-    @RequestMapping(method = RequestMethod.POST)
-    public BaseResponse addOrUpdatePostpartumFollowMake(PostpartumFollowMake ps, HttpServletRequest request) {
-        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
-        try {
-            if (StringUtils.isEmpty(ps.getId())) {
-                return postpartumFollowMakeFacade.addPostpartumFollowMake(ps, loginState.getId());
-            } else {
-                return postpartumFollowMakeFacade.updatePostpartumFollowMake(ps, loginState.getId());
-            }
-        } catch (Exception e) {
-            BaseResponse baseResponse = new BaseResponse();
-            baseResponse.setErrorcode(ErrorCodeConstants.SYSTEM_ERROR);
-            baseResponse.setErrormsg(ErrorCodeConstants.SYSTEM_ERROR_DESCRIPTION);
-            return baseResponse;
-        }
-
-    }
-
-    @ResponseBody
-    @TokenRequired
-    @RequestMapping(value = "/{id}", method = RequestMethod.GET)
-    public BaseResponse findOnePostpartumFollowMake(@PathVariable String id) {
-        return postpartumFollowMakeFacade.findOnePostpartumFollowMake(id);
-    }
-
-    @ResponseBody
-    @TokenRequired
-    @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public BaseListResponse getPostpartumFollowMake(
-            PostpartumFollowMakeRequest postpartumFollowMakeRequest,
-            HttpServletRequest request
-    ) {
-        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
-        return postpartumFollowMakeFacade.getPostpartumFollowMake(postpartumFollowMakeRequest, loginState.getId());
-    }
-
-}
\ No newline at end of file
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostpartumInfoController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostpartumInfoController.java
deleted file mode 100644
index 9bd9cc2..0000000
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PostpartumInfoController.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.lyms.platform.operate.web.controller;
-
-import com.lyms.platform.common.base.BaseController;
-import com.lyms.platform.common.result.BaseResponse;
-import com.lyms.platform.operate.web.facade.PostpartumInfoFacade;
-import com.lyms.platform.permission.model.PostpartumInfo;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import javax.servlet.http.HttpServletRequest;
-
-/**
- * <p>
- * 产后随访详情  前端控制器
- * </p>
- *
- * @author yangfei
- * @since 2017-11-24
- */
-@Controller
-@RequestMapping("/postpartumInfo")
-public class PostpartumInfoController extends BaseController {
-    @Autowired
-	private PostpartumInfoFacade postpartumInfoFacade;
-
-    /**
-     * 新增产后随访详情
-     * @param request
-     * @param postpartumInfo
-     * @return
-     */
-    public BaseResponse addPostpartumInfo(HttpServletRequest request,PostpartumInfo postpartumInfo){
-        Integer userId = getUserId(request);
-        return postpartumInfoFacade.addPostpartumInfo(postpartumInfo,userId);
-    }
-}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java
new file mode 100644
index 0000000..28b2f57
--- /dev/null
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatdeliverFollowFacade.java
@@ -0,0 +1,126 @@
+package com.lyms.platform.operate.web.facade;
+
+import com.lyms.platform.biz.service.MatDeliverFollowService;
+import com.lyms.platform.biz.service.MatDeliverService;
+import com.lyms.platform.biz.service.PatientsService;
+import com.lyms.platform.common.constants.ErrorCodeConstants;
+import com.lyms.platform.common.enums.PostpartumFollowMakeEnums;
+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.DateUtil;
+import com.lyms.platform.operate.web.request.MatDeliverFollowAddRequest;
+import com.lyms.platform.operate.web.request.PostpartumFollowMakeRequest;
+import com.lyms.platform.operate.web.result.PostpartumFollowResult;
+import com.lyms.platform.operate.web.utils.CollectionUtils;
+import com.lyms.platform.pojo.MatdeliverFollowModel;
+import com.lyms.platform.pojo.MaternalDeliverModel;
+import com.lyms.platform.query.MatDeliverFollowQuery;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @auther yangfei
+ * @createTime 2017年11月21日 16时26分
+ * @discription 产妇随访记录控制器
+ */
+@Component
+public class MatdeliverFollowFacade {
+    @Autowired
+    private MatDeliverFollowService matDeliverFollowService;
+    @Autowired
+    private MatDeliverService matDeliverService;
+    @Autowired
+    private PatientsService patientsService;
+    @Autowired
+    private AutoMatchFacade autoMatchFacade;
+    @Autowired
+    private MatDeliverFacade matDeliverFacade;
+
+
+    public BaseResponse postpartumFollowMakeInit(Integer id) {
+        Map map = new HashMap();
+        //是否结案
+        map.put("isClose", PostpartumFollowMakeEnums.getIsCloseEnum());
+        //预约失败理由
+        map.put("contactReason", PostpartumFollowMakeEnums.getReasonEnum());
+        //访视结果
+        map.put("visitResult", PostpartumFollowMakeEnums.getResultEnum());
+        //访视状态（1-待访视、2-已访视）
+        map.put("visitStatus", PostpartumFollowMakeEnums.getStatusEnum());
+
+        return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setData(map);
+    }
+
+    public BaseResponse findPostpartumFollowMakeList(String pid, String id, Integer userId) {
+        BaseResponse baseResponse = new BaseResponse();
+        // String hospitalId = autoMatchFacade.getHospitalId(userId);
+        //分娩记录
+        MaternalDeliverModel maternalDeliverModel = matDeliverService.getOneMatDeliver(id);
+        List<Map<String,String>> resutList = new ArrayList<>();
+
+        if (maternalDeliverModel != null) {
+            Map<String, String> map = new HashMap<>();
+            map.put("time", maternalDeliverModel.getDueDate());
+            map.put("title", "分娩记录");
+            map.put("id", id);
+            //分娩记录类型
+            map.put("type", "1");
+            resutList.add(map);
+        }
+        MatDeliverFollowQuery mfQuery = new MatDeliverFollowQuery();
+        mfQuery.setPid(pid);
+        List<MatdeliverFollowModel> maternalDeliverList = matDeliverFollowService.query(mfQuery);
+        if(CollectionUtils.isNotEmpty(maternalDeliverList)){
+            for (MatdeliverFollowModel md : maternalDeliverList){
+                Map<String, String> map = new HashMap<>();
+                map.put("time", DateUtil.getyyyy_MM_dd(md.getVisitCreateDate()));
+                map.put("title", "访视记录");
+                map.put("id", id);
+                //访视记录类型
+                map.put("type","2");
+                resutList.add(map);
+            }
+        }
+        baseResponse.setErrorcode(ErrorCodeConstants.SUCCESS);
+        baseResponse.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION);
+        baseResponse.setObject(resutList);
+        return baseResponse;
+    }
+
+
+    public BaseListResponse getPostpartumFollowMake(PostpartumFollowMakeRequest postpartumFollowMakeRequest, Integer id) {
+        BaseListResponse baseListResponse = new BaseListResponse();
+        String hospitalId = autoMatchFacade.getHospitalId(id);
+        postpartumFollowMakeRequest.setOperatorId(id);
+        //如果有访视状态、产妇随访确认、联系结果、联系失败原因就先查询预约随访记录表，根据pid进行查分娩信息。
+        if (postpartumFollowMakeRequest.getVisitResult() != null || postpartumFollowMakeRequest.getContactResult() != null
+                || postpartumFollowMakeRequest.getContactReason() != null || postpartumFollowMakeRequest.getVisitAffirm() != null) {
+
+        } else {//查询孕妇表，type=3
+            postpartumFollowMakeRequest.setIsArea("area");
+            baseListResponse = matDeliverFacade.postpartumDeliver(postpartumFollowMakeRequest);
+        }
+        if (baseListResponse.getObject() != null) {
+            List<PostpartumFollowResult> postpartumFollowResults = (List<PostpartumFollowResult>) baseListResponse.getObject();
+            List<String> patientIds = new ArrayList<>();
+            for (PostpartumFollowResult pf : postpartumFollowResults) {
+                patientIds.add(pf.getPatientId());
+            }
+            //根据In查询，进行grunp by patientId,进行排序
+
+            //返回结果，进行前端开发
+        }
+        return baseListResponse;
+    }
+
+    public BaseResponse addMatDeliverFollow(MatDeliverFollowAddRequest matDeliverFollowAddRequest, Integer userId) {
+        BaseResponse baseResponse = new BaseResponse();
+        return baseResponse;
+    }
+}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
index 5f9b808..bb3cee3 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceFacade.java
@@ -112,11 +112,19 @@ public class PatientServiceFacade {
      * @return
      */
     public BaseResponse findPatientServiceList(String pid, Integer id) {
+
+        //查询档案信息
+        Patients patients = patientsService.findOnePatientById(pid);
+        if(patients!=null){
+            //如果有数据源id，取主档案id
+            if(StringUtils.isNotEmpty(patients.getSource())){
+                pid = patients.getSource();
+            }
+        }
+
         //根据用户id获取医院ID
         // String hospitalId = autoMatchFacade.getHospitalId(id);
         PatientServiceQuery patientQuery = new PatientServiceQuery();
-        //显示所有医院
-        // patientQuery.setHospitalId(hospitalId);
         patientQuery.setParentid(pid);
         patientQuery.setSort("create_date desc");
         List<PatientService> patientServices = patientServiceService.queryPatientService(patientQuery);
@@ -176,15 +184,21 @@ public class PatientServiceFacade {
             }
 
             Patients patients = patientsService.findOnePatientById(ps.getParentid());
+
+
             PatientService pser = new PatientService();
             pser.setCreateUser(ps.getCreateUser());
             pser.setCreateDate(ps.getCreateDate());
             pser.setParentid(ps.getParentid());
             if (patients != null) {
                 pser.setPid(patients.getPid());
+                //如果有数据源id，取主档案id
+                if(StringUtils.isNotEmpty(patients.getSource())){
+                    pser.setParentid(patients.getSource());
+                }
             }
             pser.setId(UUID.randomUUID().toString().replace("-", ""));
-
+            //开通医院
             pser.setHospitalId(hospitalId);
             //默认开通状态
             pser.setSerStatus(PatientSerEnums.SerStatusEnums.kt.getId());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java
index c095871..a6fc847 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientServiceSysFacade.java
@@ -1,5 +1,6 @@
 package com.lyms.platform.operate.web.facade;
 
+import com.lyms.platform.biz.service.PatientsService;
 import com.lyms.platform.common.constants.ErrorCodeConstants;
 import com.lyms.platform.common.enums.PatientSerEnums;
 import com.lyms.platform.common.result.BaseResponse;
@@ -7,6 +8,7 @@ import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.permission.model.PatientService;
 import com.lyms.platform.permission.model.PatientServiceQuery;
 import com.lyms.platform.permission.service.PatientServiceService;
+import com.lyms.platform.pojo.Patients;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.apache.commons.collections.CollectionUtils;
@@ -26,6 +28,8 @@ import java.util.UUID;
 public class PatientServiceSysFacade implements SysBaseFacade {
     @Autowired
     private PatientServiceService patientServiceService;
+    @Autowired
+    private PatientsService patientsService;
 
     @Override
     public BaseResponse execute(String synForm) {
@@ -39,16 +43,26 @@ public class PatientServiceSysFacade implements SysBaseFacade {
             if (baseResponse.getErrorcode() != ErrorCodeConstants.SUCCESS) {
                 return baseResponse;
             }
+
+            //查询档案信息
+            Patients patients = patientsService.findOnePatientById(patientService.getParentid());
+            if(patients!=null){
+                //如果有数据源id，取主档案id
+                if(StringUtils.isNotEmpty(patients.getSource())){
+                    patientService.setParentid(patients.getSource());
+                }
+            }
+
             //先根据孕妇id和开通服务类型、开通医生进行查询，如果已经开通过则开通失败
             PatientServiceQuery patientQuery = new PatientServiceQuery();
             //开通医院
-            patientQuery.setHospitalId(patientService.getHospitalId());
-            //孕妇Id
+            // patientQuery.setHospitalId(patientService.getHospitalId());
+            //根据孕妇主档案Id进行查询
             patientQuery.setParentid(patientService.getParentid());
             //开通服务
             patientQuery.setSerType(patientService.getSerType());
             //开通医院
-            patientQuery.setHospitalId(patientService.getHospitalId());
+            // patientQuery.setHospitalId(patientService.getHospitalId());
             List<PatientService> patientServices = patientServiceService.queryPatientService(patientQuery);
             if (CollectionUtils.isNotEmpty(patientServices)) {//修改
                 PatientService ps = patientServices.get(0);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumFollowMakeFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumFollowMakeFacade.java
deleted file mode 100644
index 5066be5..0000000
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumFollowMakeFacade.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.lyms.platform.operate.web.facade;
-
-import com.lyms.platform.common.constants.ErrorCodeConstants;
-import com.lyms.platform.common.enums.PostpartumFollowMakeEnums;
-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.operate.web.request.PostpartumFollowMakeRequest;
-import com.lyms.platform.operate.web.result.PostpartumFollowResult;
-import com.lyms.platform.permission.model.PostpartumFollowMake;
-import com.lyms.platform.permission.service.PostpartumFollowMakeService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @auther yangfei
- * @createTime 2017年11月21日 16时26分
- * @discription
- */
-@Component
-public class PostpartumFollowMakeFacade {
-    @Autowired
-    private PostpartumFollowMakeService postpartumFollowMakeService;
-    @Autowired
-    private MatDeliverFacade matDeliverFacade;
-
-    @Autowired
-    private AutoMatchFacade autoMatchFacade;
-
-    public BaseResponse postpartumFollowMakeInit(Integer id) {
-        Map map = new HashMap();
-        //是否结案
-        map.put("isClose", PostpartumFollowMakeEnums.getIsCloseEnum());
-        //预约失败理由
-        map.put("contactReason", PostpartumFollowMakeEnums.getReasonEnum());
-        //访视结果
-        map.put("visitResult", PostpartumFollowMakeEnums.getResultEnum());
-        //访视状态（1-待访视、2-已访视）
-        map.put("visitStatus", PostpartumFollowMakeEnums.getStatusEnum());
-
-        return new BaseObjectResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setData(map);
-    }
-
-    public BaseResponse findPostpartumFollowMakeList(String pid, Integer id) {
-        return null;
-    }
-
-    public BaseResponse addPostpartumFollowMake(PostpartumFollowMake ps, Integer id) {
-        return null;
-    }
-
-    public BaseResponse updatePostpartumFollowMake(PostpartumFollowMake ps, Integer id) {
-        return null;
-    }
-
-    public BaseResponse findOnePostpartumFollowMake(String id) {
-        return null;
-    }
-
-    public BaseListResponse getPostpartumFollowMake( PostpartumFollowMakeRequest postpartumFollowMakeRequest, Integer id) {
-        BaseListResponse baseListResponse = new BaseListResponse();
-        String hospitalId = autoMatchFacade.getHospitalId(id);
-        postpartumFollowMakeRequest.setOperatorId(id);
-        //如果有访视状态、产妇随访确认、联系结果、联系失败原因就先查询预约随访记录表，根据pid进行查分娩信息。
-        if (postpartumFollowMakeRequest.getVisitResult()!=null||postpartumFollowMakeRequest.getContactResult()!=null
-                || postpartumFollowMakeRequest.getContactReason()!=null|| postpartumFollowMakeRequest.getVisitAffirm()!=null){
-
-        }else{//查询孕妇表，type=3
-            postpartumFollowMakeRequest.setIsArea("area");
-            baseListResponse = matDeliverFacade.postpartumDeliver(postpartumFollowMakeRequest);
-        }
-        if(baseListResponse.getObject()!=null){
-            List<PostpartumFollowResult> postpartumFollowResults = (List<PostpartumFollowResult>) baseListResponse.getObject();
-            List<String> patientIds = new ArrayList<>();
-            for(PostpartumFollowResult pf:postpartumFollowResults){
-                patientIds.add(pf.getPatientId());
-            }
-            //根据In查询，进行grunp by patientId,进行排序
-
-            //返回结果，进行前端开发
-        }
-        return baseListResponse;
-    }
-}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumInfoFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumInfoFacade.java
deleted file mode 100644
index d1fcd05..0000000
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PostpartumInfoFacade.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.lyms.platform.operate.web.facade;
-
-import com.lyms.platform.common.constants.ErrorCodeConstants;
-import com.lyms.platform.common.result.BaseResponse;
-import com.lyms.platform.permission.model.PostpartumInfo;
-import com.lyms.platform.permission.service.PostpartumInfoService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.UUID;
-
-/**
- * @auther yangfei
- * @createTime 2017年11月24日 11时04分
- * @discription 随访详情对象
- */
-@Component
-public class PostpartumInfoFacade {
-
-    @Autowired
-    private PostpartumInfoService postpartumInfoService;
-    /**
-     * 新增随访详情数据
-     * @param postpartumInfo
-     * @param userId
-     * @return
-     */
-    public BaseResponse addPostpartumInfo(PostpartumInfo postpartumInfo, Integer userId) {
-        BaseResponse baseResponse = new BaseResponse();
-        postpartumInfo.setId(UUID.randomUUID().toString().replace("-", ""));
-
-        postpartumInfoService.addPostpartumInfo(postpartumInfo);
-        baseResponse.setErrormsg(ErrorCodeConstants.SUCCESS_DESCRIPTION).setErrorcode(ErrorCodeConstants.SUCCESS);
-        return baseResponse;
-    }
-}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowAddRequest.java
new file mode 100644
index 0000000..1aeef0f
--- /dev/null
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowAddRequest.java
@@ -0,0 +1,543 @@
+package com.lyms.platform.operate.web.request;
+
+import com.lyms.platform.common.base.IBasicRequestConvert;
+import com.lyms.platform.pojo.MatdeliverFollowModel;
+import org.springframework.beans.BeanUtils;
+
+import java.util.Date;
+
+/**
+ * @auther yangfei
+ * @createTime 2017年11月24日 17时21分
+ * @discription
+ */
+public class MatDeliverFollowAddRequest implements IBasicRequestConvert<MatdeliverFollowModel> {
+    /**
+     * id
+     */
+    private String id;
+    /**
+     * 医院ID
+     */
+    private String hospitalId;
+    /**
+     * 分娩日期
+     */
+    private Date deliveryDate;
+    /**
+     * 分娩记录id
+     */
+    private String deliverId;
+    /**
+     * 孕妇id
+     */
+    private String parentid;
+    /**
+     * pid
+     */
+    private String pid;
+    /**
+     * 预约联系结果（1-成功、2-失败）
+     */
+    private Integer contactResult;
+    /**
+     * 预约访视类型（1-上门访视、2-电话访视）
+     */
+    private Integer makeType;
+    /**
+     * 预约备注信息
+     */
+    private String makeRemark;
+    /**
+     * 预约操作员
+     */
+    private String makeCreateUser;
+    /**
+     * 预约操作日期
+     */
+    private Date makeCreateDate;
+    /**
+     * 预约失败理由
+     */
+    private Integer contactReason;
+    /**
+     * 预约访视日期
+     */
+    private Date makeVisitDate;
+    /**
+     * 访视结果（1-成功、2-失败）
+     */
+    private Integer visitResult;
+    /**
+     * 访视失败理由（1-无人接听电话、2-上面无人答应、3-改为无人答应、4-其他）
+     */
+    private Integer visitReason;
+    /**
+     * 产妇随访确认
+     */
+    private Integer visitAffirm;
+    /**
+     * 访视日期
+     */
+    private Date visitDate;
+    /**
+     * 访视医生
+     */
+    private String visitDoctor;
+    /**
+     * 访视状态（1-待访视、2-已访视）
+     */
+    private Integer visitStatus;
+    /**
+     * 访视备注
+     */
+    private String visitRemark;
+    /**
+     * 访视操作员
+     */
+    private String visitCreateUser;
+    /**
+     * 访视操作日期
+     */
+    private Date visitCreateDate;
+    /**
+     * 下次访视日期
+     */
+    private Date nextVisitDate;
+    /**
+     * 是否结案 1-未结案、2-已结案
+     */
+    private Integer isClose;
+    /**
+     * 产后随访预约记录id
+     */
+    private String postFollowId;
+    /**
+     * 分娩日期
+     */
+    private Date fmDate;
+    /**
+     * 出院日期
+     */
+    private Date leaveDate;
+    /**
+     * 体温
+     */
+    private String temperature;
+    /**
+     * 一般健康状况
+     */
+    private String fitnessDesc;
+    /**
+     * 一般心理状况
+     */
+    private String mentalityDesc;
+    /**
+     * 血压低
+     */
+    private Integer bpv;
+    /**
+     * 血压高
+     */
+    private Integer bpk;
+    /**
+     * 乳房
+     */
+    private String breast;
+    /**
+     * 恶露
+     */
+    private String lochia;
+    /**
+     * 子宫
+     */
+    private String matrix;
+    /**
+     * 伤口
+     */
+    private String wound;
+    /**
+     * 其他
+     */
+    private String otherDesc;
+    /**
+     * 分类(1-未见异常、2-异常)
+     */
+    private Integer healthType;
+    /**
+     * 指导意见
+     */
+    private String guideSuggest;
+    /**
+     * 指导意见其他
+     */
+    private String guideOtherDesc;
+    /**
+     * 是否转诊转诊（1-无、2-有）
+     */
+    private Integer isRefer;
+    /**
+     * 转诊原因
+     */
+    private String referReason;
+    /**
+     * 科室及机构
+     */
+    private String referHospital;
+
+    /**
+     * 具体转换实现
+     *
+     * @return 转换后的model
+     */
+    @Override
+    public MatdeliverFollowModel convertToDataModel() {
+        MatdeliverFollowModel matdeliverFollowModel = new MatdeliverFollowModel();
+        BeanUtils.copyProperties(this,matdeliverFollowModel);
+        return matdeliverFollowModel;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getHospitalId() {
+        return hospitalId;
+    }
+
+    public void setHospitalId(String hospitalId) {
+        this.hospitalId = hospitalId;
+    }
+
+    public Date getDeliveryDate() {
+        return deliveryDate;
+    }
+
+    public void setDeliveryDate(Date deliveryDate) {
+        this.deliveryDate = deliveryDate;
+    }
+
+    public String getDeliverId() {
+        return deliverId;
+    }
+
+    public void setDeliverId(String deliverId) {
+        this.deliverId = deliverId;
+    }
+
+    public String getParentid() {
+        return parentid;
+    }
+
+    public void setParentid(String parentid) {
+        this.parentid = parentid;
+    }
+
+    public String getPid() {
+        return pid;
+    }
+
+    public void setPid(String pid) {
+        this.pid = pid;
+    }
+
+    public Integer getContactResult() {
+        return contactResult;
+    }
+
+    public void setContactResult(Integer contactResult) {
+        this.contactResult = contactResult;
+    }
+
+    public Integer getMakeType() {
+        return makeType;
+    }
+
+    public void setMakeType(Integer makeType) {
+        this.makeType = makeType;
+    }
+
+    public String getMakeRemark() {
+        return makeRemark;
+    }
+
+    public void setMakeRemark(String makeRemark) {
+        this.makeRemark = makeRemark;
+    }
+
+    public String getMakeCreateUser() {
+        return makeCreateUser;
+    }
+
+    public void setMakeCreateUser(String makeCreateUser) {
+        this.makeCreateUser = makeCreateUser;
+    }
+
+    public Date getMakeCreateDate() {
+        return makeCreateDate;
+    }
+
+    public void setMakeCreateDate(Date makeCreateDate) {
+        this.makeCreateDate = makeCreateDate;
+    }
+
+    public Integer getContactReason() {
+        return contactReason;
+    }
+
+    public void setContactReason(Integer contactReason) {
+        this.contactReason = contactReason;
+    }
+
+    public Date getMakeVisitDate() {
+        return makeVisitDate;
+    }
+
+    public void setMakeVisitDate(Date makeVisitDate) {
+        this.makeVisitDate = makeVisitDate;
+    }
+
+    public Integer getVisitResult() {
+        return visitResult;
+    }
+
+    public void setVisitResult(Integer visitResult) {
+        this.visitResult = visitResult;
+    }
+
+    public Integer getVisitReason() {
+        return visitReason;
+    }
+
+    public void setVisitReason(Integer visitReason) {
+        this.visitReason = visitReason;
+    }
+
+    public Integer getVisitAffirm() {
+        return visitAffirm;
+    }
+
+    public void setVisitAffirm(Integer visitAffirm) {
+        this.visitAffirm = visitAffirm;
+    }
+
+    public Date getVisitDate() {
+        return visitDate;
+    }
+
+    public void setVisitDate(Date visitDate) {
+        this.visitDate = visitDate;
+    }
+
+    public String getVisitDoctor() {
+        return visitDoctor;
+    }
+
+    public void setVisitDoctor(String visitDoctor) {
+        this.visitDoctor = visitDoctor;
+    }
+
+    public Integer getVisitStatus() {
+        return visitStatus;
+    }
+
+    public void setVisitStatus(Integer visitStatus) {
+        this.visitStatus = visitStatus;
+    }
+
+    public String getVisitRemark() {
+        return visitRemark;
+    }
+
+    public void setVisitRemark(String visitRemark) {
+        this.visitRemark = visitRemark;
+    }
+
+    public String getVisitCreateUser() {
+        return visitCreateUser;
+    }
+
+    public void setVisitCreateUser(String visitCreateUser) {
+        this.visitCreateUser = visitCreateUser;
+    }
+
+    public Date getVisitCreateDate() {
+        return visitCreateDate;
+    }
+
+    public void setVisitCreateDate(Date visitCreateDate) {
+        this.visitCreateDate = visitCreateDate;
+    }
+
+    public Date getNextVisitDate() {
+        return nextVisitDate;
+    }
+
+    public void setNextVisitDate(Date nextVisitDate) {
+        this.nextVisitDate = nextVisitDate;
+    }
+
+    public Integer getIsClose() {
+        return isClose;
+    }
+
+    public void setIsClose(Integer isClose) {
+        this.isClose = isClose;
+    }
+
+    public String getPostFollowId() {
+        return postFollowId;
+    }
+
+    public void setPostFollowId(String postFollowId) {
+        this.postFollowId = postFollowId;
+    }
+
+    public Date getFmDate() {
+        return fmDate;
+    }
+
+    public void setFmDate(Date fmDate) {
+        this.fmDate = fmDate;
+    }
+
+    public Date getLeaveDate() {
+        return leaveDate;
+    }
+
+    public void setLeaveDate(Date leaveDate) {
+        this.leaveDate = leaveDate;
+    }
+
+    public String getTemperature() {
+        return temperature;
+    }
+
+    public void setTemperature(String temperature) {
+        this.temperature = temperature;
+    }
+
+    public String getFitnessDesc() {
+        return fitnessDesc;
+    }
+
+    public void setFitnessDesc(String fitnessDesc) {
+        this.fitnessDesc = fitnessDesc;
+    }
+
+    public String getMentalityDesc() {
+        return mentalityDesc;
+    }
+
+    public void setMentalityDesc(String mentalityDesc) {
+        this.mentalityDesc = mentalityDesc;
+    }
+
+    public Integer getBpv() {
+        return bpv;
+    }
+
+    public void setBpv(Integer bpv) {
+        this.bpv = bpv;
+    }
+
+    public Integer getBpk() {
+        return bpk;
+    }
+
+    public void setBpk(Integer bpk) {
+        this.bpk = bpk;
+    }
+
+    public String getBreast() {
+        return breast;
+    }
+
+    public void setBreast(String breast) {
+        this.breast = breast;
+    }
+
+    public String getLochia() {
+        return lochia;
+    }
+
+    public void setLochia(String lochia) {
+        this.lochia = lochia;
+    }
+
+    public String getMatrix() {
+        return matrix;
+    }
+
+    public void setMatrix(String matrix) {
+        this.matrix = matrix;
+    }
+
+    public String getWound() {
+        return wound;
+    }
+
+    public void setWound(String wound) {
+        this.wound = wound;
+    }
+
+    public String getOtherDesc() {
+        return otherDesc;
+    }
+
+    public void setOtherDesc(String otherDesc) {
+        this.otherDesc = otherDesc;
+    }
+
+    public Integer getHealthType() {
+        return healthType;
+    }
+
+    public void setHealthType(Integer healthType) {
+        this.healthType = healthType;
+    }
+
+    public String getGuideSuggest() {
+        return guideSuggest;
+    }
+
+    public void setGuideSuggest(String guideSuggest) {
+        this.guideSuggest = guideSuggest;
+    }
+
+    public String getGuideOtherDesc() {
+        return guideOtherDesc;
+    }
+
+    public void setGuideOtherDesc(String guideOtherDesc) {
+        this.guideOtherDesc = guideOtherDesc;
+    }
+
+    public Integer getIsRefer() {
+        return isRefer;
+    }
+
+    public void setIsRefer(Integer isRefer) {
+        this.isRefer = isRefer;
+    }
+
+    public String getReferReason() {
+        return referReason;
+    }
+
+    public void setReferReason(String referReason) {
+        this.referReason = referReason;
+    }
+
+    public String getReferHospital() {
+        return referHospital;
+    }
+
+    public void setReferHospital(String referHospital) {
+        this.referHospital = referHospital;
+    }
+}
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowQueryRequest.java
new file mode 100644
index 0000000..ff467c3
--- /dev/null
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverFollowQueryRequest.java
@@ -0,0 +1,9 @@
+package com.lyms.platform.operate.web.request;
+
+/**
+ * @auther yangfei
+ * @createTime 2017年11月24日 17时22分
+ * @discription
+ */
+public class MatDeliverFollowQueryRequest {
+}