From 825145c844318a53044eb54f438fe5ad02e8a88d Mon Sep 17 00:00:00 2001
From: fangcheng <fangcheng@lymsh.com>
Date: Thu, 27 Apr 2017 09:32:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0personid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/woman/WomanFetationRecordMapper.java       | 11 ++++++++-
 .../dao/woman/WomanFetationRecordMapper.xml        |  7 ++++++
 .../hospital/entity/childbirth/ChildbirthInfo.java | 13 ++++++++++-
 .../com/lyms/hospital/entity/leave/LeaveInfo.java  | 11 +++++++++
 .../hospital/entity/recheck/PostpartumRee.java     | 11 +++++++++
 .../hospital/entity/woman/WomanFetationRecord.java | 27 ++++++++++++++++++++++
 .../lyms/hospital/entity/woman/WomanRecord.java    | 12 +++++++++-
 7 files changed, 89 insertions(+), 3 deletions(-)

diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/woman/WomanFetationRecordMapper.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/woman/WomanFetationRecordMapper.java
index 08983fa..760715b 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/woman/WomanFetationRecordMapper.java
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/woman/WomanFetationRecordMapper.java
@@ -49,6 +49,15 @@ public interface WomanFetationRecordMapper extends BaseMapper<WomanFetationRecor
 	public WomanFetationRecord selectDetailById(String id);
 	
 	
-	 public List<FetationStages> getFetationStages(Serializable personId);
+	 /** 
+	 * <li>@Description:根据居民表id获取用户产程记录
+	 * <li>@param personId
+	 * <li>@return
+	 * <li>创建人：方承
+	 * <li>创建时间：2017年4月26日
+	 * <li>修改人：
+	 * <li>修改时间：
+	 */  
+	public List<FetationStages> getFetationStages(Serializable personId);
 
 }
\ No newline at end of file
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 3cdcd3b..8d74ffd 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
@@ -100,4 +100,11 @@ CONCAT(CONTACT_POSTPARTUM_PROVINCE,CONTACT_POSTPARTUM_CITY,CONTACT_POSTPARTUM_AR
  FROM WOMAN_FETATION_RECORD WHERE ID = #{id}
     </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>
+    
 </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 acbd45d..26080c5 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
@@ -24,7 +24,18 @@ public class ChildbirthInfo implements Serializable {
 	 */
 	@TableId(value="ID")
 	private String id;
-	/**
+	
+	@TableId(value="PERSON_ID")
+    private String personId;
+	public String getPersonId() {
+        return personId;
+    }
+
+    public void setPersonId(String personId) {
+        this.personId = personId;
+    }
+
+    /**
 	 * 孕妇ID
 	 */
 	@TableField(value="WOMAN_ID")
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 3235370..454518b 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
@@ -24,6 +24,9 @@ public class LeaveInfo implements Serializable {
 	 */
 	@TableId(value="ID")
 	private String id;
+	
+	@TableId(value="PERSON_ID")
+    private String personId;
 	/**
 	 * 孕妇ID
 	 */
@@ -345,4 +348,12 @@ public class LeaveInfo implements Serializable {
 		this.enable = enable;
 	}
 
+    public String getPersonId() {
+        return personId;
+    }
+
+    public void setPersonId(String personId) {
+        this.personId = personId;
+    }
+
 }
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 a2fc4ed..3c0b089 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
@@ -24,6 +24,9 @@ public class PostpartumRee implements Serializable {
 	 */
 	@TableId(value="ID")
 	private String id;
+	
+	@TableId(value="PERSON_ID")
+    private String personId;
 	/**
 	 * 孕妇ID
 	 */
@@ -473,6 +476,14 @@ public class PostpartumRee implements Serializable {
 	public void setWomanAge(Integer womanAge) {
 		this.womanAge = womanAge;
 	}
+
+    public String getPersonId() {
+        return personId;
+    }
+
+    public void setPersonId(String personId) {
+        this.personId = personId;
+    }
 	
 
 }
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 ebda89b..5276b8b 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
@@ -24,6 +24,9 @@ public class WomanFetationRecord implements Serializable {
 	 */
 	@TableId(value="ID")
 	private String id;
+	
+	@TableId(value="PERSON_ID")
+	private String personId;
 	/**
 	 * 孕妇姓名
 	 */
@@ -840,6 +843,30 @@ public class WomanFetationRecord implements Serializable {
     public void setFmDate(Date fmDate) {
         this.fmDate = fmDate;
     }
+
+    public String getPersonId() {
+        return personId;
+    }
+
+    public void setPersonId(String personId) {
+        this.personId = personId;
+    }
+
+    public Integer getIfautofm() {
+        return ifautofm;
+    }
+
+    public void setIfautofm(Integer ifautofm) {
+        this.ifautofm = ifautofm;
+    }
+
+    public Integer getState() {
+        return state;
+    }
+
+    public void setState(Integer state) {
+        this.state = state;
+    }
 	
 
 }
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 5bfe58e..dd9ef86 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,17 @@ public class WomanRecord implements Serializable {
 	 */
 	@TableId(value="ID")
 	private String id;
-	/**
+	@TableId(value="PERSON_ID")
+    private String personId;
+	public String getPersonId() {
+        return personId;
+    }
+
+    public void setPersonId(String personId) {
+        this.personId = personId;
+    }
+
+    /**
 	 * 孕妇姓名
 	 */
 	@TableField(value="BASE_WOMAN_NAME")
-- 
1.8.3.1