数据引擎模式下增加推理接口辅检和诊断公表转换

aipt-service/src/main/java/com/diagbot/client/TranServiceClient.java

@@ -8,6 +8,7 @@ import com.diagbot.dto.HospitalDeptInfoDTO;
 import com.diagbot.dto.IndexDataDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SysSetInfoDTO;
+import com.diagbot.vo.DiseaseIcdVO;
 import com.diagbot.vo.GetDiseaseIcdVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.HospitalDeptInfoVO;
@@ -15,6 +16,7 @@ import com.diagbot.vo.HospitalSetVO;
 import com.diagbot.vo.IndexDataSaveVO;
 import com.diagbot.vo.IndexDataiIds;
 import com.diagbot.vo.LisConfigVO;
+import com.diagbot.vo.PacsConfigVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -75,6 +77,15 @@ public interface TranServiceClient {
     @PostMapping("/pacsConfig/getPacsConfigByHosCode")
     RespDTO<Map<String, String>> getPacsConfigByHosCode(@RequestBody HosCodeVO hosCodeVO);
 
+    /**
+     * 获取辅检映射关系
+     *
+     * @param pacsConfigVO
+     * @return
+     */
+    @PostMapping("/pacsConfig/getPacsConfig")
+    RespDTO<Map<String, List<String>>> getPacsConfig(@RequestBody PacsConfigVO pacsConfigVO);
+
     /**
      * 根据医院编码获取提示信息标题映射关系
      *
@@ -93,6 +104,15 @@ public interface TranServiceClient {
     @PostMapping("/diseaseIcd/getDiseaseIcdByHosCode")
     RespDTO<Map<String, String>> getDiseaseIcdByHosCode(@RequestBody HosCodeVO hosCodeVO);
 
+    /**
+     * 获取诊断名称映射map
+     *
+     * @param diseaseIcdVO
+     * @return
+     */
+    @PostMapping("/diseaseIcd/getDiseaseIcdMap")
+    RespDTO<Map<String, String>> getDiseaseIcdMap(DiseaseIcdVO diseaseIcdVO);
+
     /**
      * 数据服务模式是否对外对接
      *

aipt-service/src/main/java/com/diagbot/client/hystrix/TranServiceHystrix.java

@@ -8,6 +8,7 @@ import com.diagbot.dto.HospitalDeptInfoDTO;
 import com.diagbot.dto.IndexDataDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.SysSetInfoDTO;
+import com.diagbot.vo.DiseaseIcdVO;
 import com.diagbot.vo.GetDiseaseIcdVO;
 import com.diagbot.vo.GetTopPatientInfoVO;
 import com.diagbot.vo.HospitalDeptInfoVO;
@@ -15,8 +16,10 @@ import com.diagbot.vo.HospitalSetVO;
 import com.diagbot.vo.IndexDataSaveVO;
 import com.diagbot.vo.IndexDataiIds;
 import com.diagbot.vo.LisConfigVO;
+import com.diagbot.vo.PacsConfigVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
 import javax.validation.Valid;
@@ -73,6 +76,18 @@ public class TranServiceHystrix implements TranServiceClient {
         return null;
     }
 
+    /**
+     * 获取辅检映射关系
+     *
+     * @param pacsConfigVO
+     * @return
+     */
+    @Override
+    public RespDTO<Map<String, List<String>>> getPacsConfig(@RequestBody PacsConfigVO pacsConfigVO) {
+        log.error("【hystrix】调用{}异常", "getPacsConfig");
+        return null;
+    }
+
     /**
      * 根据医院编码获取提示信息标题映射关系
      *
@@ -97,6 +112,18 @@ public class TranServiceHystrix implements TranServiceClient {
         return null;
     }
 
+    /**
+     * 获取诊断名称映射map
+     *
+     * @param diseaseIcdVO
+     * @return
+     */
+    @Override
+    public RespDTO<Map<String, String>> getDiseaseIcdMap(DiseaseIcdVO diseaseIcdVO) {
+        log.error("【hystrix】调用{}异常", "getDiseaseIcdMap");
+        return null;
+    }
+
     /**
      * 数据服务模式是否对外对接
      *

aipt-service/src/main/java/com/diagbot/dto/PacsResult.java

@@ -0,0 +1,19 @@
+package com.diagbot.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/11/7 15:02
+ */
+@Getter
+@Setter
+public class PacsResult {
+    private String name;
+    @ApiModelProperty(hidden = true)
+    private String uniqueName;
+    private String result;
+}

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

@@ -5,6 +5,7 @@ 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;
@@ -13,13 +14,19 @@ 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;
 import org.springframework.stereotype.Component;
 
@@ -90,6 +97,43 @@ public class PushFacade {
             lisArr = addUniqueName(lisArr, searchVo.getHosCode());
             searchVo.setLisArr(lisArr);
         }
+
+        if (isConnect && searchVo.getSysType().equals(SysTypeEnum.LTAPI_SERVICE.getKey())) {
+            //辅检预处理，仅限数据引擎模式
+            List<PacsResult> pacsArr = searchVo.getPacsArr();
+            List<PacsResult> convertPacsArr = addPacsUniqueName(pacsArr, searchVo.getHosCode());
+            searchVo.setPacs(searchVo.getPacs() + ";" + getPacsString(convertPacsArr));
+
+            //诊断预处理
+            if (StringUtil.isNotBlank(searchVo.getDiag())) {
+                String[] diseases = searchVo.getDiag().replace(" ", "").split(",|，|;|；");
+                List<String> diseaseList = Arrays.asList(diseases);
+                diseaseList = diseaseList
+                        .stream()
+                        .filter(i -> StringUtil.isNotBlank(i))
+                        .distinct()
+                        .collect(Collectors.toList());
+                DiseaseIcdVO diseaseIcdVO = new DiseaseIcdVO();
+                diseaseIcdVO.setHosCode(searchVo.getHosCode());
+                diseaseIcdVO.setDiseaseNameList(diseaseList);
+                searchVo.setDiag(convertDisease(diseaseIcdVO, 1));
+            }
+
+            //治疗方案诊断转换
+            if (StringUtil.isNotBlank(searchVo.getDiseaseName())) {
+                String[] diseases = searchVo.getDiseaseName().replace(" ", "").split(",|，|;|；");
+                List<String> diseaseList = Arrays.asList(diseases);
+                diseaseList = diseaseList
+                        .stream()
+                        .filter(i -> StringUtil.isNotBlank(i))
+                        .collect(Collectors.toList());
+                DiseaseIcdVO diseaseIcdVO = new DiseaseIcdVO();
+                diseaseIcdVO.setHosCode(searchVo.getHosCode());
+                diseaseIcdVO.setDiseaseNameList(diseaseList);
+                searchVo.setDiseaseName(convertDisease(diseaseIcdVO, 1));
+            }
+        }
+
         ResponseData data = clinicalFacade.processClinicalData(searchVo);
 
         String featureType = searchVo.getFeatureType();
@@ -193,4 +237,92 @@ public class PushFacade {
         }
         return lisResults;
     }
+
+    /**
+     * 辅检公表转换
+     *
+     * @param pacsArr
+     * @param hosCode
+     * @return
+     */
+    public List<PacsResult> addPacsUniqueName(List<PacsResult> pacsArr, String hosCode) {
+        Map<String, PacsResult> pacsOriginalMap = EntityUtil.makeEntityMap(pacsArr, "name");
+        List<PacsResult> convertPacsArr = Lists.newLinkedList();
+        PacsConfigVO pacsConfigVO = new PacsConfigVO();
+        pacsConfigVO.setHosCode(hosCode);
+        pacsConfigVO.setMealNameList(pacsArr
+                .stream()
+                .map(pacsResult -> pacsResult.getName())
+                .distinct()
+                .collect(Collectors.toList()));
+        RespDTO<Map<String, List<String>>> pacsRespDTO = tranServiceClient.getPacsConfig(pacsConfigVO);
+        if (RespDTOUtil.respIsOK(pacsRespDTO)) {
+            Map<String, List<String>> pacsMap = pacsRespDTO.data;
+            for (Map.Entry<String, PacsResult> entry : pacsOriginalMap.entrySet()) {
+                if (ListUtil.isNotEmpty(pacsMap.get(entry.getKey()))) {
+                    for (String uniqueName : pacsMap.get(entry.getKey())) {
+                        PacsResult pacsResult = new PacsResult();
+                        BeanUtil.copyProperties(entry.getValue(), pacsResult);
+                        pacsResult.setUniqueName(uniqueName);
+                        convertPacsArr.add(pacsResult);
+                    }
+                } else {
+                    convertPacsArr.add(entry.getValue());
+                }
+            }
+        }
+        return convertPacsArr;
+    }
+
+    /**
+     * 辅检结构化结果拼接文本
+     *
+     * @param pacsArr
+     * @return
+     */
+    public String getPacsString(List<PacsResult> pacsArr) {
+        String pacsString = "";
+        for (PacsResult pacsResult : pacsArr) {
+            String pacsResultString = "";
+            if (StringUtils.isNotBlank(pacsResult.getUniqueName())) {
+                pacsResultString = pacsResult.getUniqueName() + ":";
+            } else {
+                pacsResultString = pacsResult.getName() + ":";
+            }
+            pacsResultString += pacsResult.getResult() + ";";
+            pacsString += pacsResultString;
+        }
+        return pacsString;
+    }
+
+    /**
+     * 诊断名称映射转换
+     *
+     * @param diseaseIcdVO
+     * @param type         1-外部名称转内部名称，2-内部名称转外部名称
+     * @return
+     */
+    public String convertDisease(DiseaseIcdVO diseaseIcdVO, Integer type) {
+        String convertDiag = "";
+        Map<String, String> disMap = new LinkedHashMap<>();
+        RespDTO<Map<String, String>> disRespDTO = tranServiceClient.getDiseaseIcdMap(diseaseIcdVO);
+        if (RespDTOUtil.respIsOK(disRespDTO)) {
+            disMap = disRespDTO.data;
+            List<String> disNameList = Lists.newLinkedList();
+            if (type.equals(1)) {
+                //外部名称转内部名称
+                disNameList = diseaseIcdVO.getDiseaseNameList();
+            } else if (type.equals(2)) {
+                //内部名称转外部名称
+                disNameList = diseaseIcdVO.getConceptDisNameList();
+            }
+
+            for (String diseaseName : disNameList) {
+                if (StringUtil.isNotBlank(disMap.get(diseaseName))) {
+                    convertDiag += disMap.get(diseaseName) + ",";
+                }
+            }
+        }
+        return convertDiag;
+    }
 }

aipt-service/src/main/java/com/diagbot/vo/DiseaseIcdVO.java

@@ -0,0 +1,19 @@
+package com.diagbot.vo;
+
+import com.diagbot.client.bean.HosCodeVO;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/11/8 14:54
+ */
+@Getter
+@Setter
+public class DiseaseIcdVO extends HosCodeVO {
+    private List<String> diseaseNameList;
+    private List<String> conceptDisNameList;
+}

aipt-service/src/main/java/com/diagbot/vo/PacsConfigVO.java

@@ -0,0 +1,19 @@
+package com.diagbot.vo;
+
+import com.diagbot.client.bean.HosCodeVO;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/11/7 16:09
+ */
+@Getter
+@Setter
+public class PacsConfigVO extends HosCodeVO {
+    private List<String> mealNameList;
+    private List<String> uniqueNameList;
+}

aipt-service/src/main/java/com/diagbot/vo/SearchVo.java

@@ -1,6 +1,7 @@
 package com.diagbot.vo;
 
 import com.diagbot.dto.LisResult;
+import com.diagbot.dto.PacsResult;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -32,6 +33,7 @@ public class SearchVo {
     private String lis;
     private List<LisResult> lisArr;
     private String pacs;
+    private List<PacsResult> pacsArr;
     private String diag;
     private String diseaseName; //指定诊断，例如取治疗方案
     private String scaleName;   //量表名称

ltapi-service/src/main/java/com/diagbot/client/bean/PacsResult.java

@@ -0,0 +1,19 @@
+package com.diagbot.client.bean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/11/7 15:02
+ */
+@Getter
+@Setter
+public class PacsResult {
+    private String name;
+    @ApiModelProperty(hidden = true)
+    private String uniqueName;
+    private String result;
+}

ltapi-service/src/main/java/com/diagbot/vo/PushVO.java

@@ -1,9 +1,12 @@
 package com.diagbot.vo;
 
+import com.diagbot.client.bean.PacsResult;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * @Description:
  * @Author:zhaops
@@ -20,6 +23,8 @@ public class PushVO  extends PushBaseVO {
     private String indications;   //推理指标
     private String hosCode;   //医院编码
 
+    private List<PacsResult> pacsArr;
+
     private String lisString;  //化验纯文本
     private String lisOrder;   //当前正在下单化验
     private String pacsOrder;   //当前正在下单辅检

tran-service/src/main/java/com/diagbot/facade/PacsConfigFacade.java

@@ -5,11 +5,15 @@ import com.diagbot.entity.PacsConfig;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.PacsConfigServiceImpl;
 import com.diagbot.util.EntityUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.vo.PacsConfigVO;
 import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @Description:
@@ -35,6 +39,37 @@ public class PacsConfigFacade extends PacsConfigServiceImpl{
         return retMap;
     }
 
+    /**
+     * 获取辅检映射关系
+     * @param pacsConfigVO
+     * @return
+     */
+    public Map<String,List<String>> getPacsConfig(PacsConfigVO pacsConfigVO) {
+        Map<String, List<String>> map = new HashMap<>();
+        Map<String, List<PacsConfig>> pacsMap = new LinkedHashMap<>();
+        QueryWrapper<PacsConfig> pacsConfigQueryWrapper = new QueryWrapper<>();
+        pacsConfigQueryWrapper
+                .eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_code", pacsConfigVO.getHosCode());
+        if (ListUtil.isNotEmpty(pacsConfigVO.getMealNameList())) {
+            pacsConfigQueryWrapper.in("meal_name", pacsConfigVO.getMealNameList());
+            List<PacsConfig> pacsConfigList = this.list(pacsConfigQueryWrapper);
+            pacsMap = EntityUtil.makeEntityListMap(pacsConfigList, "mealName");
+        } else if (ListUtil.isNotEmpty(pacsConfigVO.getUniqueNameList())) {
+            pacsConfigQueryWrapper.in("unique_name", pacsConfigVO.getUniqueNameList());
+            List<PacsConfig> pacsConfigList = this.list(pacsConfigQueryWrapper);
+            pacsMap = EntityUtil.makeEntityListMap(pacsConfigList, "uniqueName");
+        }
+        for (Map.Entry<String, List<PacsConfig>> entry : pacsMap.entrySet()) {
+            map.put(entry.getKey(), entry.getValue()
+                    .stream()
+                    .map(pacsConfig -> pacsConfig.getUniqueName())
+                    .distinct()
+                    .collect(Collectors.toList()));
+        }
+        return map;
+    }
+
     /**
      * 根据医院编码获取辅检公表映射关系，公表项做key  Map<uniqueName,List<mealName>>
      *

tran-service/src/main/java/com/diagbot/facade/TranDiseaseIcdFacade.java

@@ -6,6 +6,8 @@ import com.diagbot.entity.DiseaseIcd;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.service.impl.DiseaseIcdServiceImpl;
 import com.diagbot.util.EntityUtil;
+import com.diagbot.util.ListUtil;
+import com.diagbot.vo.DiseaseIcdVO;
 import com.diagbot.vo.GetDiseaseIcdVO;
 import org.springframework.stereotype.Component;
 
@@ -47,4 +49,27 @@ public class TranDiseaseIcdFacade extends DiseaseIcdServiceImpl {
         Map<String, String> retMap= EntityUtil.makeMapWithKeyValue(diseaseIcdList, "conceptDisName", "diseaseName");
         return retMap;
     }
+
+    /**
+     * 获取诊断映射关系
+     * @param diseaseIcdVO
+     * @return
+     */
+    public Map<String,String> getDiseaseIcdMap(DiseaseIcdVO diseaseIcdVO) {
+        Map<String, String> diseaseMap = new HashMap<>();
+        QueryWrapper<DiseaseIcd> diseaseIcdQueryWrapper = new QueryWrapper<>();
+        diseaseIcdQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
+                .eq("hospital_code", diseaseIcdVO.getHosCode());
+        if (ListUtil.isNotEmpty(diseaseIcdVO.getDiseaseNameList())) {
+            diseaseIcdQueryWrapper.in("disease_name", diseaseIcdVO.getDiseaseNameList());
+            List<DiseaseIcd> diseaseIcdList = this.list(diseaseIcdQueryWrapper);
+            diseaseMap = EntityUtil.makeMapWithKeyValue(diseaseIcdList, "diseaseName", "conceptDisName");
+
+        } else if (ListUtil.isNotEmpty(diseaseIcdVO.getConceptDisNameList())) {
+            diseaseIcdQueryWrapper.in("concept_dis_name", diseaseIcdVO.getConceptDisNameList());
+            List<DiseaseIcd> diseaseIcdList = this.list(diseaseIcdQueryWrapper);
+            diseaseMap = EntityUtil.makeMapWithKeyValue(diseaseIcdList, "conceptDisName", "diseaseName");
+        }
+        return diseaseMap;
+    }
 }

tran-service/src/main/java/com/diagbot/vo/DiseaseIcdVO.java

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/11/8 14:54
+ */
+@Getter
+@Setter
+public class DiseaseIcdVO extends HosCodeVO {
+    private List<String> diseaseNameList;
+    private List<String> conceptDisNameList;
+}

tran-service/src/main/java/com/diagbot/vo/PacsConfigVO.java

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/11/7 16:09
+ */
+@Getter
+@Setter
+public class PacsConfigVO extends HosCodeVO {
+    private List<String> mealNameList;
+    private List<String> uniqueNameList;
+}

tran-service/src/main/java/com/diagbot/web/PacsConfigController.java

@@ -4,6 +4,7 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.PacsConfigFacade;
 import com.diagbot.vo.HosCodeVO;
+import com.diagbot.vo.PacsConfigVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,4 +45,14 @@ public class PacsConfigController {
     public RespDTO<Map<String, List<String>>> getPacsConfigByUniqueNameAndHosCode(@RequestBody HosCodeVO hosCodeVO) {
         return RespDTO.onSuc(pacsConfigFacade.getPacsConfigByUniqueNameAndHosCode(hosCodeVO.getHosCode()));
     }
+
+    @ApiOperation(value = "获取辅检映射关系:[by:zhaops]",
+            notes = "hosCode:医院编码，必填<br>" +
+                    "mealNameList:辅检项目外部名称列表<br>" +
+                    "uniqueNameList:辅检项目内部名称列表<br>")
+    @PostMapping("/getPacsConfig")
+    @SysLogger("getPacsConfig")
+    public RespDTO<Map<String, List<String>>> getPacsConfig(@RequestBody PacsConfigVO pacsConfigVO) {
+        return RespDTO.onSuc(pacsConfigFacade.getPacsConfig(pacsConfigVO));
+    }
 }

tran-service/src/main/java/com/diagbot/web/TranDiseaseIcdController.java

@@ -5,6 +5,7 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.GetDiseaseIcdDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.TranDiseaseIcdFacade;
+import com.diagbot.vo.DiseaseIcdVO;
 import com.diagbot.vo.GetDiseaseIcdVO;
 import com.diagbot.vo.HosCodeVO;
 import io.swagger.annotations.Api;
@@ -54,4 +55,14 @@ public class TranDiseaseIcdController {
     public RespDTO<Map<String, String>> getDiseaseIcdByHosCode(@RequestBody HosCodeVO hosCodeVO) {
         return RespDTO.onSuc(diseaseIcdFacade.getDiseaseIcdByHosCode(hosCodeVO.getHosCode()));
     }
+
+    @ApiOperation(value = "获取诊断名称映射map:[by:zhaops]",
+            notes = "hosCode: 医院编码，必填<br>" +
+                    "diseaseNameList: 外部诊断名称列表<br>" +
+                    "conceptDisNameList: 内部诊断名称列表<br>")
+    @PostMapping("/getDiseaseIcdMap")
+    @SysLogger("getDiseaseIcdMap")
+    public RespDTO<Map<String, String>> getDiseaseIcdMap(DiseaseIcdVO diseaseIcdVO) {
+        return RespDTO.onSuc(diseaseIcdFacade.getDiseaseIcdMap(diseaseIcdVO));
+    }
 }