代码优化

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

@@ -25,8 +25,4 @@ public class IndexConfigDTO {
 
 	private String diseaseName;// 疾病概念名
 
-	
-
-	
-
 }

aipt-service/src/main/java/com/diagbot/dto/IndexDataDTO.java

@@ -14,7 +14,6 @@ import lombok.Setter;
 @Setter
 @Getter
 public class IndexDataDTO {
-
 	private Long uniqueId;// 指标id
 	private String indexValue;// 指标值
 	private String indexUnit;// 指标单位

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

@@ -1,31 +1,8 @@
 package com.diagbot.facade;
 
-import java.util.List;
-
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.diagbot.dto.EvaluationDTO;
-import com.diagbot.service.EvaluationService;
 import com.diagbot.service.impl.EvaluationServiceImpl;
-import com.diagbot.vo.EvaluationdiseaseNameVO;
+import org.springframework.stereotype.Component;
 
 @Component
-public class EvaluationFacade extends EvaluationServiceImpl{
-
-	@Autowired
-	EvaluationService evaluationService;
-	
-	/**
-	 * 
-	 * @param evaluationdiseaseNameVO
-	 * @return
-	 */
-	public List<EvaluationDTO> getEvaluationModule(@Valid EvaluationdiseaseNameVO evaluationdiseaseNameVO) {
-		List<EvaluationDTO> data = evaluationService.getEvaluationModule(evaluationdiseaseNameVO);
-		return data;
-	}
-
+public class EvaluationFacade extends EvaluationServiceImpl {
 }

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

@@ -1,41 +1,26 @@
 package com.diagbot.facade;
 
+import com.diagbot.dto.IndexConfigDTO;
+import com.diagbot.service.impl.IndexConfigServiceImpl;
+import org.springframework.stereotype.Component;
+
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.diagbot.dto.IndexConfigDTO;
-import com.diagbot.entity.Concept;
-import com.diagbot.entity.ConceptDetail;
-import com.diagbot.entity.IndexConfig;
-import com.diagbot.enums.IsDeleteEnum;
-import com.diagbot.enums.LexiconTypeEnum;
-import com.diagbot.service.IndexConfigService;
-import com.diagbot.service.impl.IndexConfigServiceImpl;
-import com.diagbot.vo.ConceptBaseVO;
-import com.diagbot.vo.IndexConfigdiseaseNameVO;
-
 /**
- * 
  * @author wangfeng
  * @Description: TODO
  * @date 2019年5月6日 下午6:35:58
  */
 @Component
-public class IndexConfigFacade extends IndexConfigServiceImpl{
+public class IndexConfigFacade extends IndexConfigServiceImpl {
+
 
-	@Autowired 
-	IndexConfigService indexConfigService;	
-	
-	
-	public List<IndexConfigDTO> getIndexConfig(String diseaseName) {
-		Map<String, Object> indexConfigMap = new HashMap<>();
-		indexConfigMap.put("diseaseName",diseaseName);
-		return indexConfigService.getIndexConfig(indexConfigMap);
-	}
+    public List<IndexConfigDTO> getIndexConfig(String diseaseName) {
+        Map<String, Object> indexConfigMap = new HashMap<>();
+        indexConfigMap.put("diseaseName", diseaseName);
+        return this.getIndexConfig(indexConfigMap);
+    }
 
 }

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

@@ -1,23 +1,20 @@
 package com.diagbot.web;
 
-import java.util.List;
-
-import javax.validation.Valid;
-
-import org.springframework.beans.factory.annotation.Autowired;
-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 com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.EvaluationDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.EvaluationFacade;
 import com.diagbot.vo.EvaluationdiseaseNameVO;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+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 javax.validation.Valid;
+import java.util.List;
 
 /**
  * <p>
@@ -33,17 +30,15 @@ import io.swagger.annotations.ApiOperation;
 @SuppressWarnings("unchecked")
 public class EvaluationController {
 
-	@Autowired
-	EvaluationFacade evaluationFacade;
-
-	@ApiOperation(value = "获取管理与评估模板[by:wangfeng]", notes = "获取管理与评估模板")
-	@PostMapping("/getEvaluationModules")
-	@SysLogger("getEvaluationModules")
-	public RespDTO<List<EvaluationDTO>> getEvaluationModules(@Valid @RequestBody EvaluationdiseaseNameVO evaluationdiseaseNameVO) {
-
-		List<EvaluationDTO> data = evaluationFacade.getEvaluationModule(evaluationdiseaseNameVO);
+    @Autowired
+    EvaluationFacade evaluationFacade;
 
-		return RespDTO.onSuc(data);
-	}
+    @ApiOperation(value = "获取管理与评估模板[by:wangfeng]", notes = "获取管理与评估模板")
+    @PostMapping("/getEvaluationModules")
+    @SysLogger("getEvaluationModules")
+    public RespDTO<List<EvaluationDTO>> getEvaluationModules(@Valid @RequestBody EvaluationdiseaseNameVO evaluationdiseaseNameVO) {
+        List<EvaluationDTO> data = evaluationFacade.getEvaluationModule(evaluationdiseaseNameVO);
+        return RespDTO.onSuc(data);
+    }
 
 }

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

@@ -1,23 +1,21 @@
 package com.diagbot.web;
 
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-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 com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.IndexConfigDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.IndexConfigFacade;
 import com.diagbot.vo.IndexConfigdiseaseNameVO;
-
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+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 springfox.documentation.annotations.ApiIgnore;
 
+import java.util.List;
+
 /**
  * <p>
  * 指标配置 前端控制器
@@ -33,16 +31,14 @@ import springfox.documentation.annotations.ApiIgnore;
 @ApiIgnore
 public class IndexConfigController {
 
-	@Autowired
-	IndexConfigFacade indexConfigFacade;
-
-	@ApiOperation(value = "知识库标准化-根据疾病获取指标配置[by:wangfeng]", notes = "根据疾病获取指标配置")
-	@PostMapping("/getindexConfigs")
-	@SysLogger("getindexConfigs")
-	public RespDTO<List<IndexConfigDTO>> getindexConfigs(@RequestBody IndexConfigdiseaseNameVO indexConfigdiseaseNameVO) {
-
-		List<IndexConfigDTO> data = indexConfigFacade.getIndexConfig(indexConfigdiseaseNameVO.getDiseaseName());
+    @Autowired
+    IndexConfigFacade indexConfigFacade;
 
-		return RespDTO.onSuc(data);
-	}
+    @ApiOperation(value = "知识库标准化-根据疾病获取指标配置[by:wangfeng]", notes = "根据疾病获取指标配置")
+    @PostMapping("/getindexConfigs")
+    @SysLogger("getindexConfigs")
+    public RespDTO<List<IndexConfigDTO>> getindexConfigs(@RequestBody IndexConfigdiseaseNameVO indexConfigdiseaseNameVO) {
+        List<IndexConfigDTO> data = indexConfigFacade.getIndexConfig(indexConfigdiseaseNameVO.getDiseaseName());
+        return RespDTO.onSuc(data);
+    }
 }

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

@@ -27,7 +27,7 @@
 		FROM
 		kl_evaluation a
 		JOIN kl_concept b
-		ON b.id = a.concept_id
+		ON b.id = a.concept_id and b.is_deleted = "N"
 		WHERE a.is_deleted = "N"
 		AND b.lib_type = 18
 		<if test="evaluationModule.diseaseName != null">

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

@@ -17,18 +17,18 @@
 		<result column="remark" property="remark" />
 	</resultMap>
 	<select id="getIndexConfig" resultType="com.diagbot.dto.IndexConfigDTO">
-
 		SELECT
 		a.concept_id AS uniqueId,
 		a.disease_id AS diseaseId,
 		a.index_desc AS groupType,
-		a.order_no AS　orderNo,
+		a.order_no AS orderNo,
 		b.lib_name AS indexUnique,
 		c.lib_name AS diseaseName
 		FROM kl_index_config a
-		LEFT JOIN kl_concept b ON a.concept_id = b.id
-		LEFT JOIN kl_concept c ON a.disease_id = c.id
+		LEFT JOIN kl_concept b ON a.concept_id = b.id and  b.is_deleted ="N"
+		LEFT JOIN kl_concept c ON a.disease_id = c.id and  c.is_deleted ="N"
 		WHERE a.is_deleted ="N"
+		and b.lib_type = 46
 		and c.lib_type = 18
 		<if test="indexConfig.diseaseName != ''">
 		AND c.lib_name =  #{indexConfig.diseaseName}