数据引擎推理接口

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

@@ -2,29 +2,17 @@ package com.diagbot.facade;
 
 import com.alibaba.fastjson.JSONObject;
 import com.diagbot.client.TranServiceClient;
-import com.diagbot.client.bean.HosCodeVO;
 import com.diagbot.client.bean.ResponseData;
 import com.diagbot.dto.LisResult;
 import com.diagbot.dto.PacsResult;
 import com.diagbot.dto.PushDTO;
-import com.diagbot.dto.RespDTO;
-import com.diagbot.dto.SysSetInfoDTO;
 import com.diagbot.enums.FeatureTypeEnum;
-import com.diagbot.enums.LisSourceEnum;
 import com.diagbot.enums.SysTypeEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
-import com.diagbot.util.BeanUtil;
-import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
-import com.diagbot.util.RespDTOUtil;
 import com.diagbot.util.StringUtil;
-import com.diagbot.vo.DiseaseIcdVO;
-import com.diagbot.vo.HospitalSetVO;
-import com.diagbot.vo.LisConfigVO;
-import com.diagbot.vo.PacsConfigVO;
 import com.diagbot.vo.SearchVo;
-import com.google.common.collect.Lists;
 import io.github.lvyahui8.spring.aggregate.facade.DataBeanAggregateQueryFacade;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -33,11 +21,9 @@ import org.springframework.stereotype.Component;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 /**
  * @Description:
@@ -187,8 +173,10 @@ public class PushFacade {
         if (isConnect && searchVo.getSysType().equals(SysTypeEnum.LTAPI_SERVICE.getKey())) {
             //辅检预处理
             List<PacsResult> pacsArr = searchVo.getPacsArr();
-            List<PacsResult> convertPacsArr = transferFacade.addPacsUniqueName(pacsArr, searchVo.getHosCode());
-            searchVo.setPacs(searchVo.getPacs() + ";" + getPacsString(convertPacsArr));
+            if (ListUtil.isNotEmpty(pacsArr)) {
+                List<PacsResult> convertPacsArr = transferFacade.addPacsUniqueName(pacsArr, searchVo.getHosCode());
+                searchVo.setPacs(searchVo.getPacs() + ";" + getPacsString(convertPacsArr));
+            }
 
             //诊断预处理
             if (StringUtil.isNotBlank(searchVo.getDiag())) {
@@ -199,6 +187,11 @@ public class PushFacade {
             if (StringUtil.isNotBlank(searchVo.getDiseaseName())) {
                 searchVo.setDiseaseName(transferFacade.convertDisease(searchVo.getDiseaseName(), searchVo.getHosCode(), 1));
             }
+
+            //化验开单项
+            searchVo.setLisOrder(transferFacade.lisStrConvert(searchVo.getLisOrder(), searchVo.getHosCode()));
+            //辅检开单项
+            searchVo.setPacsOrder(transferFacade.pacsStrConvert(searchVo.getPacsOrder(), searchVo.getHosCode()));
         }
         return searchVo;
     }