diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskConfMapper.java b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskConfMapper.java
index 5b9078a..5318358 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskConfMapper.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskConfMapper.java
@@ -2,6 +2,7 @@ package com.lyms.base.common.dao.conf;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
 import org.springframework.stereotype.Repository;
 
@@ -43,4 +44,6 @@ public interface HighriskConfMapper extends BaseMapper<HighriskConf> {
 	 */
 	public List<HighriskConf> selectBySource(String sourceId);
 
+    public List<Map<String, String>> getColorListByVersion(Serializable versionId);
+
 }
\ No newline at end of file
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskConfMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskConfMapper.xml
index d6004c6..7e2f340 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskConfMapper.xml
+++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskConfMapper.xml
@@ -31,5 +31,12 @@
 		select <include refid="Base_Column_List" /> from HIGHRISK_CONF where SOURCE_ID=#{sourceId}	
     </select>
     
+     <!-- 根据版本获取所有高危颜色-->
+    <select id="getColorListByVersion" resultType="Map">
+    	SELECT COLORCODE,COLORTEXT FROM HIGHRISK_CONF c WHERE COLORCODE IN(
+    		SELECT MAX(COLORCODE) FROM HIGHRISK_CONF where c.VERSION_ID = #{versionId}
+    		and c.ENABLE = 1 GROUP BY COLORTEXT)
+    </select>
+    
     
 </mapper>
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/organ/SysOrganizationsConfMapper.java b/parent/base.common/src/main/java/com/lyms/base/common/dao/organ/SysOrganizationsConfMapper.java
new file mode 100644
index 0000000..6eb2367
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/organ/SysOrganizationsConfMapper.java
@@ -0,0 +1,20 @@
+package com.lyms.base.common.dao.organ;
+
+import com.lyms.base.common.entity.organ.SysOrganizationsConf;
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.springframework.stereotype.Repository;
+import java.io.Serializable;
+/**
+ * <p>
+ * Mapper接口
+ * </p>
+ *
+ * @author fangcheng
+ * @since 2017-03-31
+ */
+@Repository
+public interface SysOrganizationsConfMapper extends BaseMapper<SysOrganizationsConf> {
+
+  public Integer deleteLogicById(Serializable id);
+
+}
\ No newline at end of file
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/sys/SysDictMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/sys/SysDictMapper.xml
index 1a28bd0..a19d426 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/dao/sys/SysDictMapper.xml
+++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/sys/SysDictMapper.xml
@@ -16,7 +16,7 @@
         ID AS id, PID AS pid, TYPECODE AS typecode, TXT AS txt, ENABLE AS enable
     </sql>
     
-    <!-- 根据uid获取用户的权限列表-->
+    <!-- 根据typecode获取字典列表-->
     <select id="getDictListByTypeCode" resultType="SysDict">
 		select <include refid="Base_Column_List"></include> from SYS_DICT t where t.PID in 
 		(select id from SYS_DICT where TYPECODE = #{typeCode})
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskConfService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskConfService.java
index 025f70b..cfa44bf 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskConfService.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskConfService.java
@@ -2,6 +2,7 @@ package com.lyms.base.common.service.conf;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
 import com.lyms.base.common.entity.conf.HighriskConf;
 import com.lyms.exception.SystemException;
@@ -67,5 +68,16 @@ public interface HighriskConfService extends BaseService<HighriskConf> {
 	 * <li>修改时间：
 	 */
 	public List<HighriskConf> getHighriskConfBySourceId(String sourceId);
+	
+	 /** 
+	 * <li>@Description:TODO(方法描述)
+	 * <li>@param versionid
+	 * <li>@return
+	 * <li>创建人：方承
+	 * <li>创建时间：2017年3月31日
+	 * <li>修改人：
+	 * <li>修改时间：
+	 */  
+	public List<Map<String,String>> getColorListByVersion(Serializable versionId); 
 
 }
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskConfServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskConfServiceImpl.java
index 8e371be..fbc2186 100644
--- a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskConfServiceImpl.java
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskConfServiceImpl.java
@@ -2,6 +2,7 @@ package com.lyms.base.common.service.conf.impl;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -89,4 +90,9 @@ public class HighriskConfServiceImpl extends ServiceImpl<HighriskConfMapper, Hig
 		return confMapper.selectBySource(sourceId);
 	}
 
+    @Override
+    public List<Map<String, String>> getColorListByVersion(Serializable versionId) {
+        return confMapper.getColorListByVersion(versionId);
+    }
+
 }
diff --git a/parent/hospital.web/src/test/java/test/hospital/highrisk/HighriskVersionTest.java b/parent/hospital.web/src/test/java/test/hospital/highrisk/HighriskVersionTest.java
new file mode 100644
index 0000000..e2b89b8
--- /dev/null
+++ b/parent/hospital.web/src/test/java/test/hospital/highrisk/HighriskVersionTest.java
@@ -0,0 +1,144 @@
+package test.hospital.highrisk;
+
+import java.util.List;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.lyms.base.common.entity.conf.HighriskConf;
+import com.lyms.base.common.entity.conf.HighriskSource;
+import com.lyms.base.common.entity.conf.HighriskVersion;
+import com.lyms.base.common.service.conf.HighriskConfService;
+import com.lyms.base.common.service.conf.HighriskSourceService;
+import com.lyms.base.common.service.conf.HighriskVersionService;
+
+import test.hospital.BaseServiceTest;
+
+public class HighriskVersionTest extends BaseServiceTest {
+
+	@Autowired
+	private HighriskVersionService highriskVersionService;
+
+	@Autowired
+	private HighriskSourceService highriskSourceService;
+
+	@Autowired
+	private HighriskConfService highriskConfService;
+
+	private HighriskVersion version = null;
+
+	@Before
+	public void init() {
+		version = new HighriskVersion();
+		version.setName("center-1.0");
+	}
+
+	/**
+	 * <li>@Description: 启用 / 禁用版本号
+	 * <li>
+	 * <li>创建人：maliang
+	 * <li>创建时间：2017年3月29日
+	 * <li>修改人：
+	 * <li>修改时间：
+	 */
+	@Test
+	public void enable() {
+		String id = "0EDDB06729CE48FF84CC6188231A6ECE";
+		boolean tag = highriskVersionService.enable(id);
+		Assert.assertTrue(tag);
+	}
+
+	/**
+	 * 
+	 * <li>@Description:创建资源
+	 * <li>@return
+	 * <li>创建人：maliang
+	 * <li>创建时间：2017年3月29日
+	 * <li>修改人：
+	 * <li>修改时间：
+	 */
+	public String createSource() {
+		HighriskSource source = new HighriskSource();
+		source.setName("高危资源");
+		source.setType("1");
+		return highriskSourceService.createHighriskSource(source);
+	}
+
+	/**
+	 * <li>@Description:创建版本测试
+	 * <li>
+	 * <li>创建人：maliang
+	 * <li>创建时间：2017年3月29日
+	 * <li>修改人：
+	 * <li>修改时间：
+	 */
+	public String createVersion() {
+		String id = highriskVersionService.createVersion(version);
+		return id;
+	}
+
+	// @Transactional
+	@Test
+	public void createConfig() {
+		HighriskConf highriskConf = new HighriskConf();
+		highriskConf.setSourceId(createSource());
+		highriskConf.setVersionId(createVersion());
+		highriskConf.setColorcode("ys001");
+		highriskConf.setColortext("颜色编码1");
+		highriskConf.setGrade(5D);
+		highriskConf.setGrouporder(1);
+		highriskConf.setName("颜色");
+		highriskConf.setItemorder(1);
+
+		highriskConfService.createHighriskConf(highriskConf);
+	}
+
+	/**
+	 * <li>@Description:根据source ID获取高危信息
+	 * <li>
+	 * <li>创建人：maliang
+	 * <li>创建时间：2017年3月29日
+	 * <li>修改人：
+	 * <li>修改时间：
+	 */
+	@Test
+	public void getConfigBySourceId() {
+		String id = "0CFB58C5748247008D5C3421DDB753ED";
+		List<HighriskConf> configs = highriskConfService.getHighriskConfBySourceId(id);
+		System.out.println(ToStringBuilder.reflectionToString(configs));
+		this.print(configs);
+	}
+
+	/**
+	 * <li>@Description:根据version ID获取高危信息
+	 * <li>
+	 * <li>创建人：maliang
+	 * <li>创建时间：2017年3月29日
+	 * <li>修改人：
+	 * <li>修改时间：
+	 */
+	@Test
+	public void getConfigByVersionId() {
+		String id = "71839AE8C94B4ACA9A694DD93338CD00";
+		List<HighriskConf> configs = highriskConfService.getHighriskConfByVersionId(id);
+		this.print(configs);
+	}
+
+	private void print(List<HighriskConf> configs) {
+		if (CollectionUtils.isEmpty(configs))
+			return;
+		for (HighriskConf conf : configs) {
+			System.out.println(conf.getName());
+		}
+	}
+	
+	@Test
+	public void getColorListByVersion(){
+	    outJson(highriskConfService.getColorListByVersion("71839AE8C94B4ACA9A694DD93338CD00"));
+	}
+
+}
diff --git a/parent/hospital.web/src/test/java/test/hospital/service/HighriskVersionTest.java b/parent/hospital.web/src/test/java/test/hospital/service/HighriskVersionTest.java
deleted file mode 100644
index bac08f1..0000000
--- a/parent/hospital.web/src/test/java/test/hospital/service/HighriskVersionTest.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package test.hospital.service;
-
-import java.util.List;
-
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import com.lyms.base.common.entity.conf.HighriskConf;
-import com.lyms.base.common.entity.conf.HighriskSource;
-import com.lyms.base.common.entity.conf.HighriskVersion;
-import com.lyms.base.common.service.conf.HighriskConfService;
-import com.lyms.base.common.service.conf.HighriskSourceService;
-import com.lyms.base.common.service.conf.HighriskVersionService;
-
-import test.hospital.BaseServiceTest;
-
-public class HighriskVersionTest extends BaseServiceTest {
-
-	@Autowired
-	private HighriskVersionService highriskVersionService;
-
-	@Autowired
-	private HighriskSourceService highriskSourceService;
-
-	@Autowired
-	private HighriskConfService highriskConfService;
-
-	private HighriskVersion version = null;
-
-	@Before
-	public void init() {
-		version = new HighriskVersion();
-		version.setName("center-1.0");
-	}
-
-	/**
-	 * <li>@Description: 启用 / 禁用版本号
-	 * <li>
-	 * <li>创建人：maliang
-	 * <li>创建时间：2017年3月29日
-	 * <li>修改人：
-	 * <li>修改时间：
-	 */
-	@Test
-	public void enable() {
-		String id = "0EDDB06729CE48FF84CC6188231A6ECE";
-		boolean tag = highriskVersionService.enable(id);
-		Assert.assertTrue(tag);
-	}
-
-	/**
-	 * 
-	 * <li>@Description:创建资源
-	 * <li>@return
-	 * <li>创建人：maliang
-	 * <li>创建时间：2017年3月29日
-	 * <li>修改人：
-	 * <li>修改时间：
-	 */
-	public String createSource() {
-		HighriskSource source = new HighriskSource();
-		source.setName("高危资源");
-		source.setType("1");
-		return highriskSourceService.createHighriskSource(source);
-	}
-
-	/**
-	 * <li>@Description:创建版本测试
-	 * <li>
-	 * <li>创建人：maliang
-	 * <li>创建时间：2017年3月29日
-	 * <li>修改人：
-	 * <li>修改时间：
-	 */
-	public String createVersion() {
-		String id = highriskVersionService.createVersion(version);
-		return id;
-	}
-
-	// @Transactional
-	@Test
-	public void createConfig() {
-		HighriskConf highriskConf = new HighriskConf();
-		highriskConf.setSourceId(createSource());
-		highriskConf.setVersionId(createVersion());
-		highriskConf.setColorcode("ys001");
-		highriskConf.setColortext("颜色编码1");
-		highriskConf.setGrade(5D);
-		highriskConf.setGrouporder(1);
-		highriskConf.setName("颜色");
-		highriskConf.setItemorder(1);
-
-		highriskConfService.createHighriskConf(highriskConf);
-	}
-
-	/**
-	 * <li>@Description:根据source ID获取高危信息
-	 * <li>
-	 * <li>创建人：maliang
-	 * <li>创建时间：2017年3月29日
-	 * <li>修改人：
-	 * <li>修改时间：
-	 */
-	@Test
-	public void getConfigBySourceId() {
-		String id = "0CFB58C5748247008D5C3421DDB753ED";
-		List<HighriskConf> configs = highriskConfService.getHighriskConfBySourceId(id);
-		System.out.println(ToStringBuilder.reflectionToString(configs));
-		this.print(configs);
-	}
-
-	/**
-	 * <li>@Description:根据version ID获取高危信息
-	 * <li>
-	 * <li>创建人：maliang
-	 * <li>创建时间：2017年3月29日
-	 * <li>修改人：
-	 * <li>修改时间：
-	 */
-	@Test
-	public void getConfigByVersionId() {
-		String id = "71839AE8C94B4ACA9A694DD93338CD00";
-		List<HighriskConf> configs = highriskConfService.getHighriskConfByVersionId(id);
-		this.print(configs);
-	}
-
-	private void print(List<HighriskConf> configs) {
-		if (CollectionUtils.isEmpty(configs))
-			return;
-		for (HighriskConf conf : configs) {
-			System.out.println(conf.getName());
-		}
-	}
-
-}