化验公表项修改

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

@@ -17,7 +17,7 @@ public class GetAllLisConceptDTO {
 	 * 名称
 	 */
 	@ApiModelProperty(value="名称")
-	private String name;
+	private String conceptName;
 	
 	
 	

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

@@ -79,8 +79,7 @@ public class ConceptFacade extends ConceptServiceImpl {
      * @return
      */
     public List<GetAllLisConceptDTO> getAllLisConcept(GetAllLisConceptVO getAllLisConceptVO){
-    	
-    	return null;
+    	return this.baseMapper.getAllLisConcept(getAllLisConceptVO);
     }
     
     /**

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

@@ -1,7 +1,11 @@
 package com.diagbot.mapper;
 
+import java.util.List;
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.diagbot.dto.GetAllLisConceptDTO;
 import com.diagbot.entity.Concept;
+import com.diagbot.vo.GetAllLisConceptVO;
 
 /**
  * <p>
@@ -12,6 +16,13 @@ import com.diagbot.entity.Concept;
  * @since 2019-01-30
  */
 public interface ConceptMapper extends BaseMapper<Concept> {
+	
+	/**
+	 * 获取所有化验公表项
+	 * @param getAllLisConceptVO
+	 * @return
+	 */
+	List<GetAllLisConceptDTO> getAllLisConcept(GetAllLisConceptVO getAllLisConceptVO);
 
 	
 }

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

@@ -17,7 +17,7 @@ public class GetAllLisConceptVO {
      * 名称
      */
     @ApiModelProperty(value="名称")
-    private String name;
+    private String conceptName;
    
     
 }

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

@@ -12,6 +12,23 @@
         <result column="modifier" property="modifier" />
         <result column="lib_id" property="libId" />
     </resultMap>
+    
+    <select id="getAllLisConcept" parameterType="com.diagbot.vo.GetAllLisConceptVO" resultType="com.diagbot.dto.GetAllLisConceptDTO">
+    	SELECT
+		conceptName
+		FROM(
+		SELECT
+		DISTINCT
+		CONCAT(c.cate_name,'-',c.std_name) as conceptName
+		FROM concept a JOIN library_info b ON a.lib_id=b.id
+		JOIN medical c on b.concept_id=c.concept_id
+		WHERE a.is_deleted='N' AND b.is_deleted='N' AND c.is_deleted='N' 
+		AND b.type='化验') t
+		WHERE 1=1
+		<if test="conceptName!=null and conceptName!=''">
+			and conceptName LIKE CONCAT('%',#{conceptName},'%')
+		</if>
+    </select>
 
    
 </mapper>