diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/history/HistoryMapsMapper.xml b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/history/HistoryMapsMapper.xml
index b5b82f9..91a5426 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/history/HistoryMapsMapper.xml
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/history/HistoryMapsMapper.xml
@@ -4,13 +4,14 @@
 
 	<!-- 通用查询映射结果 -->
 	<resultMap id="BaseResultMap" type="com.lyms.hospital.entity.history.HistoryMaps">
-		<result column="ID" property="id" />
+		<id column="ID" property="id" />
 		<result column="WOMAN_ID" property="womanId" />
 		<result column="SOUCE_ID" property="souceId" />
+		<result column="OTHER_TXT" property="otherTxt" />
 	</resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        ID AS id, WOMAN_ID AS womanId, SOUCE_ID AS souceId
+        ID AS id, WOMAN_ID AS womanId, SOUCE_ID AS souceId, OTHER_TXT AS otherTxt
     </sql>
 </mapper>
diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/history/HistorySourceMapper.xml b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/history/HistorySourceMapper.xml
index cd62222..7f0e4ae 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/history/HistorySourceMapper.xml
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/history/HistorySourceMapper.xml
@@ -4,7 +4,7 @@
 
 	<!-- 通用查询映射结果 -->
 	<resultMap id="BaseResultMap" type="com.lyms.hospital.entity.history.HistorySource">
-		<result column="ID" property="id" />
+		<id column="ID" property="id" />
 		<result column="PID" property="pid" />
 		<result column="NAME" property="name" />
 		<result column="TYPE" property="type" />
diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/history/HistoryMaps.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/history/HistoryMaps.java
index ba60c3d..8d05847 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/history/HistoryMaps.java
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/history/HistoryMaps.java
@@ -33,6 +33,11 @@ public class HistoryMaps implements Serializable {
 	 */
 	@TableField(value="SOUCE_ID")
 	private String souceId;
+	/**
+	 * 其他情况下保存用户输入的txt
+	 */
+	@TableField(value="OTHER_TXT")
+	private String otherTxt;
 
 
 	public String getId() {
@@ -59,4 +64,12 @@ public class HistoryMaps implements Serializable {
 		this.souceId = souceId;
 	}
 
+	public String getOtherTxt() {
+		return otherTxt;
+	}
+
+	public void setOtherTxt(String otherTxt) {
+		this.otherTxt = otherTxt;
+	}
+
 }
diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/history/HistorySource.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/history/HistorySource.java
index 350f614..261a87e 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/history/HistorySource.java
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/history/HistorySource.java
@@ -21,7 +21,7 @@ public class HistorySource implements Serializable {
 	/**
 	 * 
 	 */
-    @TableId(value="ID")
+	@TableId(value="ID")
 	private String id;
 	/**
 	 * 本表上级ID
diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/filtrate/FiltrateRecordService.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/filtrate/FiltrateRecordService.java
index ef8643b..bba288c 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/filtrate/FiltrateRecordService.java
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/filtrate/FiltrateRecordService.java
@@ -14,11 +14,55 @@ import java.io.Serializable;
  */
 public interface FiltrateRecordService extends BaseService<FiltrateRecord> {
 
-  /** 
+    /** 
     * <li>@Description:逻辑删除，ifDel = 1 为删除，否则为没有删除
     * <li>@param id 删除主键id
     * <li>@return 大于0修改成功，否则为失败
     */
-  public Integer deleteLogicById(Serializable id);
-	
+    public Integer deleteLogicById(Serializable id);
+
+    /** 
+    * <li>@Description:孕妇档案转移到产筛档案，状态为“未申请产筛”
+    * <li>@param womanId 妇女档案id
+    * <li>@return
+    * <li>创建人：方承
+    * <li>创建时间：2017年3月28日
+    * <li>修改人：
+    * <li>修改时间：
+    */
+    public boolean shiftToFiltrate(Serializable womanId);
+
+    /** 
+    * <li>@Description:申请产筛，将STATE设置为待产筛
+    * <li>@param filtrateRecord 产筛档案表对象
+    * <li>@return
+    * <li>创建人：方承
+    * <li>创建时间：2017年3月28日
+    * <li>修改人：
+    * <li>修改时间：
+    */
+    public boolean applyFiltrate(FiltrateRecord filtrateRecord);
+
+    /** 
+     * <li>@Description:产筛结果录入
+     * <li>@param filtrateRecord 产筛档案表对象
+     * <li>@return
+     * <li>创建人：方承
+     * <li>创建时间：2017年3月28日
+     * <li>修改人：
+     * <li>修改时间：
+     */
+    public boolean writeFiltrateResult(FiltrateRecord filtrateRecord);
+
+    /** 
+     * <li>@Description:诊断结果录入
+     * <li>@param filtrateRecord 产筛档案表对象
+     * <li>@return
+     * <li>创建人：方承
+     * <li>创建时间：2017年3月28日
+     * <li>修改人：
+     * <li>修改时间：
+     */
+    public boolean writeDiagnoseResult(FiltrateRecord filtrateRecord);
+
 }
diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/filtrate/impl/FiltrateRecordServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/filtrate/impl/FiltrateRecordServiceImpl.java
index 5782630..4906045 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/filtrate/impl/FiltrateRecordServiceImpl.java
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/filtrate/impl/FiltrateRecordServiceImpl.java
@@ -21,4 +21,27 @@ public class FiltrateRecordServiceImpl extends ServiceImpl<FiltrateRecordMapper,
 	public Integer deleteLogicById(Serializable id){
 	    return baseMapper.deleteLogicById(id);
 	}
+
+    @Override
+    public boolean shiftToFiltrate(Serializable womanId) {
+        // TODO Auto-generated method stub
+        return false;
+    }
+
+    @Override
+    public boolean applyFiltrate(FiltrateRecord filtrateRecord) {
+       return updateById(filtrateRecord);
+    }
+
+    @Override
+    public boolean writeFiltrateResult(FiltrateRecord filtrateRecord) {
+        return updateById(filtrateRecord);
+    }
+
+    @Override
+    public boolean writeDiagnoseResult(FiltrateRecord filtrateRecord) {
+        return updateById(filtrateRecord);
+    }
+
+
 }