Merge branch 'dev/KLBstand' of http://192.168.2.236:10080/gaodm/diagbotcloud.git into dev/KLBstand

knowledgeman-service/src/main/java/com/diagbot/dto/DiseaseInfoDTO.java

@@ -0,0 +1,24 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年4月9日 下午4:38:05
+ */
+@Setter
+@Getter
+public class DiseaseInfoDTO {
+	/**
+	 * 疾病id
+	 */
+	private Long diseaseId;
+
+	/**
+	 * 疾病id
+	 */
+	private String diseaseName;
+}

knowledgeman-service/src/main/java/com/diagbot/dto/EvaluationModuleAllDTO.java

@@ -0,0 +1,37 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月26日 下午7:25:56
+ */
+@Setter
+@Getter
+public class EvaluationModuleAllDTO {
+	private Long id;
+
+	/**
+	 * 区域名
+	 */
+	private String regionName;
+
+	/**
+	 * 区域类型
+	 */
+	private String regionType;
+
+	/**
+	 * 区域顺序
+	 */
+	private Integer orderNo;
+
+	/**
+	 * 疾病id
+	 */
+	private Long diseaseId;
+	
+}

knowledgeman-service/src/main/java/com/diagbot/dto/EvaluationModuleMappingDTO.java

@@ -0,0 +1,61 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月25日 下午2:53:25
+ */
+@Setter
+@Getter
+public class EvaluationModuleMappingDTO {
+
+	private Long id;
+
+	/**
+	 * 记录创建时间
+	 */
+	private Date gmtCreate;
+
+	/**
+	 * 记录修改时间,如果时间是1970年则表示纪录未修改
+	 */
+	private Date gmtModified;
+
+	/**
+	 * 创建人，0表示无创建人值
+	 */
+	private String creator;
+
+	/**
+	 * 修改人,如果为0则表示纪录未修改
+	 */
+	private String modifier;
+
+	/**
+	 * 区域名
+	 */
+	private String regionName;
+
+	/**
+	 * 区域类型
+	 */
+	private String regionType;
+
+	/**
+	 * 区域顺序
+	 */
+	private Integer orderNo;
+
+	/**
+	 * 疾病id
+	 */
+	private Long diseaseId;
+	
+	private String diseaseName;
+}

knowledgeman-service/src/main/java/com/diagbot/dto/IndexConfigAllDTO.java

@@ -0,0 +1,60 @@
+package com.diagbot.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月26日 上午11:16:17
+ */
+@Setter
+@Getter
+public class IndexConfigAllDTO {
+	@TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 指标公表名
+     */
+    private String indexUnique;
+
+    /**
+     * 疾病id
+     */
+    private Long diseaseId;
+
+    /**
+     * 指标描述
+     */
+    private Integer indexDesc;
+
+    /**
+     * 显示顺序
+     */
+    private Integer orderNo;
+}

knowledgeman-service/src/main/java/com/diagbot/dto/IndexConfigDTO.java

@@ -0,0 +1,47 @@
+package com.diagbot.dto;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月26日 上午10:00:35
+ */
+@Setter
+@Getter
+public class IndexConfigDTO {
+	private Long id;
+	 /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+	 * 疾病id
+	 */
+	private Long diseaseId;
+
+	/**
+	 * 疾病id
+	 */
+	private String diseaseName;
+}

knowledgeman-service/src/main/java/com/diagbot/entity/Evaluation.java

@@ -0,0 +1,167 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 管理与评估模板表
+ * </p>
+ *
+ * @author gaodm
+ * @since 2019-05-13
+ */
+@TableName("kl_evaluation")
+public class Evaluation implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 术语概念id
+     */
+    private Long conceptId;
+
+    /**
+     * 区域名
+     */
+    private String regionName;
+
+    /**
+     * 区域类型（0默认自定义，1大数据，2内部数据）
+     */
+    private String regionType;
+
+    /**
+     * 区域顺序
+     */
+    private Integer orderNo;
+
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public Long getConceptId() {
+        return conceptId;
+    }
+
+    public void setConceptId(Long conceptId) {
+        this.conceptId = conceptId;
+    }
+    public String getRegionName() {
+        return regionName;
+    }
+
+    public void setRegionName(String regionName) {
+        this.regionName = regionName;
+    }
+    public String getRegionType() {
+        return regionType;
+    }
+
+    public void setRegionType(String regionType) {
+        this.regionType = regionType;
+    }
+    public Integer getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "Evaluation{" +
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", conceptId=" + conceptId +
+                ", regionName=" + regionName +
+                ", regionType=" + regionType +
+                ", orderNo=" + orderNo +
+                ", remark=" + remark +
+                "}";
+    }
+}

knowledgeman-service/src/main/java/com/diagbot/entity/IndexConfig.java

@@ -0,0 +1,170 @@
+package com.diagbot.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 指标配置
+ * </p>
+ *
+ * @author gaodm
+ * @since 2019-05-13
+ */
+@TableName("kl_index_config")
+public class IndexConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 疾病概念id
+     */
+    private Long diseaseId;
+
+    /**
+     * 指标公表名概念id
+     */
+    private Long conceptId;
+
+    /**
+     * 指标描述
+     */
+    private Integer indexDesc;
+
+    /**
+     * 显示顺序
+     */
+    private Integer orderNo;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public Long getDiseaseId() {
+        return diseaseId;
+    }
+
+    public void setDiseaseId(Long diseaseId) {
+        this.diseaseId = diseaseId;
+    }
+    public Long getConceptId() {
+        return conceptId;
+    }
+
+    public void setConceptId(Long conceptId) {
+        this.conceptId = conceptId;
+    }
+    public Integer getIndexDesc() {
+        return indexDesc;
+    }
+
+    public void setIndexDesc(Integer indexDesc) {
+        this.indexDesc = indexDesc;
+    }
+    public Integer getOrderNo() {
+        return orderNo;
+    }
+
+    public void setOrderNo(Integer orderNo) {
+        this.orderNo = orderNo;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "IndexConfig{" +
+                "id=" + id +
+                ", isDeleted=" + isDeleted +
+                ", gmtCreate=" + gmtCreate +
+                ", gmtModified=" + gmtModified +
+                ", creator=" + creator +
+                ", modifier=" + modifier +
+                ", diseaseId=" + diseaseId +
+                ", conceptId=" + conceptId +
+                ", indexDesc=" + indexDesc +
+                ", orderNo=" + orderNo +
+                ", remark=" + remark +
+                "}";
+    }
+}

knowledgeman-service/src/main/java/com/diagbot/facade/EvaluationFacade.java

@@ -0,0 +1,189 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.DiseaseInfoDTO;
+import com.diagbot.dto.EvaluationModuleAllDTO;
+import com.diagbot.dto.EvaluationModuleMappingDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.Evaluation;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.EvaluationService;
+import com.diagbot.service.impl.EvaluationServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.DiseaseNameVO;
+import com.diagbot.vo.EvaluationDiseaseIdVO;
+import com.diagbot.vo.EvaluationDiseaseNameVO;
+import com.diagbot.vo.EvaluationListVO;
+import com.diagbot.vo.EvaluationVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * 
+ * @author wangfeng
+ * 
+ * @Description: TODO
+ * @date 2019年3月25日 下午4:19:09
+ */
+@Component
+public class EvaluationFacade extends EvaluationServiceImpl {
+
+	@Autowired
+	UserServiceClient userServiceClient;
+	@Autowired
+	@Qualifier("evaluationFacade")
+	EvaluationService evaluationModuleMappingService;
+
+	/**
+	 * 分页模糊查询标签组维护接口
+	 *
+	 * @param evaluationModuleDiseaseNameVO
+	 * @return
+	 */
+	public IPage<EvaluationModuleMappingDTO> queryEvaluationModulePage(EvaluationDiseaseNameVO evaluationModuleDiseaseNameVO) {
+		IPage<EvaluationModuleMappingDTO> datas
+				= evaluationModuleMappingService.queryEvaluationModulePageAll(evaluationModuleDiseaseNameVO);
+		List<EvaluationModuleMappingDTO> data = datas.getRecords();
+		List<String> modifierid
+				= data.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
+		Map<String, String> userNames = new HashMap<>();
+		if (ListUtil.isNotEmpty(modifierid)) {
+			RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
+			if (RespDTOUtil.respIsNG(userNamesDTO)) {
+				throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "获取所有用户信息失败");
+			}
+			userNames = userNamesDTO.data;
+		}
+		List<EvaluationModuleMappingDTO> evaluationLists = new ArrayList<EvaluationModuleMappingDTO>();
+		for (EvaluationModuleMappingDTO evalua : data) {
+			EvaluationModuleMappingDTO dateNew = new EvaluationModuleMappingDTO();
+			BeanUtil.copyProperties(evalua,dateNew);
+			dateNew.setModifier(userNames.get(evalua.getModifier()));
+			evaluationLists.add(dateNew);
+		}
+
+		return datas.setRecords(evaluationLists);
+	}
+
+	/**
+	 * 
+	 * @param evaluationModuleDiseaseIdVO
+	 * @return
+	 */
+	public List<EvaluationModuleAllDTO> getEvaluationModuleList(EvaluationDiseaseIdVO evaluationModuleDiseaseIdVO) {
+		QueryWrapper<Evaluation> evaluationModuleQuery = new QueryWrapper<>();
+		evaluationModuleQuery.eq("disease_id", evaluationModuleDiseaseIdVO.getDiseaseId()).eq("is_deleted",
+				IsDeleteEnum.N.getKey());
+		List<Evaluation> datas = list(evaluationModuleQuery);
+		// 过滤
+		List<EvaluationModuleAllDTO> data = BeanUtil.listCopyTo(datas, EvaluationModuleAllDTO.class);
+		return data;
+	}
+
+	/**
+	 * 
+	 * @param evaluationModuleListVO
+	 * @return
+	 */
+	public boolean updateEvaluationModuleList(EvaluationListVO evaluationModuleListVO) {
+		boolean res = false;
+		if (evaluationModuleListVO != null && ListUtil.isNotEmpty(evaluationModuleListVO.getEvaluationModuleData())) {
+		EvaluationDiseaseIdVO evaluationModuleDiseaseIdVO = new EvaluationDiseaseIdVO();
+		evaluationModuleDiseaseIdVO.setDiseaseId(evaluationModuleListVO.getDiseaseId());
+		res = cancelEvaluationModuleAll(evaluationModuleDiseaseIdVO);
+		List<Evaluation> evaluationModuleLsit = new ArrayList<Evaluation>();
+		List<EvaluationVO> data = evaluationModuleListVO.getEvaluationModuleData();
+		for (EvaluationVO dataNew : data) {
+			Evaluation evaMou = new Evaluation();
+			BeanUtil.copyProperties(dataNew,evaMou);
+			evaMou.setGmtCreate(DateUtil.now());
+			evaMou.setGmtModified(DateUtil.now());
+			evaMou.setCreator(UserUtils.getCurrentPrincipleID());
+			evaMou.setModifier(UserUtils.getCurrentPrincipleID());
+			evaMou.setOrderNo(dataNew.getOrderNo());
+			evaluationModuleLsit.add(evaMou);
+		}
+
+		res = evaluationModuleMappingService.saveBatch(evaluationModuleLsit);
+		}
+		return res;
+	}
+
+	/**
+	 * 
+	 * @param evaluationModuleListVO
+	 * @return
+	 */
+	public boolean saveEvaluationModuleList(EvaluationListVO evaluationModuleListVO) {
+		boolean res = false;
+		if (evaluationModuleListVO != null && ListUtil.isNotEmpty(evaluationModuleListVO.getEvaluationModuleData())) {
+			List<EvaluationVO> evaluationData = evaluationModuleListVO.getEvaluationModuleData();
+			List<String> regionName = new ArrayList<>();
+			for (EvaluationVO e : evaluationData) {
+				regionName.add(e.getRegionName());
+			}
+
+			QueryWrapper<Evaluation> evaluationQuery = new QueryWrapper<>();
+
+			evaluationQuery.in("region_name", regionName).eq("is_deleted", IsDeleteEnum.N.getKey());
+			List<Evaluation> dataUnique = list(evaluationQuery);
+			if (dataUnique != null && dataUnique.size() > 0) {
+				throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+						"该'" + dataUnique.get(0).getRegionName() + "'已存在");
+			}
+			List<Evaluation> evaluationModuleLsit = new ArrayList<Evaluation>();
+			List<EvaluationVO> data = evaluationModuleListVO.getEvaluationModuleData();
+			for (EvaluationVO dataNew : data) {
+				Evaluation evaMou = new Evaluation();
+				BeanUtil.copyProperties(dataNew,evaMou);
+				evaMou.setGmtCreate(DateUtil.now());
+				evaMou.setGmtModified(DateUtil.now());
+				evaMou.setCreator(UserUtils.getCurrentPrincipleID());
+				evaMou.setModifier(UserUtils.getCurrentPrincipleID());
+				evaluationModuleLsit.add(evaMou);
+			}
+			res = evaluationModuleMappingService.saveBatch(evaluationModuleLsit);
+		}
+		return res;
+	}
+
+	/**
+	 * 
+	 * @param evaluationModuleDiseaseIdVO
+	 * @return
+	 */
+	public boolean cancelEvaluationModuleAll(EvaluationDiseaseIdVO evaluationModuleDiseaseIdVO) {
+		UpdateWrapper<Evaluation> evaluaNew = new UpdateWrapper<>();
+		evaluaNew.eq("disease_id", evaluationModuleDiseaseIdVO.getDiseaseId()).eq("is_deleted", IsDeleteEnum.N.getKey())
+				.set("is_deleted", IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
+				.set("gmt_modified", DateUtil.now());
+		return update(new Evaluation(), evaluaNew);
+	}
+
+	/**
+	 * 
+	 * @param diseaseNameVO
+	 * @return
+	 */
+	public List<DiseaseInfoDTO> queryEvaluationDiseaseName(DiseaseNameVO diseaseNameVO) {
+
+		return evaluationModuleMappingService.queryEvaluationDiseaseName(diseaseNameVO);
+	}
+
+}

knowledgeman-service/src/main/java/com/diagbot/facade/IndexConfigFacade.java

@@ -0,0 +1,181 @@
+package com.diagbot.facade;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.client.UserServiceClient;
+import com.diagbot.dto.DiseaseInfoDTO;
+import com.diagbot.dto.IndexConfigAllDTO;
+import com.diagbot.dto.IndexConfigDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.entity.IndexConfig;
+import com.diagbot.enums.IsDeleteEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
+import com.diagbot.service.IndexConfigService;
+import com.diagbot.service.impl.IndexConfigServiceImpl;
+import com.diagbot.util.BeanUtil;
+import com.diagbot.util.DateUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.util.UserUtils;
+import com.diagbot.vo.DiseaseNameVO;
+import com.diagbot.vo.IndexConfigDiseaseIdVO;
+import com.diagbot.vo.IndexConfigDiseaseNameVO;
+import com.diagbot.vo.IndexConfigListVO;
+import com.diagbot.vo.IndexConfigVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月25日 下午4:20:09
+ */
+@Component
+public class IndexConfigFacade extends IndexConfigServiceImpl {
+
+	@Autowired
+	@Qualifier("indexConfigServiceImpl")
+	IndexConfigService indexConfigService;
+	@Autowired
+	UserServiceClient userServiceClient;
+	/**
+	 *
+	 * @param indexConfigDiseaseNameVO
+	 * @return
+	 */
+	public IPage<IndexConfigDTO> queryIndexConfigPage(IndexConfigDiseaseNameVO indexConfigDiseaseNameVO) {
+		IPage<IndexConfigDTO> datas = this.queryIndexConfigPageAlls(indexConfigDiseaseNameVO);
+		List<IndexConfigDTO> data = datas.getRecords();
+		List<String> modifierid
+				= data.stream().map(ac -> ac.getModifier()).collect(Collectors.toList());
+		Map<String, String> userNames = new HashMap<>();
+		if (ListUtil.isNotEmpty(modifierid)) {
+			RespDTO<Map<String, String>> userNamesDTO = userServiceClient.getUserInfoByIds(modifierid);
+			if (RespDTOUtil.respIsNG(userNamesDTO)) {
+				throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, "获取所有用户信息失败");
+			}
+			userNames = userNamesDTO.data;
+		}
+
+		for (IndexConfigDTO evalua : data) {
+			evalua.setModifier(userNames.get(evalua.getModifier()));
+		}
+		return datas;
+	}
+	/**
+	 * 
+	 * @param indexConfigDiseaseIdVO
+	 * @return
+	 */
+	public List<IndexConfigAllDTO> getIndexConfigLists(IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
+		QueryWrapper<IndexConfig> IndexConfigQuery = new QueryWrapper<IndexConfig>();
+		IndexConfigQuery.eq("disease_id",indexConfigDiseaseIdVO.getDiseaseId()).eq("is_deleted", IsDeleteEnum.N.getKey());
+		List<IndexConfig> datas = list(IndexConfigQuery);
+        //过滤
+        List<IndexConfigAllDTO> data = BeanUtil.listCopyTo(datas, IndexConfigAllDTO.class);
+		return data;
+	}
+	/**
+	 * 
+	 * @param indexConfigListVO
+	 * @return
+	 */
+	public boolean updateIndexConfigList(IndexConfigListVO indexConfigListVO) {
+		boolean res = false;
+		if (indexConfigListVO != null && ListUtil.isNotEmpty(indexConfigListVO.getIndexConfigData())) {
+			IndexConfigDiseaseIdVO indexConfigDiseaseIdVO = new IndexConfigDiseaseIdVO();
+			indexConfigDiseaseIdVO.setDiseaseId(indexConfigListVO.getDiseaseId());
+			res = cancelIndexConfigAlls(indexConfigDiseaseIdVO);
+			List<IndexConfig> IndexConfigLsit = new ArrayList<IndexConfig>();
+			List<IndexConfigVO> data = indexConfigListVO.getIndexConfigData();
+			for (IndexConfigVO dataNew : data) {
+				IndexConfig IndexConfig = new IndexConfig();
+				BeanUtil.copyProperties(dataNew,IndexConfig);
+				IndexConfig.setGmtCreate(DateUtil.now());
+				IndexConfig.setGmtModified(DateUtil.now());
+				IndexConfig.setCreator(UserUtils.getCurrentPrincipleID());
+				IndexConfig.setModifier(UserUtils.getCurrentPrincipleID());
+				IndexConfigLsit.add(IndexConfig);
+			}
+
+			res = indexConfigService.saveBatch(IndexConfigLsit);
+
+		}
+
+		return res;
+	}
+	
+	/**
+	 * 
+	 * @param indexConfigListVO
+	 * @return
+	 */
+	public boolean saveIndexConfigList(IndexConfigListVO indexConfigListVO) {
+		boolean res = false;
+		if (indexConfigListVO != null
+				&& ListUtil.isNotEmpty(indexConfigListVO.getIndexConfigData())) {
+			List<IndexConfigVO> indexConfigData = indexConfigListVO.getIndexConfigData();
+			List<String> indexUnique = new ArrayList<>();
+			for (IndexConfigVO e : indexConfigData) {
+				indexUnique.add(e.getIndexUnique());
+			}
+
+			QueryWrapper<IndexConfig> IndexConfigQuery = new QueryWrapper<>();
+
+			IndexConfigQuery.eq("disease_id",indexConfigListVO.getDiseaseId())
+					.eq("is_deleted",IsDeleteEnum.N.getKey())
+					.in("index_unique", indexUnique);
+			List<IndexConfig> dataUnique = list(IndexConfigQuery);
+			if (ListUtil.isNotEmpty(dataUnique)) {
+				throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
+						"该'" + dataUnique.get(0).getConceptId() + "'已存在");
+			}
+
+			List<IndexConfig> IndexConfigLsit = new ArrayList<IndexConfig>();
+			List<IndexConfigVO> data = indexConfigListVO.getIndexConfigData();
+			for (IndexConfigVO dataNew : data) {
+				IndexConfig IndexConfig = new IndexConfig();
+				BeanUtil.copyProperties(dataNew,IndexConfig);
+				IndexConfig.setGmtCreate(DateUtil.now());
+				IndexConfig.setGmtModified(DateUtil.now());
+				IndexConfig.setCreator(UserUtils.getCurrentPrincipleID());
+				IndexConfig.setModifier(UserUtils.getCurrentPrincipleID());
+				IndexConfigLsit.add(IndexConfig);
+			}
+			res = indexConfigService.saveBatch(IndexConfigLsit);
+		}
+
+		return res;
+	}
+	
+	/**
+	 * 
+	 * @param indexConfigDiseaseIdVO
+	 * @return
+	 */
+	public boolean cancelIndexConfigAlls(IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
+		
+		UpdateWrapper<IndexConfig> IndexConfigNew =new UpdateWrapper<>();
+		IndexConfigNew.eq("disease_id",indexConfigDiseaseIdVO.getDiseaseId()).eq("is_deleted", IsDeleteEnum.N.getKey())
+		.set("is_deleted", IsDeleteEnum.Y.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
+	    .set("gmt_modified", DateUtil.now());
+		return update(new IndexConfig(), IndexConfigNew);
+	}
+	/**
+	 * 
+	 * @param diseaseNameVO
+	 * @return
+	 */
+	public List<DiseaseInfoDTO> queryIndexConfigDiseaseName(DiseaseNameVO diseaseNameVO) {
+		return indexConfigService.queryIndexConfigDiseaseName(diseaseNameVO);
+	}
+}

knowledgeman-service/src/main/java/com/diagbot/mapper/EvaluationMapper.java

@@ -0,0 +1,29 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.DiseaseInfoDTO;
+import com.diagbot.dto.EvaluationModuleMappingDTO;
+import com.diagbot.entity.Evaluation;
+import com.diagbot.vo.DiseaseNameVO;
+import com.diagbot.vo.EvaluationDiseaseNameVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 管理与评估模板表 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2019-03-25
+ */
+public interface EvaluationMapper extends BaseMapper<Evaluation> {
+
+    IPage<EvaluationModuleMappingDTO> queryEvaluationModulePageAll(@Param("evaluationModule") EvaluationDiseaseNameVO evaluationModule);
+
+	List<DiseaseInfoDTO> queryEvaluationDiseaseName(@Param("diseaseNameVO") DiseaseNameVO diseaseNameVO);
+
+}

knowledgeman-service/src/main/java/com/diagbot/mapper/IndexConfigMapper.java

@@ -0,0 +1,29 @@
+package com.diagbot.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.dto.DiseaseInfoDTO;
+import com.diagbot.dto.IndexConfigDTO;
+import com.diagbot.entity.IndexConfig;
+import com.diagbot.vo.DiseaseNameVO;
+import com.diagbot.vo.IndexConfigDiseaseNameVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 指标配置 Mapper 接口
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2019-03-25
+ */
+public interface IndexConfigMapper extends BaseMapper<IndexConfig> {
+
+	IPage<IndexConfigDTO> queryIndexConfigPageAlls(@Param("indexConfigVO") IndexConfigDiseaseNameVO indexConfigVO);
+
+	List<DiseaseInfoDTO> queryIndexConfigDiseaseName(@Param("diseaseNameVO") DiseaseNameVO diseaseNameVO);
+
+
+}

knowledgeman-service/src/main/java/com/diagbot/service/EvaluationService.java

@@ -0,0 +1,27 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.DiseaseInfoDTO;
+import com.diagbot.dto.EvaluationModuleMappingDTO;
+import com.diagbot.entity.Evaluation;
+import com.diagbot.vo.DiseaseNameVO;
+import com.diagbot.vo.EvaluationDiseaseNameVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 管理与评估模板表 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2019-03-25
+ */
+public interface EvaluationService extends IService<Evaluation> {
+
+    IPage<EvaluationModuleMappingDTO> queryEvaluationModulePageAll(EvaluationDiseaseNameVO evaluationModuleDiseaseNameVO);
+
+	List<DiseaseInfoDTO> queryEvaluationDiseaseName(DiseaseNameVO diseaseNameVO);
+
+}

knowledgeman-service/src/main/java/com/diagbot/service/IndexConfigService.java

@@ -0,0 +1,27 @@
+package com.diagbot.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.diagbot.dto.DiseaseInfoDTO;
+import com.diagbot.dto.IndexConfigDTO;
+import com.diagbot.entity.IndexConfig;
+import com.diagbot.vo.DiseaseNameVO;
+import com.diagbot.vo.IndexConfigDiseaseNameVO;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 指标配置 服务类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2019-03-25
+ */
+public interface IndexConfigService extends IService<IndexConfig> {
+
+	public IPage<IndexConfigDTO> queryIndexConfigPageAlls(IndexConfigDiseaseNameVO indexConfigDiseaseNameVO);
+
+	public List<DiseaseInfoDTO> queryIndexConfigDiseaseName(DiseaseNameVO diseaseNameVO);
+
+}

knowledgeman-service/src/main/java/com/diagbot/service/impl/EvaluationServiceImpl.java

@@ -0,0 +1,40 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.DiseaseInfoDTO;
+import com.diagbot.dto.EvaluationModuleMappingDTO;
+import com.diagbot.entity.Evaluation;
+import com.diagbot.mapper.EvaluationMapper;
+import com.diagbot.service.EvaluationService;
+import com.diagbot.vo.DiseaseNameVO;
+import com.diagbot.vo.EvaluationDiseaseNameVO;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 管理与评估模板表 服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2019-03-25
+ */
+@Service
+public class EvaluationServiceImpl extends ServiceImpl<EvaluationMapper, Evaluation> implements EvaluationService {
+
+    @Override
+    public IPage<EvaluationModuleMappingDTO> queryEvaluationModulePageAll(EvaluationDiseaseNameVO evaluationModuleDiseaseNameVO) {
+        return baseMapper.queryEvaluationModulePageAll(evaluationModuleDiseaseNameVO);
+
+    }
+
+	@Override
+	public List<DiseaseInfoDTO> queryEvaluationDiseaseName(DiseaseNameVO diseaseNameVO) {
+		// TODO Auto-generated method stub
+		return baseMapper.queryEvaluationDiseaseName(diseaseNameVO);
+	}
+
+
+}

knowledgeman-service/src/main/java/com/diagbot/service/impl/IndexConfigServiceImpl.java

@@ -0,0 +1,37 @@
+package com.diagbot.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.diagbot.dto.DiseaseInfoDTO;
+import com.diagbot.dto.IndexConfigDTO;
+import com.diagbot.entity.IndexConfig;
+import com.diagbot.mapper.IndexConfigMapper;
+import com.diagbot.service.IndexConfigService;
+import com.diagbot.vo.DiseaseNameVO;
+import com.diagbot.vo.IndexConfigDiseaseNameVO;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 指标配置 服务实现类
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2019-03-25
+ */
+@Service
+public class IndexConfigServiceImpl extends ServiceImpl<IndexConfigMapper, IndexConfig> implements IndexConfigService {
+
+	@Override
+	public IPage<IndexConfigDTO> queryIndexConfigPageAlls(IndexConfigDiseaseNameVO indexConfigDiseaseNameVO) {
+		return baseMapper.queryIndexConfigPageAlls(indexConfigDiseaseNameVO);
+	}
+
+	public List<DiseaseInfoDTO> queryIndexConfigDiseaseName(DiseaseNameVO diseaseNameVO) {
+		// TODO Auto-generated method stub
+		return baseMapper.queryIndexConfigDiseaseName(diseaseNameVO);
+	}
+
+}

knowledgeman-service/src/main/java/com/diagbot/vo/DiseaseNameVO.java

@@ -0,0 +1,17 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年4月9日 下午4:42:06
+ */
+@Setter
+@Getter
+public class DiseaseNameVO {
+
+	private String  diseaseName;
+}

knowledgeman-service/src/main/java/com/diagbot/vo/EvaluationDiseaseIdVO.java

@@ -0,0 +1,22 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月26日 下午7:16:51
+ */
+@Setter
+@Getter
+public class EvaluationDiseaseIdVO {
+	/**
+	 * 疾病ID
+	 */
+	@NotNull(message = "请输入疾病id")
+	private Long diseaseId;
+}

knowledgeman-service/src/main/java/com/diagbot/vo/EvaluationDiseaseNameVO.java

@@ -0,0 +1,19 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月25日 下午2:57:59
+ */
+@Setter
+@Getter
+public class EvaluationDiseaseNameVO extends Page{
+
+	private static final long serialVersionUID = 1L;
+	private String  diseaseName;
+}

knowledgeman-service/src/main/java/com/diagbot/vo/EvaluationListVO.java

@@ -0,0 +1,23 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月26日 下午7:21:44
+ */
+@Setter
+@Getter
+public class EvaluationListVO {
+
+	@NotNull(message = "请输入疾病id")
+	private Long diseaseId;
+	
+	private List<EvaluationVO> evaluationModuleData;
+}

knowledgeman-service/src/main/java/com/diagbot/vo/EvaluationVO.java

@@ -0,0 +1,38 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月26日 下午7:19:14
+ */
+@Setter
+@Getter
+public class EvaluationVO {
+
+	
+	/**
+     * 区域名
+     */
+    private String regionName;
+
+    /**
+     * 区域类型（0默认自定义，1大数据，2内部数据）
+     */
+    private String regionType;
+
+    /**
+     * 区域顺序
+     */
+    private Integer orderNo;
+
+    /**
+     * 疾病id
+     */
+    private Long diseaseId;
+
+    private String remark;
+}

knowledgeman-service/src/main/java/com/diagbot/vo/IndexConfigDiseaseIdVO.java

@@ -0,0 +1,22 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月11日 下午6:47:34
+ */
+@Setter
+@Getter
+public class IndexConfigDiseaseIdVO {
+	/**
+	 * 疾病ID
+	 */
+	@NotNull(message = "请输入疾病id")
+	private Long diseaseId; 
+}

knowledgeman-service/src/main/java/com/diagbot/vo/IndexConfigDiseaseNameVO.java

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月26日 上午10:09:20
+ */
+@Setter
+@Getter
+public class IndexConfigDiseaseNameVO extends Page{
+	private static final long serialVersionUID = 1L;
+	private String  diseaseName;
+}

knowledgeman-service/src/main/java/com/diagbot/vo/IndexConfigListVO.java

@@ -0,0 +1,23 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月26日 下午1:20:18
+ */
+@Setter
+@Getter
+public class IndexConfigListVO {
+	
+	@NotNull(message = "请输入疾病id")
+	private Long diseaseId;
+	
+	private List<IndexConfigVO> indexConfigData;
+}

knowledgeman-service/src/main/java/com/diagbot/vo/IndexConfigVO.java

@@ -0,0 +1,39 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 
+ * @author wangfeng
+ * @Description: TODO
+ * @date 2019年3月26日 下午1:21:08
+ */
+@Setter
+@Getter
+public class IndexConfigVO {
+	/**
+     * 指标公表名
+     */
+    private String indexUnique;
+
+    /**
+     * 疾病id
+     */
+    private Long diseaseId;
+
+    /**
+     * 指标描述
+     */
+    private Integer indexDesc;
+
+    /**
+     * 显示顺序
+     */
+    private Integer orderNo;
+
+    /**
+     * 备注
+     */
+    private String remark;
+}

knowledgeman-service/src/main/java/com/diagbot/web/EvaluationController.java

@@ -0,0 +1,107 @@
+package com.diagbot.web;
+
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.DiseaseInfoDTO;
+import com.diagbot.dto.EvaluationModuleAllDTO;
+import com.diagbot.dto.EvaluationModuleMappingDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.EvaluationFacade;
+import com.diagbot.vo.DiseaseNameVO;
+import com.diagbot.vo.EvaluationDiseaseIdVO;
+import com.diagbot.vo.EvaluationDiseaseNameVO;
+import com.diagbot.vo.EvaluationListVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 管理与评估模板表 前端控制器
+ * </p>
+ *
+ * @author wangfeng
+ * @since 2019-03-25
+ */
+@RestController
+@RequestMapping("/evaluation")
+@Api(value = "慢病评估维护API[by:wangfeng]", tags = { "知识库标准化-慢病评估维护API" })
+@SuppressWarnings("unchecked")
+public class EvaluationController {
+
+    @Autowired
+    EvaluationFacade evaluationFacade;
+
+
+    @ApiOperation(value = "知识库标准化-分页模糊查询标签组维护接口[by:wangfeng]", notes = "diseaseName : 疾病名")
+    @PostMapping("/queryEvaluationModulePages")
+    @SysLogger("queryEvaluationModulePages")
+    public RespDTO<IPage<EvaluationModuleMappingDTO>> queryEvaluationModulePages(@RequestBody EvaluationDiseaseNameVO evaluationModuleDiseaseNameVO) {
+        IPage<EvaluationModuleMappingDTO> data
+                = evaluationFacade.queryEvaluationModulePage(evaluationModuleDiseaseNameVO);
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "知识库标准化-获取慢病标签组维护[by:wangfeng]", notes = "疾病ID ： diseaseId")
+    @PostMapping("/getEvaluationModuleLists")
+    @SysLogger("getEvaluationModuleLists")
+    public RespDTO<List<EvaluationModuleAllDTO>> getEvaluationModuleLists(@RequestBody EvaluationDiseaseIdVO evaluationModuleDiseaseIdVO) {
+        List<EvaluationModuleAllDTO> data
+                = evaluationFacade.getEvaluationModuleList(evaluationModuleDiseaseIdVO);
+        return RespDTO.onSuc(data);
+    }
+
+    @ApiOperation(value = "知识库标准化-慢病评估维护——修改管理评估[by:wangfeng]", notes = "diseaseId ：疾病id </br>"
+            + "evaluationModuleData:{ 区域名 regionName;"
+            + "区域类型（0默认自定义，1大数据，2内部数据）regionType; "
+            + "区域顺序 ：orderNo; "
+            + "疾病id： diseaseId;"
+            + "备注：remark;} ")
+    @PostMapping("/updateEvaluationModuleLists")
+    @SysLogger("updateEvaluationModuleLists")
+    @Transactional
+    public RespDTO<Boolean> updateEvaluationModuleLists(@RequestBody EvaluationListVO evaluationModuleListVO) {
+        boolean res = evaluationFacade.updateEvaluationModuleList(evaluationModuleListVO);
+        return RespDTO.onSuc(res);
+    }
+
+    @ApiOperation(value = "知识库标准化-慢病评估维护——添加管理评估[by:wangfeng]", notes = "diseaseId ：疾病id </br>"
+            + "evaluationModuleData:{ 区域名 regionName;"
+            + "区域类型（0默认自定义，1大数据，2内部数据）regionType; "
+            + "区域顺序 ：orderNo; "
+            + "疾病id： diseaseId;"
+            + "备注：remark;} ")
+    @PostMapping("/saveEvaluationModuleLists")
+    @SysLogger("saveEvaluationModuleLists")
+    @Transactional
+    public RespDTO<Boolean> saveEvaluationModuleLists(@RequestBody EvaluationListVO evaluationModuleListVO) {
+        boolean res = evaluationFacade.saveEvaluationModuleList(evaluationModuleListVO);
+        return RespDTO.onSuc(res);
+    }
+
+    @ApiOperation(value = "知识库标准化-删除慢病标签组维护[by:wangfeng]", notes = "diseaseId ：疾病id")
+    @PostMapping("/cancelEvaluationModuleAlls")
+    @SysLogger("cancelEvaluationModuleAlls")
+    @Transactional
+    public RespDTO<Boolean> cancelEvaluationModuleAlls(@RequestBody EvaluationDiseaseIdVO evaluationModuleDiseaseIdVO) {
+        boolean res = evaluationFacade.cancelEvaluationModuleAll(evaluationModuleDiseaseIdVO);
+        return RespDTO.onSuc(res);
+    }
+
+    @ApiOperation(value = "知识库标准化-慢病疾病标签查询[by:wangfeng]", notes = "请输 ：diseaseId;")
+    @PostMapping("/queryEvaluationDiseaseNames")
+    @SysLogger("queryEvaluationDiseaseNames")
+    @Transactional
+    public RespDTO<List<DiseaseInfoDTO>> queryEvaluationDiseaseNames(@RequestBody DiseaseNameVO diseaseNameVO) {
+        List<DiseaseInfoDTO> data = evaluationFacade.queryEvaluationDiseaseName(diseaseNameVO);
+        return RespDTO.onSuc(data);
+    }
+}

knowledgeman-service/src/main/java/com/diagbot/web/IndexConfigController.java

@@ -0,0 +1,108 @@
+package com.diagbot.web;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.diagbot.annotation.SysLogger;
+import com.diagbot.dto.DiseaseInfoDTO;
+import com.diagbot.dto.IndexConfigAllDTO;
+import com.diagbot.dto.IndexConfigDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.IndexConfigFacade;
+import com.diagbot.vo.DiseaseNameVO;
+import com.diagbot.vo.IndexConfigDiseaseIdVO;
+import com.diagbot.vo.IndexConfigDiseaseNameVO;
+import com.diagbot.vo.IndexConfigListVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 指标配置 前端控制器
+ *
+ * @author wangfeng
+ * @since 2019-03-25
+ */
+@RestController
+@RequestMapping("/indexConfig")
+@Api(value = "慢病指标值关联维护API[by:wangfeng]", tags = { "WF-2期-慢病指标值关联维护API" })
+@SuppressWarnings("unchecked")
+public class IndexConfigController {
+
+	@Autowired
+	IndexConfigFacade indexConfigFacade;
+
+	@ApiOperation(value = "分页模糊查询慢病指标值关联维护[by:wangfeng]", notes = "diseaseName：慢病名字")
+	@PostMapping("/queryIndexConfigPages")
+	@SysLogger("queryIndexConfigPages")
+	@Transactional
+	public RespDTO<IPage<IndexConfigDTO>> queryIndexConfigPages(
+			@RequestBody IndexConfigDiseaseNameVO indexConfigDiseaseNameVO) {
+
+		IPage<IndexConfigDTO> data = indexConfigFacade.queryIndexConfigPage(indexConfigDiseaseNameVO);
+
+		return RespDTO.onSuc(data);
+	}
+
+	@ApiOperation(value = "获取慢病指标值关联维护[by:wangfeng]", notes = "diseaseId ： 慢病id")
+	@PostMapping("/getIndexConfigLists")
+	@SysLogger("getIndexConfigLists")
+	@Transactional
+	public RespDTO<List<IndexConfigAllDTO>> getIndexConfigLists(
+			@RequestBody IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
+
+		List<IndexConfigAllDTO> data = indexConfigFacade.getIndexConfigLists(indexConfigDiseaseIdVO);
+
+		return RespDTO.onSuc(data);
+	}
+
+	@ApiOperation(value = "慢病指标值关联维护——修改关联[by:wangfeng]", notes = "指标公表名+indexUnique; 疾病id+diseaseId;指标描述+indexDesc; 显示顺序+ orderNo; 备注+remark;")
+	@PostMapping("/updateIndexConfigList")
+	@SysLogger("updateIndexConfigList")
+	@Transactional
+	public RespDTO<Boolean> updateIndexConfigList(@RequestBody IndexConfigListVO indexConfigListVO) {
+
+		boolean res = indexConfigFacade.updateIndexConfigList(indexConfigListVO);
+
+		return RespDTO.onSuc(res);
+	}
+
+	@ApiOperation(value = "慢病指标值关联维护——添加关联[by:wangfeng]", notes = "指标公表名+indexUnique; 疾病id+diseaseId;指标描述+indexDesc; 显示顺序+ orderNo; 备注+remark;")
+	@PostMapping("/saveIndexConfigLists")
+	@SysLogger("saveIndexConfigLists")
+	@Transactional
+	public RespDTO<Boolean> saveIndexConfigLists(@RequestBody IndexConfigListVO indexConfigListVO) {
+
+		boolean res = indexConfigFacade.saveIndexConfigList(indexConfigListVO);
+
+		return RespDTO.onSuc(res);
+	}
+
+	@ApiOperation(value = "删除慢病指标值关联维护[by:wangfeng]", notes = "请输入疾病  id ：diseaseId;")
+	@PostMapping("/cancelIndexConfigAlls")
+	@SysLogger("cancelIndexConfigAlls")
+	@Transactional
+	public RespDTO<Boolean> cancelIndexConfigAlls(@RequestBody IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
+
+		boolean res = indexConfigFacade.cancelIndexConfigAlls(indexConfigDiseaseIdVO);
+
+		return RespDTO.onSuc(res);
+	}
+	
+	@ApiOperation(value = "慢病指标疾病标签查询[by:wangfeng]", notes = "请输 ：diseaseId;")
+	@PostMapping("/queryIndexConfigDiseaseNames")
+	@SysLogger("queryIndexConfigDiseaseNames")
+	@Transactional
+	public RespDTO<List<DiseaseInfoDTO>> queryIndexConfigDiseaseNames(@RequestBody DiseaseNameVO diseaseNameVO) {
+
+		List<DiseaseInfoDTO> data = indexConfigFacade.queryIndexConfigDiseaseName(diseaseNameVO);
+
+		return RespDTO.onSuc(data);
+	}
+}

knowledgeman-service/src/main/resources/mapper/EvaluationMapper.xml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.EvaluationMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.Evaluation">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="region_name" property="regionName" />
+        <result column="region_type" property="regionType" />
+        <result column="order_no" property="orderNo" />
+        <result column="concept_id" property="conceptId" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+<select id="queryEvaluationModulePageAll" resultType="com.diagbot.dto.EvaluationModuleMappingDTO">
+	SELECT
+	a.id as id ,
+	a.gmt_create as gmtCreate,
+	a.gmt_modified as gmtModified,
+	a.creator as creator,
+	a.modifier as modifier,
+	a.region_name as regionName,
+	a.region_type as regionType,
+	a.order_no as orderNo,
+	a.concept_id as diseaseId,
+	b.tag_name as diseaseName
+	FROM
+	icss_evaluation_module_mapping a
+	JOIN icss_question_info b
+	WHERE a.is_deleted = 'N'and a.disease_id = b.id
+	<if test="evaluationModule.diseaseName != null">
+	AND b.tag_name LIKE CONCAT('%', #{evaluationModule.diseaseName}, '%')
+	</if>
+	GROUP BY a.disease_id
+	ORDER BY a.gmt_create DESC
+</select>
+<select id="queryEvaluationDiseaseName" resultType="com.diagbot.dto.DiseaseInfoDTO">
+	SELECT
+	a.dis_id AS diseaseId,
+	b.tag_name AS diseaseName
+	FROM
+	icss_dis_type a
+	LEFT JOIN icss_evaluation_module_mapping c
+	ON a.dis_id = c.disease_id
+	JOIN icss_question_info b
+	ON a.dis_id = b.id
+	WHERE c.disease_id IS NULL
+	AND a.is_deleted = "N"
+	<if test="diseaseNameVO.diseaseName != null">
+	AND b.tag_name LIKE CONCAT('%', #{diseaseNameVO.diseaseName}, '%')
+	</if>
+	ORDER BY b.tag_name DESC
+</select>
+
+</mapper>

knowledgeman-service/src/main/resources/mapper/IndexConfigMapper.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.IndexConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.IndexConfig">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="index_unique" property="indexUnique" />
+        <result column="disease_id" property="diseaseId" />
+        <result column="index_desc" property="indexDesc" />
+        <result column="order_no" property="orderNo" />
+        <result column="remark" property="remark" />
+    </resultMap>
+<select id="queryIndexConfigPageAlls" resultType="com.diagbot.dto.IndexConfigDTO">
+	SELECT
+	a.id as id,
+	a.gmt_create as gmtCreate,
+	a.gmt_modified as gmtModified,
+	a.creator as creator,
+	a.modifier as modifier,
+	a.disease_id as diseaseId ,
+	b.tag_name as diseaseName
+	FROM
+	icss_index_config a
+	JOIN icss_question_info b
+	WHERE a.disease_id = b.id
+	AND a.is_deleted = "N"
+	AND b.is_deleted = "N"
+	<if test="indexConfigVO.diseaseName != null and indexConfigVO.diseaseName != ''">
+	AND b.tag_name LIKE CONCAT('%', #{indexConfigVO.diseaseName}, '%')
+	</if>
+	GROUP BY a.disease_id
+	ORDER BY a.gmt_create DESC
+</select>
+<select id="queryIndexConfigDiseaseName" resultType="com.diagbot.dto.DiseaseInfoDTO">
+	SELECT DISTINCT
+	a.dis_id AS diseaseId,
+	b.tag_name AS diseaseName
+	FROM
+	icss_dis_type a
+	JOIN icss_question_info b
+	ON a.dis_id = b.id
+	LEFT JOIN icss_index_config f ON a.dis_id = f.disease_id and f.is_deleted = 'N'
+	WHERE a.type = 1
+	AND f.disease_id is null
+	AND a.is_deleted = "N"
+	AND b.is_deleted = "N"
+	<if test="diseaseNameVO.diseaseName != null and diseaseNameVO.diseaseName != ''">
+	AND b.tag_name LIKE CONCAT('%', #{diseaseNameVO.diseaseName}, '%')
+	</if>
+	ORDER BY b.tag_name DESC
+</select>
+</mapper>

knowledgeman-service/src/test/java/com/diagbot/CodeGeneration.java

@@ -56,7 +56,7 @@ public class CodeGeneration {
         StrategyConfig strategy = new StrategyConfig();
         strategy.setTablePrefix(new String[] { "kl_" });// 此处可以修改为您的表前缀
         strategy.setNaming(NamingStrategy.underline_to_camel);// 表名生成策略
-        strategy.setInclude(new String[] { "kl_library_info"}); // 需要生成的表
+        strategy.setInclude(new String[] { "kl_evaluation", "kl_index_config"}); // 需要生成的表
 
         strategy.setSuperServiceClass(null);
         strategy.setSuperServiceImplClass(null);