diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/DiagnoseConfMapper.java b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/DiagnoseConfMapper.java
new file mode 100644
index 0000000..77cabda
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/DiagnoseConfMapper.java
@@ -0,0 +1,23 @@
+package com.lyms.base.common.dao.conf;
+
+import java.io.Serializable;
+
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.lyms.base.common.entity.conf.DiagnoseConf;
+
+/**
+ *
+ * Mapper接口
+ *
+ *
+ * @author maliang
+ * @since 2017-03-28
+ */
+@Repository
+public interface DiagnoseConfMapper extends BaseMapper {
+
+ 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/conf/DiagnoseConfMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/DiagnoseConfMapper.xml
new file mode 100644
index 0000000..b4d1856
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/DiagnoseConfMapper.xml
@@ -0,0 +1,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, SOURCE_ID AS sourceId, VERSION_ID AS versionId, NAME AS name, COLORCODE AS colorcode, COLORTEXT AS colortext, GROUPORDER AS grouporder, ITEMORDER AS itemorder, GRADE AS grade, ENABLE AS enable
+
+
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
new file mode 100644
index 0000000..766a273
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskConfMapper.java
@@ -0,0 +1,35 @@
+package com.lyms.base.common.dao.conf;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.lyms.base.common.entity.conf.HighriskConf;
+
+/**
+ *
+ * Mapper接口
+ *
+ *
+ * @author maliang
+ * @since 2017-03-28
+ */
+@Repository
+public interface HighriskConfMapper extends BaseMapper {
+
+ public Integer deleteLogicById(Serializable id);
+
+ /**
+ * @Description:根据版本号获取对应的信息
+ * @param versionId
+ * @return
+ * 创建人：maliang
+ * 创建时间：2017年3月28日
+ * 修改人：
+ * 修改时间：
+ */
+ public List selectByVersion(String 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
new file mode 100644
index 0000000..e462ba5
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskConfMapper.xml
@@ -0,0 +1,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, SOURCE_ID AS sourceId, VERSION_ID AS versionId, NAME AS name, COLORCODE AS colorcode, COLORTEXT AS colortext, GROUPORDER AS grouporder, ITEMORDER AS itemorder, GRADE AS grade, ENABLE AS enable
+
+
+
+
+
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskSourceMapper.java b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskSourceMapper.java
new file mode 100644
index 0000000..24859d8
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskSourceMapper.java
@@ -0,0 +1,23 @@
+package com.lyms.base.common.dao.conf;
+
+import java.io.Serializable;
+
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.lyms.base.common.entity.conf.HighriskSource;
+
+/**
+ *
+ * Mapper接口
+ *
+ *
+ * @author maliang
+ * @since 2017-03-28
+ */
+@Repository
+public interface HighriskSourceMapper extends BaseMapper {
+
+ 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/conf/HighriskSourceMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskSourceMapper.xml
new file mode 100644
index 0000000..b30f919
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskSourceMapper.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, NAME AS name, TYPE AS type, ENABLE AS enable
+
+
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskVersionMapper.java b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskVersionMapper.java
new file mode 100644
index 0000000..a29a9c2
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskVersionMapper.java
@@ -0,0 +1,35 @@
+package com.lyms.base.common.dao.conf;
+
+import java.io.Serializable;
+
+import org.springframework.stereotype.Repository;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.lyms.base.common.entity.conf.HighriskVersion;
+
+/**
+ *
+ * Mapper接口
+ *
+ *
+ * @author maliang
+ * @since 2017-03-28
+ */
+@Repository
+public interface HighriskVersionMapper extends BaseMapper {
+
+ public Integer deleteLogicById(Serializable id);
+
+ /**
+ * @Description:根据ID 禁用状态获取数据信息
+ * @param id
+ * @param status
+ * @return
+ * 创建人：maliang
+ * 创建时间：2017年3月28日
+ * 修改人：
+ * 修改时间：
+ */
+ public HighriskVersion selectBy(Serializable id, Integer status);
+
+}
\ No newline at end of file
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskVersionMapper.xml b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskVersionMapper.xml
new file mode 100644
index 0000000..b23c031
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/HighriskVersionMapper.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ID AS id, NAME AS name, ENABLE AS enable
+
+
+
+
+ HIGHRISK_VERSION
+
+
+
+
+
+
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/package-info.java b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/package-info.java
new file mode 100644
index 0000000..ad29af3
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/dao/conf/package-info.java
@@ -0,0 +1,15 @@
+/**
+ * @Title: package-info.java
+ * @Package com.lyms.base.common.dao.conf
+ * @Description: TODO(文件描述)
+ * @author maliang
+ * @date 2017年3月28日
+ */
+/**
+ * @ClassName: package-info
+ * @Description: TODO(类描述)
+ * @author maliang
+ * @date 2017年3月28日
+ *
+ */
+package com.lyms.base.common.dao.conf;
\ No newline at end of file
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseConf.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseConf.java
new file mode 100644
index 0000000..066348f
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/DiagnoseConf.java
@@ -0,0 +1,152 @@
+package com.lyms.base.common.entity.conf;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+
+/**
+ *
+ * 区域组诊断版本项配置表
+ *
+ *
+ * @author maliang
+ * @since 2017-03-28
+ */
+@TableName("DIAGNOSE_CONF")
+public class DiagnoseConf implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ *
+ */
+ @TableField(value = "ID")
+ private String id;
+ /**
+ * 高危项定义资源表ID
+ */
+ @TableField(value = "SOURCE_ID")
+ private String sourceId;
+ /**
+ * 版本ID
+ */
+ @TableField(value = "VERSION_ID")
+ private String versionId;
+ /**
+ * 自定义高危显示名
+ */
+ @TableField(value = "NAME")
+ private String name;
+ /**
+ * 自定义高危颜色编码
+ */
+ @TableField(value = "COLORCODE")
+ private String colorcode;
+ /**
+ * 自定义高危颜色描述
+ */
+ @TableField(value = "COLORTEXT")
+ private String colortext;
+ /**
+ * 高危组排序
+ */
+ @TableField(value = "GROUPORDER")
+ private String grouporder;
+ /**
+ * 高危项排序
+ */
+ @TableField(value = "ITEMORDER")
+ private String itemorder;
+ /**
+ * 自定义评分
+ */
+ @TableField(value = "GRADE")
+ private String grade;
+ /**
+ * 是否启用，默认1启用
+ */
+ @TableField(value = "ENABLE")
+ private String enable;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getSourceId() {
+ return sourceId;
+ }
+
+ public void setSourceId(String sourceId) {
+ this.sourceId = sourceId;
+ }
+
+ public String getVersionId() {
+ return versionId;
+ }
+
+ public void setVersionId(String versionId) {
+ this.versionId = versionId;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getColorcode() {
+ return colorcode;
+ }
+
+ public void setColorcode(String colorcode) {
+ this.colorcode = colorcode;
+ }
+
+ public String getColortext() {
+ return colortext;
+ }
+
+ public void setColortext(String colortext) {
+ this.colortext = colortext;
+ }
+
+ public String getGrouporder() {
+ return grouporder;
+ }
+
+ public void setGrouporder(String grouporder) {
+ this.grouporder = grouporder;
+ }
+
+ public String getItemorder() {
+ return itemorder;
+ }
+
+ public void setItemorder(String itemorder) {
+ this.itemorder = itemorder;
+ }
+
+ public String getGrade() {
+ return grade;
+ }
+
+ public void setGrade(String grade) {
+ this.grade = grade;
+ }
+
+ public String getEnable() {
+ return enable;
+ }
+
+ public void setEnable(String enable) {
+ this.enable = enable;
+ }
+
+}
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/HighriskConf.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/HighriskConf.java
new file mode 100644
index 0000000..11a62c8
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/HighriskConf.java
@@ -0,0 +1,155 @@
+package com.lyms.base.common.entity.conf;
+
+import java.io.Serializable;
+
+import org.apache.ibatis.type.Alias;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+
+/**
+ *
+ * 区域组高危版本项配置表
+ *
+ *
+ * @author maliang
+ * @since 2017-03-28
+ */
+@Alias(value = "highriskConf")
+@TableName("HIGHRISK_CONF")
+public class HighriskConf implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ *
+ */
+ @TableField(value = "ID")
+ private String id;
+ /**
+ * 高危项定义资源表ID
+ */
+ @TableField(value = "SOURCE_ID")
+ private String sourceId;
+ /**
+ * 版本ID
+ */
+ @TableField(value = "VERSION_ID")
+ private String versionId;
+ /**
+ * 自定义高危显示名
+ */
+ @TableField(value = "NAME")
+ private String name;
+ /**
+ * 自定义高危颜色编码
+ */
+ @TableField(value = "COLORCODE")
+ private String colorcode;
+ /**
+ * 自定义高危颜色描述
+ */
+ @TableField(value = "COLORTEXT")
+ private String colortext;
+ /**
+ * 高危组排序
+ */
+ @TableField(value = "GROUPORDER")
+ private String grouporder;
+ /**
+ * 高危项排序
+ */
+ @TableField(value = "ITEMORDER")
+ private String itemorder;
+ /**
+ * 自定义评分
+ */
+ @TableField(value = "GRADE")
+ private String grade;
+ /**
+ * 是否启用，默认1启用
+ */
+ @TableField(value = "ENABLE")
+ private Integer enable;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getSourceId() {
+ return sourceId;
+ }
+
+ public void setSourceId(String sourceId) {
+ this.sourceId = sourceId;
+ }
+
+ public String getVersionId() {
+ return versionId;
+ }
+
+ public void setVersionId(String versionId) {
+ this.versionId = versionId;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getColorcode() {
+ return colorcode;
+ }
+
+ public void setColorcode(String colorcode) {
+ this.colorcode = colorcode;
+ }
+
+ public String getColortext() {
+ return colortext;
+ }
+
+ public void setColortext(String colortext) {
+ this.colortext = colortext;
+ }
+
+ public String getGrouporder() {
+ return grouporder;
+ }
+
+ public void setGrouporder(String grouporder) {
+ this.grouporder = grouporder;
+ }
+
+ public String getItemorder() {
+ return itemorder;
+ }
+
+ public void setItemorder(String itemorder) {
+ this.itemorder = itemorder;
+ }
+
+ public String getGrade() {
+ return grade;
+ }
+
+ public void setGrade(String grade) {
+ this.grade = grade;
+ }
+
+ public Integer getEnable() {
+ return enable;
+ }
+
+ public void setEnable(Integer enable) {
+ this.enable = enable;
+ }
+
+}
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/HighriskSource.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/HighriskSource.java
new file mode 100644
index 0000000..1fbc784
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/HighriskSource.java
@@ -0,0 +1,74 @@
+package com.lyms.base.common.entity.conf;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+
+/**
+ *
+ * 高危项定义资源表
+ *
+ *
+ * @author maliang
+ * @since 2017-03-28
+ */
+@TableName("HIGHRISK_SOURCE")
+public class HighriskSource implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ *
+ */
+ @TableField(value = "ID")
+ private String id;
+ /**
+ * 高危项名称
+ */
+ @TableField(value = "NAME")
+ private String name;
+ /**
+ * 高危所属划分：0所有，1妇女，2男性，3儿童
+ */
+ @TableField(value = "TYPE")
+ private String type;
+ /**
+ * 是否启用，默认1启用
+ */
+ @TableField(value = "ENABLE")
+ private Integer enable;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public Integer getEnable() {
+ return enable;
+ }
+
+ public void setEnable(Integer enable) {
+ this.enable = enable;
+ }
+
+}
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/HighriskVersion.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/HighriskVersion.java
new file mode 100644
index 0000000..bc9a6d6
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/HighriskVersion.java
@@ -0,0 +1,64 @@
+package com.lyms.base.common.entity.conf;
+
+import java.io.Serializable;
+
+import org.apache.ibatis.type.Alias;
+
+import com.baomidou.mybatisplus.annotations.TableField;
+import com.baomidou.mybatisplus.annotations.TableName;
+
+/**
+ *
+ * 高危版本表
+ *
+ *
+ * @author maliang
+ * @since 2017-03-28
+ */
+@Alias(value = "HighriskVersion")
+@TableName("HIGHRISK_VERSION")
+public class HighriskVersion implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ /**
+ *
+ */
+ @TableField(value = "ID")
+ private String id;
+ /**
+ * 高危版本名称
+ */
+ @TableField(value = "NAME")
+ private String name;
+ /**
+ * 是否启用
+ */
+ @TableField(value = "ENABLE")
+ private Integer enable;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getEnable() {
+ return enable;
+ }
+
+ public void setEnable(Integer enable) {
+ this.enable = enable;
+ }
+
+}
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/package-info.java b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/package-info.java
new file mode 100644
index 0000000..9789896
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/entity/conf/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * @ClassName: package-info
+ * @Description: 配置信息
+ * @author maliang
+ * @date 2017年3月28日
+ *
+ */
+package com.lyms.base.common.entity.conf;
\ No newline at end of file
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/DiagnoseConfService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/DiagnoseConfService.java
new file mode 100644
index 0000000..f00ecb4
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/DiagnoseConfService.java
@@ -0,0 +1,25 @@
+package com.lyms.base.common.service.conf;
+
+import java.io.Serializable;
+
+import com.lyms.base.common.entity.conf.DiagnoseConf;
+import com.lyms.web.service.BaseService;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author maliang
+ * @since 2017-03-28
+ */
+public interface DiagnoseConfService extends BaseService {
+
+ /**
+ * @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除
+ * @param id 删除主键id
+ * @return 大于0修改成功，否则为失败
+ */
+ public Integer deleteLogicById(Serializable id);
+
+}
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
new file mode 100644
index 0000000..4a0e978
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskConfService.java
@@ -0,0 +1,60 @@
+package com.lyms.base.common.service.conf;
+
+import java.io.Serializable;
+import java.util.List;
+
+import com.lyms.base.common.entity.conf.HighriskConf;
+import com.lyms.exception.SystemException;
+import com.lyms.web.service.BaseService;
+
+/**
+ *
+ * 区域组高危版本项配置
+ *
+ *
+ * @author maliang
+ * @since 2017-03-28
+ */
+public interface HighriskConfService extends BaseService {
+
+ /**
+ * @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除
+ * @param id 删除主键id
+ * @return 大于0修改成功，否则为失败
+ */
+ public Integer deleteLogicById(Serializable id);
+
+ /**
+ * @Description:添加高危版本配置项
+ * @param highriskConf
+ * @return String 添加成功返回ID
+ * 创建人：maliang
+ * 创建时间：2017年3月28日
+ * 修改人：
+ * 修改时间：
+ */
+ public String createHighriskConf(HighriskConf highriskConf) throws SystemException;
+
+ /**
+ * @Description: 修改高危版本配置项
+ * @param highriskConf
+ * @return
+ * @throws SystemException
+ * 创建人：maliang
+ * 创建时间：2017年3月28日
+ * 修改人：
+ * 修改时间：
+ */
+ public boolean updateHighriskConf(HighriskConf highriskConf) throws SystemException;
+
+ /**
+ * @Description:根据版本号获取高危配置信息
+ * @return
+ * 创建人：maliang
+ * 创建时间：2017年3月28日
+ * 修改人：
+ * 修改时间：
+ */
+ public List getHighriskConf(String versionId);
+
+}
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskSourceService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskSourceService.java
new file mode 100644
index 0000000..1843bd0
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskSourceService.java
@@ -0,0 +1,25 @@
+package com.lyms.base.common.service.conf;
+
+import java.io.Serializable;
+
+import com.lyms.base.common.entity.conf.HighriskSource;
+import com.lyms.web.service.BaseService;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author maliang
+ * @since 2017-03-28
+ */
+public interface HighriskSourceService extends BaseService {
+
+ /**
+ * @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除
+ * @param id 删除主键id
+ * @return 大于0修改成功，否则为失败
+ */
+ public Integer deleteLogicById(Serializable id);
+
+}
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskVersionService.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskVersionService.java
new file mode 100644
index 0000000..10c8bb9
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/HighriskVersionService.java
@@ -0,0 +1,61 @@
+package com.lyms.base.common.service.conf;
+
+import java.io.Serializable;
+
+import com.lyms.base.common.entity.conf.HighriskVersion;
+import com.lyms.exception.SystemException;
+import com.lyms.web.service.BaseService;
+
+/**
+ *
+ * 高危版本服务类
+ *
+ *
+ * @author maliang
+ * @since 2017-03-28
+ */
+public interface HighriskVersionService extends BaseService {
+
+ /**
+ * @Description:逻辑删除，ifDel = 1 为删除，否则为没有删除
+ * @param id 删除主键id
+ * @return 大于0修改成功，否则为失败
+ */
+ public Integer deleteLogicById(Serializable id);
+
+ /**
+ * @Description:启用/禁用
+ * @param id
+ * @return
+ * 创建人：maliang
+ * 创建时间：2017年3月28日
+ * 修改人：
+ * 修改时间：
+ */
+ public boolean enable(Serializable id) throws SystemException;
+
+ /**
+ * @Description:根据ID获取版本信息
+ * @param id
+ * @return
+ * @throws SystemException
+ * 创建人：maliang
+ * 创建时间：2017年3月28日
+ * 修改人：
+ * 修改时间：
+ */
+ public HighriskVersion getEnableHighriskVersionBy(Serializable id) throws SystemException;
+
+ /**
+ * @Description:添加版本号
+ * @param version
+ * @return
+ * @throws SystemException
+ * 创建人：maliang
+ * 创建时间：2017年3月28日
+ * 修改人：
+ * 修改时间：
+ */
+ public String createVersion(HighriskVersion version) throws SystemException;
+
+}
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/DiagnoseConfServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/DiagnoseConfServiceImpl.java
new file mode 100644
index 0000000..f8dea0d
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/DiagnoseConfServiceImpl.java
@@ -0,0 +1,26 @@
+package com.lyms.base.common.service.conf.impl;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.lyms.base.common.dao.conf.DiagnoseConfMapper;
+import com.lyms.base.common.entity.conf.DiagnoseConf;
+import com.lyms.base.common.service.conf.DiagnoseConfService;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author maliang
+ * @since 2017-03-28
+ */
+public class DiagnoseConfServiceImpl extends ServiceImpl
+ implements DiagnoseConfService {
+
+ @Override
+ public Integer deleteLogicById(Serializable id) {
+ return null;
+ }
+
+}
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
new file mode 100644
index 0000000..46699eb
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskConfServiceImpl.java
@@ -0,0 +1,82 @@
+package com.lyms.base.common.service.conf.impl;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.lyms.base.common.dao.conf.HighriskConfMapper;
+import com.lyms.base.common.entity.conf.HighriskConf;
+import com.lyms.base.common.enums.StatusEnum;
+import com.lyms.base.common.service.conf.HighriskConfService;
+import com.lyms.exception.SystemException;
+import com.lyms.util.StrUtils;
+
+/**
+ *
+ * 区域组高危版本项配置
+ *
+ *
+ * @author maliang
+ * @since 2017-03-28
+ */
+public class HighriskConfServiceImpl extends ServiceImpl
+ implements HighriskConfService {
+
+ @Autowired
+ private HighriskConfMapper confMapper;
+
+ @Override
+ @Transactional
+ public Integer deleteLogicById(Serializable id) {
+ return null;
+ }
+
+ private void throwCheckException(HighriskConf highriskConf) throws SystemException {
+ if (highriskConf == null) {
+ throw new SystemException("版本配置项目信息为空");
+ }
+ }
+
+ @Override
+ @Transactional
+ public String createHighriskConf(HighriskConf highriskConf) throws SystemException {
+
+ throwCheckException(highriskConf);
+
+ String id = StrUtils.uuid();
+ highriskConf.setId(id);
+
+ Integer enable = highriskConf.getEnable();
+ if (enable == null) {
+ highriskConf.setEnable(StatusEnum.ENABLED.getStatus());
+ }
+ return id;
+ }
+
+ @Override
+ @Transactional
+ public boolean updateHighriskConf(HighriskConf highriskConf) throws SystemException {
+
+ throwCheckException(highriskConf);
+
+ String id = highriskConf.getId();
+
+ if (StringUtils.isBlank(id))
+ return false;
+ Integer tag = confMapper.updateById(highriskConf);
+
+ return tag != null && tag >= 1;
+ }
+
+ @Override
+ public List getHighriskConf(String versionId) {
+ if (StringUtils.isBlank(versionId))
+ return null;
+ return confMapper.selectByVersion(versionId);
+ }
+
+}
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskSourceServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskSourceServiceImpl.java
new file mode 100644
index 0000000..f3dba1a
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskSourceServiceImpl.java
@@ -0,0 +1,26 @@
+package com.lyms.base.common.service.conf.impl;
+
+import java.io.Serializable;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.lyms.base.common.dao.conf.HighriskSourceMapper;
+import com.lyms.base.common.entity.conf.HighriskSource;
+import com.lyms.base.common.service.conf.HighriskSourceService;
+
+/**
+ *
+ * 服务类
+ *
+ *
+ * @author maliang
+ * @since 2017-03-28
+ */
+public class HighriskSourceServiceImpl extends ServiceImpl
+ implements HighriskSourceService {
+
+ @Override
+ public Integer deleteLogicById(Serializable id) {
+ return null;
+ }
+
+}
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskVersionServiceImpl.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskVersionServiceImpl.java
new file mode 100644
index 0000000..8909c24
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/HighriskVersionServiceImpl.java
@@ -0,0 +1,93 @@
+package com.lyms.base.common.service.conf.impl;
+
+import java.io.Serializable;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.lyms.base.common.dao.conf.HighriskVersionMapper;
+import com.lyms.base.common.entity.conf.HighriskVersion;
+import com.lyms.base.common.enums.StatusEnum;
+import com.lyms.base.common.service.conf.HighriskVersionService;
+import com.lyms.exception.SystemException;
+import com.lyms.util.StrUtils;
+
+/**
+ *
+ * 高危版本服务类
+ *
+ *
+ * @author maliang
+ * @since 2017-03-28
+ */
+public class HighriskVersionServiceImpl extends ServiceImpl
+ implements HighriskVersionService {
+
+ @Autowired
+ private HighriskVersionMapper versionMapper;
+
+ @Override
+ public Integer deleteLogicById(Serializable id) {
+ return null;
+ }
+
+ @Override
+ @Transactional
+ public boolean enable(Serializable id) {
+
+ if (id == null)
+ return false;
+
+ HighriskVersion version = versionMapper.selectById(id);
+ if (version == null)
+ return false;
+ Integer enable = version.getEnable();
+
+ int status = enable == null || StatusEnum.isDisEnabled(Integer.valueOf(enable)) ? StatusEnum.ENABLED.getStatus()
+ : StatusEnum.DISENABLED.getStatus();
+ version.setEnable(status);
+
+ Integer tag = versionMapper.updateById(version);
+ return tag != null && tag >= 1;
+ }
+
+ @Override
+ public HighriskVersion getEnableHighriskVersionBy(Serializable id) throws SystemException {
+
+ boolean tag = false;
+ HighriskVersion version = null;
+ if (id == null) {
+ tag = true;
+ } else {
+ version = versionMapper.selectBy(id, StatusEnum.ENABLED.getStatus());
+ if (version == null) {
+ tag = true;
+ }
+ }
+ // 获取默认版本信息
+ if (tag) {
+ // version = versionMapper.selectById(id);
+ // TODO 获取默认版本
+ }
+ return version;
+ }
+
+ @Override
+ public String createVersion(HighriskVersion version) throws SystemException {
+
+ if (version == null) {
+ throw new SystemException("版本信息为空");
+ }
+ String id = StrUtils.uuid();
+ version.setId(id);
+ Integer enable = version.getEnable();
+ // 默认开启版本
+ if (enable == null) {
+ version.setEnable(StatusEnum.ENABLED.getStatus());
+ }
+ Integer tag = versionMapper.insert(version);
+ return tag != null && tag >= 1 ? id : null;
+ }
+
+}
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/package-info.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/package-info.java
new file mode 100644
index 0000000..e2a49a2
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/impl/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * @ClassName: package-info
+ * @Description: 配置中心服务实现
+ * @author maliang
+ * @date 2017年3月28日
+ *
+ */
+package com.lyms.base.common.service.conf.impl;
\ No newline at end of file
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/service/conf/package-info.java b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/package-info.java
new file mode 100644
index 0000000..06e28bf
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/service/conf/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * @ClassName: package-info
+ * @Description: TODO(类描述)
+ * @author maliang
+ * @date 2017年3月28日
+ *
+ */
+package com.lyms.base.common.service.conf;
\ No newline at end of file
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/utils/ConverUtils.java b/parent/base.common/src/main/java/com/lyms/base/common/utils/ConverUtils.java
new file mode 100644
index 0000000..a097260
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/utils/ConverUtils.java
@@ -0,0 +1,107 @@
+package com.lyms.base.common.utils;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * @ClassName: BitSetUtils
+ * @Description:
+ * @author maliang
+ * @date 2017年3月27日
+ *
+ */
+public class ConverUtils {
+ // 创建动态长度
+ private String[] convers = null;
+
+ private static final String SPLIT = ",";
+ /**
+ * 默认扩展20的长度
+ */
+ private static final int default_size = 20;
+
+ /**
+ * 默认初始10个长度 创建一个新的实例 BitArray.
+ *
+ */
+ public ConverUtils() {
+ convers = new String[10];
+ }
+
+ public ConverUtils(int size) {
+ convers = new String[size];
+ }
+
+ public static ConverUtils build() {
+ return new ConverUtils();
+ }
+
+ public ConverUtils set(int index, String value) {
+ this.push(index, value);
+ return this;
+ }
+
+ public ConverUtils conver(String base64Str) {
+ if (StringUtils.isNotBlank(base64Str)) {
+ byte[] bytes = Base64.decodeBase64(base64Str);
+ String str = new String(bytes);
+ convers = StringUtils.splitPreserveAllTokens(str, SPLIT);
+ }
+ return this;
+ }
+
+ public String get(int index) {
+ if (convers == null) {
+ return "";
+ }
+ return pull(index);
+ }
+
+ private boolean extend(Integer size) {
+
+ if (size == null || size <= 0) {
+ size = default_size;
+ }
+
+ if (convers == null) {
+ convers = new String[size];
+ } else {
+ // 长度扩展
+ int len = convers.length + size;
+ String[] tmp = new String[len];
+ System.arraycopy(convers, 0, tmp, 0, convers.length);
+ convers = tmp;
+ }
+ return true;
+ }
+
+ private boolean mustExtend(int index) {
+ return convers.length <= index;
+ }
+
+ private boolean push(int index, String value) {
+ if (mustExtend(index)) {
+ extend(index);
+ }
+ convers[index] = value;
+ return true;
+ }
+
+ private String pull(int index) {
+ return convers[index];
+ }
+
+ @Override
+ public String toString() {
+ return StringUtils.join(convers, SPLIT);
+ }
+
+ public byte[] conver() {
+ return this.toString().getBytes();
+ }
+
+ public String converBase64Str() {
+ return Base64.encodeBase64String(this.conver());
+ }
+
+}
diff --git a/parent/base.common/src/main/java/com/lyms/base/common/utils/package-info.java b/parent/base.common/src/main/java/com/lyms/base/common/utils/package-info.java
new file mode 100644
index 0000000..04d9705
--- /dev/null
+++ b/parent/base.common/src/main/java/com/lyms/base/common/utils/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * @ClassName: package-info
+ * @Description: TODO(类描述)
+ * @author maliang
+ * @date 2017年3月27日
+ *
+ */
+package com.lyms.base.common.utils;
\ No newline at end of file
diff --git a/parent/base.common/src/test/java/base/common/test/Test.java b/parent/base.common/src/test/java/base/common/test/Test.java
new file mode 100644
index 0000000..b00e813
--- /dev/null
+++ b/parent/base.common/src/test/java/base/common/test/Test.java
@@ -0,0 +1,17 @@
+package base.common.test;
+
+public class Test {
+
+ public static void main(String[] args) {
+ System.out.println(-200 >> 3);
+ System.out.println(4 << 3);
+ System.out.println(4 | 3);
+ System.out.println(4 ^ 3);
+ System.out.println(4 & 3);
+ System.out.println(-200 >>> 3);
+
+ System.out.println(Math.sin(1));
+ System.out.println(-200 / (int) Math.pow(2, 3.0));
+ System.out.println(Math.pow(9, 1.0 / 3));
+ }
+}
diff --git a/parent/base.common/src/test/java/base/common/test/package-info.java b/parent/base.common/src/test/java/base/common/test/package-info.java
new file mode 100644
index 0000000..26cc14f
--- /dev/null
+++ b/parent/base.common/src/test/java/base/common/test/package-info.java
@@ -0,0 +1,15 @@
+/**
+ * @Title: package-info.java
+ * @Package base.common.test
+ * @Description: TODO(文件描述)
+ * @author maliang
+ * @date 2017年3月28日
+ */
+/**
+ * @ClassName: package-info
+ * @Description: TODO(类描述)
+ * @author maliang
+ * @date 2017年3月28日
+ *
+ */
+package base.common.test;
\ No newline at end of file
diff --git a/parent/hospital.web/pom.xml b/parent/hospital.web/pom.xml
index dc0e9c8..4e92a5e 100644
--- a/parent/hospital.web/pom.xml
+++ b/parent/hospital.web/pom.xml
@@ -22,6 +22,11 @@
core.sdk-1.0
+ com.lyms.base.common
+ base.common
+ base.common-1.0
+
+
com.lyms
hospital.mac
${project.parent.version}
diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/conf/DiagnoseConfController.java b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/conf/DiagnoseConfController.java
new file mode 100644
index 0000000..b02e676
--- /dev/null
+++ b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/conf/DiagnoseConfController.java
@@ -0,0 +1,11 @@
+package com.lyms.hospital.controller.conf;
+
+import com.lyms.web.controller.BaseController;
+
+/**
+ * @author maliang
+ * @since 2017-03-28
+ */
+public class DiagnoseConfController extends BaseController {
+
+}
diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/conf/HighriskConfController.java b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/conf/HighriskConfController.java
new file mode 100644
index 0000000..e577cfa
--- /dev/null
+++ b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/conf/HighriskConfController.java
@@ -0,0 +1,12 @@
+package com.lyms.hospital.controller.conf;
+
+import com.lyms.web.controller.BaseController;
+
+/**
+ *
+ * @author maliang
+ * @since 2017-03-28
+ */
+public class HighriskConfController extends BaseController {
+
+}
diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/conf/HighriskSourceController.java b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/conf/HighriskSourceController.java
new file mode 100644
index 0000000..6a17fea
--- /dev/null
+++ b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/conf/HighriskSourceController.java
@@ -0,0 +1,11 @@
+package com.lyms.hospital.controller.conf;
+
+import com.lyms.web.controller.BaseController;
+
+/**
+ * @author maliang
+ * @since 2017-03-28
+ */
+public class HighriskSourceController extends BaseController {
+
+}
diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/conf/HighriskVersionController.java b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/conf/HighriskVersionController.java
new file mode 100644
index 0000000..2c0d072
--- /dev/null
+++ b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/conf/HighriskVersionController.java
@@ -0,0 +1,23 @@
+package com.lyms.hospital.controller.conf;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.lyms.base.common.service.conf.HighriskVersionService;
+import com.lyms.web.controller.BaseController;
+
+/**
+ * 高危版本
+ *
+ * @author maliang
+ * @since 2017-03-28
+ */
+@RestController
+@RequestMapping(value = "/highrisk/version")
+public class HighriskVersionController extends BaseController {
+
+ @Autowired
+ private HighriskVersionService highriskVersionService;
+
+}
diff --git a/parent/hospital.web/src/main/java/com/lyms/hospital/controller/conf/package-info.java b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/conf/package-info.java
new file mode 100644
index 0000000..10fd849
--- /dev/null
+++ b/parent/hospital.web/src/main/java/com/lyms/hospital/controller/conf/package-info.java
@@ -0,0 +1,8 @@
+/**
+ * @ClassName: package-info
+ * @Description: 配置信息
+ * @author maliang
+ * @date 2017年3月28日
+ *
+ */
+package com.lyms.hospital.controller.conf;
\ No newline at end of file
diff --git a/parent/hospital.web/src/test/java/test/hospital/Test.java b/parent/hospital.web/src/test/java/test/hospital/Test.java
index 9b057e3..7dbc78b 100644
--- a/parent/hospital.web/src/test/java/test/hospital/Test.java
+++ b/parent/hospital.web/src/test/java/test/hospital/Test.java
@@ -1,9 +1,21 @@
package test.hospital;
+import com.lyms.base.common.utils.ConverUtils;
+
public class Test {
-
+
public static void main(String[] args) {
System.out.println(123123123);
+ ConverUtils conver = ConverUtils.build();
+ String str = conver.set(0, "你好").converBase64Str();
+ System.out.println(str);
+ conver.conver(str);
+ System.out.println(conver.get(0));
+ }
+
+ // 创建
+ static class BitArray {
+
}
}