diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/woman/WomanFetationRecordMapper.xml b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/woman/WomanFetationRecordMapper.xml
index ef15ef8..09e1d70 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/woman/WomanFetationRecordMapper.xml
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/woman/WomanFetationRecordMapper.xml
@@ -101,10 +101,33 @@ CONCAT(CONTACT_POSTPARTUM_PROVINCE,CONTACT_POSTPARTUM_CITY,CONTACT_POSTPARTUM_AR
     </select>
     
     
-    <select id="getFetationStages" resultMap="HighriskMapsResult">
-		select 
-			<include refid="Maps_Column_List"></include>
-		from HIGHRISK_MAPS m left join HIGHRISK_CONF c on m.SOURCE_ID = c.SOURCE_ID where m.DIAGNOSE_ID = #{id}
+    <select id="getFetationStages" resultType="com.lyms.hospital.entity.woman.FetationStages">
+		select al.*,o.`NAME` as hospitalName from (
+					select  f.id,'孕妇建档' as title,BUILD_DATE as checkTime,1 as type,f.HOSTPITAL_ID as hospitalId  from WOMAN_FETATION_RECORD f
+					where WOMAN_PERSON_ID = #{personId} and f.ID = f.SOURCE_ID
+				union all 
+					select tt.id,title,tt.DIAGNOSE_TIME as checkTime,CASE type
+											WHEN 0 THEN 2
+											WHEN 1 THEN 3 else null end as type,tt.org_id as hospitalId
+								from ( 
+											select CASE type
+														WHEN 0 THEN '初诊p'
+														WHEN 1 THEN '复诊' else null end as title,d.* from DIAGNOSE_INFO d  
+											where PERSON_ID = #{personId} 
+								) tt
+				union all 
+					select c.id,'孕妇分娩' as title,CHILDBIRTH_TIME as checkTime,4 as type,c.org_id as hospitalId from CHILDBIRTH_INFO c 
+			    where PERSON_ID = #{personId} 
+				union all
+					select id,'自动分娩' as title,FM_DATE as checkTime,5 as type,-1 as hospitalId from WOMAN_FETATION_RECORD f  
+		      where PERSON_ID = #{personId} and f.ID = f.SOURCE_ID and f.ifautofm = 1 
+				union all
+					select l.id,'出院小结' as title,leave_TIME as checkTime,6 as type,l.org_id as hospitalId from LEAVE_INFO l 
+		      where PERSON_ID = #{personId} 
+				union all
+					select r.id,'产后复查' as title,REE_TIME as checkTime,7 as type,r.org_id as hospitalId  from POSTPARTUM_REE r
+		      where PERSON_ID = #{personId} 
+		) al left join SYS_ORGANIZATIONS o on al.hospitalId = o.ID order by al.checkTime desc,al.type asc
 	</select>
     
 </mapper>
diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/childbirth/ChildbirthInfo.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/childbirth/ChildbirthInfo.java
index 5ff0203..fc650e0 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/childbirth/ChildbirthInfo.java
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/childbirth/ChildbirthInfo.java
@@ -25,7 +25,7 @@ public class ChildbirthInfo implements Serializable {
 	@TableId(value="ID")
 	private String id;
 	
-	@TableId(value="PERSON_ID")
+	@TableField(value="PERSON_ID")
     private String personId;
 	public String getPersonId() {
         return personId;
diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/leave/LeaveInfo.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/leave/LeaveInfo.java
index 1fc4c49..469cf64 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/leave/LeaveInfo.java
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/leave/LeaveInfo.java
@@ -25,7 +25,7 @@ public class LeaveInfo implements Serializable {
 	@TableId(value="ID")
 	private String id;
 	
-	@TableId(value="PERSON_ID")
+	@TableField(value="PERSON_ID")
     private String personId;
 	/**
 	 * 孕妇ID
diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/recheck/PostpartumRee.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/recheck/PostpartumRee.java
index 7dae400..47c919e 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/recheck/PostpartumRee.java
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/recheck/PostpartumRee.java
@@ -25,7 +25,7 @@ public class PostpartumRee implements Serializable {
 	@TableId(value="ID")
 	private String id;
 	
-	@TableId(value="PERSON_ID")
+	@TableField(value="PERSON_ID")
     private String personId;
 	/**
 	 * 孕妇ID
diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanFetationRecord.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanFetationRecord.java
index 12fe2bc..8019ed3 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanFetationRecord.java
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanFetationRecord.java
@@ -27,8 +27,6 @@ public class WomanFetationRecord implements Serializable {
 	@TableId(value="ID")
 	private String id;
 	
-	@TableId(value="PERSON_ID")
-	private String personId;
 	/**
 	 * 孕妇姓名
 	 */
@@ -851,14 +849,6 @@ public class WomanFetationRecord implements Serializable {
         this.fmDate = fmDate;
     }
 
-    public String getPersonId() {
-        return personId;
-    }
-
-    public void setPersonId(String personId) {
-        this.personId = personId;
-    }
-
     public Integer getIfautofm() {
         return ifautofm;
     }
diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanRecord.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanRecord.java
index 8f2fbad..720d833 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanRecord.java
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/entity/woman/WomanRecord.java
@@ -24,7 +24,7 @@ public class WomanRecord implements Serializable {
 	 */
 	@TableId(value="ID")
 	private String id;
-	@TableId(value="PERSON_ID")
+	@TableField(value="PERSON_ID")
     private String personId;
 	public String getPersonId() {
         return personId;