|
@@ -16,6 +16,7 @@ import com.diagbot.exception.CommonErrorCode;
|
|
|
import com.diagbot.exception.CommonException;
|
|
|
import com.diagbot.service.impl.ConceptDetailServiceImpl;
|
|
|
import com.diagbot.util.BeanUtil;
|
|
|
+import com.diagbot.util.CryptUtil;
|
|
|
import com.diagbot.util.EntityUtil;
|
|
|
import com.diagbot.util.ListUtil;
|
|
|
import com.diagbot.util.ParamConvertUtil;
|
|
@@ -233,8 +234,11 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
|
|
|
public List<ConceptIntroduceVO> convertParam(ConnectIntroduceVO connectIntroduceVO) {
|
|
|
List<ConceptIntroduceVO> retList = Lists.newLinkedList();
|
|
|
List<String> nameList = Lists.newLinkedList();
|
|
|
- nameList.add(connectIntroduceVO.getName());
|
|
|
- if (connectIntroduceVO.getSysType() != null && !connectIntroduceVO.getSysType().equals(SysTypeEnum.LTAPI_SERVICE.getKey())) {
|
|
|
+ nameList.add(CryptUtil.decrypt_char(connectIntroduceVO.getName()));
|
|
|
+ if (connectIntroduceVO.getSysType() == null) {
|
|
|
+ connectIntroduceVO.setSysType(SysTypeEnum.AIPT_SERVICE.getKey());
|
|
|
+ }
|
|
|
+ if (!connectIntroduceVO.getSysType().equals(SysTypeEnum.LTAPI_SERVICE.getKey())) {
|
|
|
ConceptIntroduceVO conceptIntroduceVO = new ConceptIntroduceVO();
|
|
|
BeanUtil.copyProperties(connectIntroduceVO, conceptIntroduceVO);
|
|
|
conceptIntroduceVO.setLibType(ParamConvertUtil.conceptConvert2Lib(conceptIntroduceVO.getType()));
|
|
@@ -248,17 +252,17 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
|
|
|
if (connectIntroduceVO.getType().equals(ConceptTypeEnum.Lis.getKey())) {
|
|
|
Map<String, Map<String, List<String>>> lisConfigMap
|
|
|
= transferFacade.getLisConfigByMealNameAndHosCode(nameList, connectIntroduceVO.getHosCode());
|
|
|
- if (lisConfigMap.get(connectIntroduceVO.getName()) != null) {
|
|
|
- Map<String, List<String>> itemMap = lisConfigMap.get(connectIntroduceVO.getName());
|
|
|
+ if (lisConfigMap.get(CryptUtil.decrypt_char(connectIntroduceVO.getName())) != null) {
|
|
|
+ Map<String, List<String>> itemMap = lisConfigMap.get(CryptUtil.decrypt_char(connectIntroduceVO.getName()));
|
|
|
if (StringUtil.isBlank(connectIntroduceVO.getDetailName())) {
|
|
|
- connectIntroduceVO.setDetailName("");
|
|
|
+ connectIntroduceVO.setDetailName(CryptUtil.encrypt_char(""));
|
|
|
}
|
|
|
- List<String> uniqueNameList = itemMap.get(connectIntroduceVO.getDetailName());
|
|
|
+ List<String> uniqueNameList = itemMap.get(CryptUtil.decrypt_char(connectIntroduceVO.getDetailName()));
|
|
|
if (ListUtil.isNotEmpty(uniqueNameList)) {
|
|
|
for (String uniqueName : uniqueNameList) {
|
|
|
ConceptIntroduceVO conceptIntroduceVO = new ConceptIntroduceVO();
|
|
|
BeanUtil.copyProperties(connectIntroduceVO, conceptIntroduceVO);
|
|
|
- conceptIntroduceVO.setName(uniqueName);
|
|
|
+ conceptIntroduceVO.setName(CryptUtil.encrypt_char(uniqueName));
|
|
|
conceptIntroduceVO.setType(ConceptTypeEnum.LIS_TABLES.getKey());
|
|
|
conceptIntroduceVO.setLibType(LexiconTypeEnum.LIS_TABLES.getKey());
|
|
|
retList.add(conceptIntroduceVO);
|
|
@@ -272,10 +276,10 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
|
|
|
RespDTO<Map<String, List<String>>> pacsRespDTO = tranServiceClient.getPacsConfig(pacsConfigVO);
|
|
|
if (RespDTOUtil.respIsOK(pacsRespDTO)) {
|
|
|
Map<String, List<String>> pacsMap = pacsRespDTO.data;
|
|
|
- for (String pacsStr : pacsMap.get(connectIntroduceVO.getName())) {
|
|
|
+ for (String pacsStr : pacsMap.get(CryptUtil.decrypt_char(connectIntroduceVO.getName()))) {
|
|
|
ConceptIntroduceVO conceptIntroduceVO = new ConceptIntroduceVO();
|
|
|
BeanUtil.copyProperties(connectIntroduceVO, conceptIntroduceVO);
|
|
|
- conceptIntroduceVO.setName(pacsStr);
|
|
|
+ conceptIntroduceVO.setName(CryptUtil.encrypt_char(pacsStr));
|
|
|
conceptIntroduceVO.setType(ConceptTypeEnum.Pacs.getKey());
|
|
|
conceptIntroduceVO.setLibType(LexiconTypeEnum.PACS_ITEMS.getKey());
|
|
|
retList.add(conceptIntroduceVO);
|
|
@@ -290,10 +294,10 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
|
|
|
RespDTO<Map<String, String>> disRespDTO = tranServiceClient.getDiseaseIcdMap(diseaseIcdVO);
|
|
|
if (RespDTOUtil.respIsOK(disRespDTO)) {
|
|
|
disMap = disRespDTO.data;
|
|
|
- if (disMap.get(connectIntroduceVO.getName()) != null) {
|
|
|
+ if (disMap.get(CryptUtil.decrypt_char(connectIntroduceVO.getName())) != null) {
|
|
|
ConceptIntroduceVO conceptIntroduceVO = new ConceptIntroduceVO();
|
|
|
BeanUtil.copyProperties(connectIntroduceVO, conceptIntroduceVO);
|
|
|
- conceptIntroduceVO.setName(disMap.get(connectIntroduceVO.getName()));
|
|
|
+ conceptIntroduceVO.setName(CryptUtil.encrypt_char(disMap.get(CryptUtil.decrypt_char(connectIntroduceVO.getName()))));
|
|
|
conceptIntroduceVO.setType(ConceptTypeEnum.Disease.getKey());
|
|
|
conceptIntroduceVO.setLibType(LexiconTypeEnum.DIAGNOSIS.getKey());
|
|
|
retList.add(conceptIntroduceVO);
|
|
@@ -305,6 +309,11 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
|
|
|
conceptIntroduceVO.setLibType(ParamConvertUtil.conceptConvert2Lib(conceptIntroduceVO.getType()));
|
|
|
retList.add(conceptIntroduceVO);
|
|
|
}
|
|
|
+ } else {
|
|
|
+ ConceptIntroduceVO conceptIntroduceVO = new ConceptIntroduceVO();
|
|
|
+ BeanUtil.copyProperties(connectIntroduceVO, conceptIntroduceVO);
|
|
|
+ conceptIntroduceVO.setLibType(ParamConvertUtil.conceptConvert2Lib(conceptIntroduceVO.getType()));
|
|
|
+ retList.add(conceptIntroduceVO);
|
|
|
}
|
|
|
return retList;
|
|
|
}
|