接口优化

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

@@ -1,10 +1,16 @@
 package com.diagbot.facade;
 
+import com.diagbot.dto.ConceptWithOrderRes;
 import com.diagbot.dto.DisScaleDTO;
+import com.diagbot.entity.wrapper.ConceptWrapper;
+import com.diagbot.enums.LexiconRSTypeEnum;
+import com.diagbot.enums.LexiconTypeEnum;
 import com.diagbot.service.impl.DisScaleServiceImpl;
 import com.diagbot.vo.DisScaleVO;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -15,12 +21,31 @@ import java.util.List;
 @Component
 public class DisScaleFacade extends DisScaleServiceImpl {
 
+    @Autowired
+    ConceptFacade conceptFacade;
+
     /**
      * 返回诊断量表列表
      *
      * @return
      */
     public List<DisScaleDTO> getDisScaleFac(DisScaleVO disScaleVO) {
-        return getDisScale(disScaleVO.getDisName());
+        // 入参数据封装
+        ConceptWrapper conceptWrapper = new ConceptWrapper();
+        conceptWrapper.setStartName(disScaleVO.getDisName());
+        conceptWrapper.setStartType(LexiconTypeEnum.DIAGNOSIS.getKey());
+        conceptWrapper.setEndType(LexiconTypeEnum.GAUGE.getKey());
+        conceptWrapper.setRelationType(LexiconRSTypeEnum.ORDER_BY.getKey());
+        List<ConceptWithOrderRes> list = conceptFacade.getConceptWithOrder(conceptWrapper);
+
+        // 出参数据封装
+        List<DisScaleDTO> res = new ArrayList<>();
+        for(ConceptWithOrderRes bean : list) {
+            DisScaleDTO dto = new DisScaleDTO();
+            dto.setName(bean.getEndName());
+            dto.setConceptId(bean.getEndId());
+            res.add(dto);
+        }
+        return res;
     }
 }

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

@@ -1,13 +1,19 @@
 package com.diagbot.facade;
 
+import com.diagbot.dto.ConceptRes;
 import com.diagbot.dto.DisDTO;
 import com.diagbot.dto.DisTypeDTO;
+import com.diagbot.entity.wrapper.ConceptWrapper;
 import com.diagbot.enums.DisTypeEnum;
+import com.diagbot.enums.LexiconRSTypeEnum;
+import com.diagbot.enums.LexiconTypeEnum;
 import com.diagbot.service.impl.DisTypeServiceImpl;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -19,6 +25,8 @@ import java.util.Map;
 @Component
 public class DisTypeFacade extends DisTypeServiceImpl {
 
+    @Autowired
+    ConceptFacade conceptFacade;
 
     /**
      * 返回诊断类型
@@ -27,7 +35,23 @@ public class DisTypeFacade extends DisTypeServiceImpl {
      */
     public DisTypeDTO getDisTypeFac() {
         DisTypeDTO res = new DisTypeDTO();
-        List<DisDTO> data = this.getDisType();
+
+        // 入参数据封装
+        ConceptWrapper conceptWrapper = new ConceptWrapper();
+        conceptWrapper.setStartType(LexiconTypeEnum.DIAGNOSIS.getKey());
+        conceptWrapper.setEndType(LexiconTypeEnum.TYPES_OF_DISEASE.getKey());
+        conceptWrapper.setRelationType(LexiconRSTypeEnum.BELONG_TO.getKey());
+        List<ConceptRes> list = conceptFacade.getConcept(conceptWrapper);
+
+        // 出参数据封装
+        List<DisDTO> data = new ArrayList<>();
+        for (ConceptRes bean : list) {
+            DisDTO disDTO = new DisDTO();
+            disDTO.setName(bean.getStartName());
+            disDTO.setConceptId(bean.getStartId());
+            disDTO.setTypeName(bean.getEndName());
+            data.add(disDTO);
+        }
         Map<String, List<DisDTO>> map = EntityUtil.makeEntityListMap(data, "typeName");
         if (map != null) {
             List<DisDTO> chr = map.get(DisTypeEnum.CHRONIC.getTypeName()); //放入慢病列表

aipt-service/src/main/java/com/diagbot/mapper/DisScaleMapper.java

@@ -1,11 +1,8 @@
 package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.DisScaleDTO;
 import com.diagbot.entity.DisScale;
 
-import java.util.List;
-
 /**
  * <p>
  * 诊断量表映射表 Mapper 接口
@@ -16,5 +13,4 @@ import java.util.List;
  */
 public interface DisScaleMapper extends BaseMapper<DisScale> {
 
-    public List<DisScaleDTO> getDisScale(String disName);
 }

aipt-service/src/main/java/com/diagbot/mapper/DisTypeMapper.java

@@ -1,11 +1,8 @@
 package com.diagbot.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.diagbot.dto.DisDTO;
 import com.diagbot.entity.DisType;
 
-import java.util.List;
-
 /**
  * <p>
  * 诊断类型表 Mapper 接口
@@ -16,6 +13,4 @@ import java.util.List;
  */
 public interface DisTypeMapper extends BaseMapper<DisType> {
 
-
-    public List<DisDTO> getDisType();
 }

aipt-service/src/main/java/com/diagbot/service/DisScaleService.java

@@ -16,11 +16,4 @@ import java.util.List;
  */
 public interface DisScaleService extends IService<DisScale> {
 
-    /**
-     * 返回诊断量表列表
-     *
-     * @param disName
-     * @return
-     */
-    public List<DisScaleDTO> getDisScale(String disName);
 }

aipt-service/src/main/java/com/diagbot/service/DisTypeService.java

@@ -1,11 +1,8 @@
 package com.diagbot.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.diagbot.dto.DisDTO;
 import com.diagbot.entity.DisType;
 
-import java.util.List;
-
 /**
  * <p>
  * 诊断类型表 服务类
@@ -16,10 +13,4 @@ import java.util.List;
  */
 public interface DisTypeService extends IService<DisType> {
 
-
-    /**
-     *
-     * @return 返回诊断类型
-     */
-    public List<DisDTO> getDisType();
 }

aipt-service/src/main/java/com/diagbot/service/impl/DisScaleServiceImpl.java

@@ -1,14 +1,11 @@
 package com.diagbot.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.dto.DisScaleDTO;
 import com.diagbot.entity.DisScale;
 import com.diagbot.mapper.DisScaleMapper;
 import com.diagbot.service.DisScaleService;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * <p>
  * 诊断量表映射表 服务实现类
@@ -20,8 +17,4 @@ import java.util.List;
 @Service
 public class DisScaleServiceImpl extends ServiceImpl<DisScaleMapper, DisScale> implements DisScaleService {
 
-    @Override
-    public List<DisScaleDTO> getDisScale(String disName) {
-        return baseMapper.getDisScale(disName);
-    }
 }

aipt-service/src/main/java/com/diagbot/service/impl/DisTypeServiceImpl.java

@@ -1,14 +1,11 @@
 package com.diagbot.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.diagbot.dto.DisDTO;
 import com.diagbot.entity.DisType;
 import com.diagbot.mapper.DisTypeMapper;
 import com.diagbot.service.DisTypeService;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
 /**
  * <p>
  * 标签基础表 服务实现类
@@ -20,9 +17,4 @@ import java.util.List;
 @Service
 public class DisTypeServiceImpl extends ServiceImpl<DisTypeMapper, DisType> implements DisTypeService {
 
-
-    @Override
-    public List<DisDTO> getDisType() {
-        return baseMapper.getDisType();
-    }
 }

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

@@ -2,10 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.diagbot.mapper.DisScaleMapper">
 
-    <select id="getDisScale" resultType="com.diagbot.dto.DisScaleDTO">
-        SELECT a.lib_name name, a.id concept_id  FROM `kl_concept` a, kl_relation b, kl_relation_order c
-        where a.is_deleted = 'N' and b.is_deleted = 'N' and c.is_deleted = 'N'
-        and a.id = b.end_id and b.start_id = (select id from kl_concept where lib_name = #{disName} and lib_type = 18)
-        and b.relation_id = 17 and b.id = c.t_relation_id ORDER BY c.order_no;
-    </select>
 </mapper>

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

@@ -2,9 +2,4 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.diagbot.mapper.DisTypeMapper">
 
-    <select id="getDisType" resultType="com.diagbot.dto.DisDTO">
-        SELECT a.lib_name name, a.id concept_id, c.lib_name type_name FROM `kl_concept` a, kl_relation b, kl_concept c
-        where a.is_deleted = 'N' and b.is_deleted = 'N' and c.is_deleted = 'N'
-        and b.start_id = a.id and b.end_id = c.id and c.lib_type = 51
-    </select>
 </mapper>