|
@@ -10,9 +10,11 @@ import com.diagbot.enums.LexiconEnum;
|
|
import com.diagbot.enums.StandConvertCrfEnum;
|
|
import com.diagbot.enums.StandConvertCrfEnum;
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
import com.diagbot.exception.CommonErrorCode;
|
|
import com.diagbot.exception.CommonException;
|
|
import com.diagbot.exception.CommonException;
|
|
|
|
+import com.diagbot.util.BeanUtil;
|
|
import com.diagbot.util.ListUtil;
|
|
import com.diagbot.util.ListUtil;
|
|
import com.diagbot.util.StringUtil;
|
|
import com.diagbot.util.StringUtil;
|
|
import com.diagbot.vo.StandConvertCrfVO;
|
|
import com.diagbot.vo.StandConvertCrfVO;
|
|
|
|
+import com.diagbot.vo.TermMatchingListVO;
|
|
import com.diagbot.vo.TermMatchingVO;
|
|
import com.diagbot.vo.TermMatchingVO;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.stereotype.Component;
|
|
@@ -36,17 +38,17 @@ public class TermMatchingFacade {
|
|
public List<TermConceptDTO> getTermMatchingAll(TermMatchingVO termMatchingVO) {
|
|
public List<TermConceptDTO> getTermMatchingAll(TermMatchingVO termMatchingVO) {
|
|
List<TermConceptDTO> list = new ArrayList<>();
|
|
List<TermConceptDTO> list = new ArrayList<>();
|
|
Integer type = convertType(termMatchingVO.getType());
|
|
Integer type = convertType(termMatchingVO.getType());
|
|
|
|
+ TermMatchingVO termMatchingVONew = new TermMatchingVO();
|
|
|
|
+ BeanUtil.copyProperties(termMatchingVO, termMatchingVONew);
|
|
|
|
+ termMatchingVONew.setType(type);
|
|
if (type != null) {
|
|
if (type != null) {
|
|
- QueryWrapper<KlLibraryInfo> klLibraryInfo = new QueryWrapper<>();
|
|
|
|
- klLibraryInfo.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
|
- .eq("type_id", type)
|
|
|
|
- .eq("name", termMatchingVO.getInputStr());
|
|
|
|
- KlLibraryInfo libraryInfo = klLibraryInfoFacade.getOne(klLibraryInfo, false);
|
|
|
|
|
|
+ TermConceptDTO libraryInfo = klLibraryInfoFacade.getConcept(termMatchingVONew);
|
|
if (null != libraryInfo) {
|
|
if (null != libraryInfo) {
|
|
TermConceptDTO termConceptDTO = new TermConceptDTO();
|
|
TermConceptDTO termConceptDTO = new TermConceptDTO();
|
|
- termConceptDTO.setId(libraryInfo.getConceptId());
|
|
|
|
|
|
+ termConceptDTO.setId(libraryInfo.getId());
|
|
termConceptDTO.setName(libraryInfo.getName());
|
|
termConceptDTO.setName(libraryInfo.getName());
|
|
- termConceptDTO.setSource(libraryInfo.getIsConcept() == 1 ? 1 : 2);
|
|
|
|
|
|
+ termConceptDTO.setSource(libraryInfo.getSource() == 1 ? 1 : 2);
|
|
|
|
+ termConceptDTO.setCode(libraryInfo.getCode());
|
|
list.add(termConceptDTO);
|
|
list.add(termConceptDTO);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -74,16 +76,20 @@ public class TermMatchingFacade {
|
|
String placeTo = map.get("standard_word");
|
|
String placeTo = map.get("standard_word");
|
|
placeToList.add(placeTo);
|
|
placeToList.add(placeTo);
|
|
}
|
|
}
|
|
|
|
+ TermMatchingListVO termMatchingListVO = new TermMatchingListVO();
|
|
|
|
+ termMatchingListVO.setPlaceToList(placeToList);
|
|
|
|
+ termMatchingListVO.setType(type);
|
|
QueryWrapper<KlLibraryInfo> klLibraryInfo = new QueryWrapper<>();
|
|
QueryWrapper<KlLibraryInfo> klLibraryInfo = new QueryWrapper<>();
|
|
klLibraryInfo.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
klLibraryInfo.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
.eq("type_id", type)
|
|
.eq("type_id", type)
|
|
.in("name", placeToList);
|
|
.in("name", placeToList);
|
|
- List<KlLibraryInfo> libraryInfoList = klLibraryInfoFacade.list(klLibraryInfo);
|
|
|
|
|
|
+ List<TermConceptDTO> libraryInfoList = klLibraryInfoFacade.getConceptList(termMatchingListVO);
|
|
if (ListUtil.isNotEmpty(libraryInfoList)) {
|
|
if (ListUtil.isNotEmpty(libraryInfoList)) {
|
|
- for (KlLibraryInfo data : libraryInfoList) {
|
|
|
|
|
|
+ for (TermConceptDTO data : libraryInfoList) {
|
|
TermConceptDTO termConceptDTO = new TermConceptDTO();
|
|
TermConceptDTO termConceptDTO = new TermConceptDTO();
|
|
- termConceptDTO.setId(data.getConceptId());
|
|
|
|
|
|
+ termConceptDTO.setId(data.getId());
|
|
termConceptDTO.setName(data.getName());
|
|
termConceptDTO.setName(data.getName());
|
|
|
|
+ termConceptDTO.setCode(data.getCode());
|
|
termConceptDTO.setSource(5);
|
|
termConceptDTO.setSource(5);
|
|
list.add(termConceptDTO);
|
|
list.add(termConceptDTO);
|
|
}
|
|
}
|