diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.java
index b80a3f1..dad7e68 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.java
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.java
@@ -23,5 +23,28 @@ public interface DiagnoseInfoMapper extends BaseMapper<DiagnoseInfo> {
   public List<HighriskConf> getLastHighrisk(Serializable personId);
   
   public List<DiagnoseConf> getLastDiagnose(Serializable personId);
+  
+  /** 
+   * <li>@Description:根据诊断id获取高危项
+   * <li>@param id
+   * <li>@return
+   * <li>创建人：方承
+   * <li>创建时间：2017年5月8日
+   * <li>修改人：
+   * <li>修改时间：
+   */  
+  public List<HighriskConf> getHighriskByDiagnoseId(Serializable id);
+  
+  
+  /** 
+   * <li>@Description:根据诊断id获取诊断项
+   * <li>@param id
+   * <li>@return
+   * <li>创建人：方承
+   * <li>创建时间：2017年5月8日
+   * <li>修改人：
+   * <li>修改时间：
+   */  
+  public List<HighriskConf> getDiagnoseByDiagnoseId(Serializable id);
 
 }
\ No newline at end of file
diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.xml b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.xml
index 3aada17..fd9c1af 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.xml
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/dao/diagnose/DiagnoseInfoMapper.xml
@@ -116,4 +116,24 @@
 		) m  left join DIAGNOSE_CONF c on m.CONF_ID = c.id
 		
 	</select>
+	
+	<select id="getHighriskByDiagnoseId" resultType="HighriskConf">
+		select c.* from (
+			select m.* from HIGHRISK_MAPS m where m.DIAGNOSE_ID in (
+				select id from (
+						select * from DIAGNOSE_INFO d where d.id = #{id} 
+				) as t
+			) 
+		) m  left join HIGHRISK_CONF c on m.CONF_ID = c.id
+	</select>
+	
+	<select id="getDiagnoseByDiagnoseId" resultType="DiagnoseConf">
+		select c.* from (
+			select m.* from DIAGNOSE_MAPS m where m.DIAGNOSE_ID in (
+				select id from (
+						select * from DIAGNOSE_INFO d where d.id = #{id} 
+				) as t
+			) 
+		) m  left join DIAGNOSE_CONF c on m.CONF_ID = c.id
+	</select>
 </mapper>
diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java
index 75d09fb..d608bae 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/DiagnoseInfoService.java
@@ -87,5 +87,29 @@ public interface DiagnoseInfoService extends BaseService<DiagnoseInfo> {
      * <li>修改时间：
      */  
     public List<DiagnoseConf> getLastDiagnose(Serializable personId);
+    
+    
+    /** 
+     * <li>@Description:根据诊断id获取高危项
+     * <li>@param id
+     * <li>@return
+     * <li>创建人：方承
+     * <li>创建时间：2017年5月8日
+     * <li>修改人：
+     * <li>修改时间：
+     */  
+    public List<HighriskConf> getHighriskByDiagnoseId(Serializable id);
+    
+    
+    /** 
+     * <li>@Description:根据诊断id获取诊断项
+     * <li>@param id
+     * <li>@return
+     * <li>创建人：方承
+     * <li>创建时间：2017年5月8日
+     * <li>修改人：
+     * <li>修改时间：
+     */  
+    public List<HighriskConf> getDiagnoseByDiagnoseId(Serializable id);
 
 }
diff --git a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java
index af19f16..f711887 100644
--- a/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java
+++ b/parent/hospital.mac/src/main/java/com/lyms/hospital/service/diagnose/impl/DiagnoseInfoServiceImpl.java
@@ -194,4 +194,14 @@ public class DiagnoseInfoServiceImpl extends ServiceImpl<DiagnoseInfoMapper, Dia
     public List<DiagnoseConf> getLastDiagnose(Serializable personId) {
         return baseMapper.getLastDiagnose(personId);
     }
+
+    @Override
+    public List<HighriskConf> getHighriskByDiagnoseId(Serializable id) {
+        return baseMapper.getHighriskByDiagnoseId(id);
+    }
+
+    @Override
+    public List<HighriskConf> getDiagnoseByDiagnoseId(Serializable id) {
+        return baseMapper.getDiagnoseByDiagnoseId(id);
+    }
 }
\ No newline at end of file