修改指标配置，

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

@@ -15,6 +15,8 @@ import java.util.Date;
 @Getter
 public class IndexConfigDTO {
 	private Long id;
+	
+	private String state;
 	 /**
      * 记录创建时间
      */

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

@@ -113,7 +113,10 @@ public class IndexConfigFacade extends IndexConfigServiceImpl {
 		if (indexConfigListVO != null && ListUtil.isNotEmpty(indexConfigListVO.getIndexConfigData())) {
 			IndexConfigDiseaseIdVO indexConfigDiseaseIdVO = new IndexConfigDiseaseIdVO();
 			indexConfigDiseaseIdVO.setDiseaseId(indexConfigListVO.getDiseaseId());
-			res = cancelIndexConfigAlls(indexConfigDiseaseIdVO);
+			
+			UpdateWrapper<IndexConfig> IndexConfigNew = new UpdateWrapper<>();
+			IndexConfigNew.eq("disease_id", indexConfigListVO.getDiseaseId());
+			res = indexConfigService.remove(IndexConfigNew);
 			List<IndexConfig> IndexConfigLsit = new ArrayList<IndexConfig>();
 			List<IndexConfigVO> data = indexConfigListVO.getIndexConfigData();
 			Date optDate = DateUtil.now();
@@ -151,8 +154,7 @@ public class IndexConfigFacade extends IndexConfigServiceImpl {
 
 			QueryWrapper<IndexConfig> IndexConfigQuery = new QueryWrapper<>();
 
-			IndexConfigQuery.eq("disease_id", indexConfigListVO.getDiseaseId())
-					.eq("is_deleted", IsDeleteEnum.N.getKey()).in("concept_id", conceptId);
+			IndexConfigQuery.eq("disease_id", indexConfigListVO.getDiseaseId()).in("concept_id", conceptId);
 			List<IndexConfig> dataUnique = list(IndexConfigQuery);
 			if (ListUtil.isNotEmpty(dataUnique)) {
 				throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,
@@ -184,11 +186,18 @@ public class IndexConfigFacade extends IndexConfigServiceImpl {
 	 * @return
 	 */
 	public boolean cancelIndexConfigAlls(IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
-
 		UpdateWrapper<IndexConfig> IndexConfigNew = new UpdateWrapper<>();
+		if(indexConfigDiseaseIdVO.getState().equals(IsDeleteEnum.Y.getKey())){		
 		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());
+				.set("gmt_modified", DateUtil.now());	
+		}else if (indexConfigDiseaseIdVO.getState().equals(IsDeleteEnum.N.getKey())){
+			IndexConfigNew.eq("disease_id", indexConfigDiseaseIdVO.getDiseaseId()).eq("is_deleted", IsDeleteEnum.Y.getKey())
+			.set("is_deleted", IsDeleteEnum.N.getKey()).set("modifier", UserUtils.getCurrentPrincipleID())
+			.set("gmt_modified", DateUtil.now());		
+		}else{
+			throw new CommonException(CommonErrorCode.SERVER_IS_ERROR,"state传参有误，应为'Y'或'N'");
+		}
 		return update(new IndexConfig(), IndexConfigNew);
 	}
 

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

@@ -7,7 +7,7 @@ import lombok.Setter;
 /**
  * 
  * @author wangfeng
- * @Description: TODO
+ * @Description: 管理与评估入参类
  * @date 2019年3月25日 下午2:57:59
  */
 @Setter

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

@@ -3,12 +3,13 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 
 /**
  * 
  * @author wangfeng
- * @Description: TODO
+ * @Description: 指标配置入参类
  * @date 2019年3月11日 下午6:47:34
  */
 @Setter
@@ -19,4 +20,7 @@ public class IndexConfigDiseaseIdVO {
 	 */
 	@NotNull(message = "请输入疾病id")
 	private Long diseaseId; 
+	
+	@NotBlank(message = "请输入状态")
+	private String state; 
 }

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

@@ -23,6 +23,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
+import javax.validation.Valid;
+
 /**
  * <p>
  * 管理与评估模板表 前端控制器
@@ -91,7 +93,7 @@ public class EvaluationController {
     @PostMapping("/cancelEvaluationModuleAlls")
     @SysLogger("cancelEvaluationModuleAlls")
     @Transactional
-    public RespDTO<Boolean> cancelEvaluationModuleAlls(@RequestBody EvaluationDiseaseIdVO evaluationModuleDiseaseIdVO) {
+    public RespDTO<Boolean> cancelEvaluationModuleAlls(@Valid @RequestBody EvaluationDiseaseIdVO evaluationModuleDiseaseIdVO) {
         boolean res = evaluationFacade.cancelEvaluationModuleAll(evaluationModuleDiseaseIdVO);
         return RespDTO.onSuc(res);
     }

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

@@ -22,6 +22,8 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
+import javax.validation.Valid;
+
 /**
  * <p>
  * 指标配置 前端控制器
@@ -76,16 +78,16 @@ public class IndexConfigController {
         return RespDTO.onSuc(res);
     }
 
-    @ApiOperation(value = "知识库标准化-删除慢病指标值关联维护[by:wangfeng]", notes = "请输入疾病  id ：diseaseId;")
+    @ApiOperation(value = "知识库标准化-删除慢病指标值关联维护[by:wangfeng]", notes = "请输入疾病  id ：diseaseId;请输入状态:state")
     @PostMapping("/cancelIndexConfigAlls")
     @SysLogger("cancelIndexConfigAlls")
     @Transactional
-    public RespDTO<Boolean> cancelIndexConfigAlls(@RequestBody IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
+    public RespDTO<Boolean> cancelIndexConfigAlls(@Valid @RequestBody IndexConfigDiseaseIdVO indexConfigDiseaseIdVO) {
         boolean res = indexConfigFacade.cancelIndexConfigAlls(indexConfigDiseaseIdVO);
         return RespDTO.onSuc(res);
     }
 
-    @ApiOperation(value = "知识库标准化-慢病指标疾病标签查询[by:wangfeng]", notes = "请输 ：diseaseId;")
+    @ApiOperation(value = "知识库标准化-慢病指标疾病标签查询[by:wangfeng]", notes = "请输 ：diseaseName;")
     @PostMapping("/queryIndexConfigDiseaseNames")
     @SysLogger("queryIndexConfigDiseaseNames")
     @Transactional

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

@@ -18,6 +18,7 @@
     </resultMap>
 <select id="queryIndexConfigPageAlls" resultType="com.diagbot.dto.IndexConfigDTO">
 	SELECT DISTINCT
+	a.is_deleted AS state,
 	a.gmt_create as gmtCreate,
 	a.gmt_modified as gmtModified,
 	a.creator as creator,
@@ -26,8 +27,7 @@
 	b.lib_name as diseaseName
 	FROM kl_index_config a
 	JOIN kl_concept b
-	WHERE a.is_deleted = 'N'
-	and b.is_deleted = 'N'
+	WHERE b.is_deleted = 'N'
 	and a.disease_id = b.id
 	<if test="indexConfigVO.diseaseName != null">
 		AND b.lib_name LIKE CONCAT('%', #{indexConfigVO.diseaseName}, '%')
@@ -59,7 +59,6 @@
 	AND t3.lib_name = "慢病") a
 	LEFT JOIN kl_index_config b
 	ON a.diseaseId = b.disease_id
-	AND b.is_deleted = "N"
 	WHERE b.disease_id IS NULL
 	<if test="diseaseNameVO.diseaseName != null and diseaseNameVO.diseaseName != ''">
 		AND a.diseaseName LIKE CONCAT('%', #{diseaseNameVO.diseaseName}, '%')