删除无用代码

src/main/java/com/diagbot/aggregate/BillNeoAggregate.java

@@ -1,140 +0,0 @@
-package com.diagbot.aggregate;
-
-import com.diagbot.dto.BillNeoDTO;
-import com.diagbot.facade.NeoFacade;
-import com.diagbot.util.ListUtil;
-import com.diagbot.vo.BillNeoVO;
-import io.github.lvyahui8.spring.annotation.DataConsumer;
-import io.github.lvyahui8.spring.annotation.DataProvider;
-import io.github.lvyahui8.spring.annotation.InvokeParameter;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @Description: 从图谱去开单数据聚合
- * @author: gaodm
- * @time: 2020/10/22 9:24
- */
-@Component
-@Slf4j
-public class BillNeoAggregate {
-    @Autowired
-    private NeoFacade neoFacade;
-
-    @DataProvider("getBillNeo")
-    public List<BillNeoDTO> getBillNeo(
-            @InvokeParameter("billNeoVO") BillNeoVO billNeoVO,
-            @DataConsumer("getDrugBill") List<BillNeoDTO> drugBillList,
-            @DataConsumer("getPacsBill") List<BillNeoDTO> pacsBillList,
-            @DataConsumer("getLisDetailBill") List<BillNeoDTO> lisDetailBillList,
-            @DataConsumer("getLisBill") List<BillNeoDTO> lisBillList,
-            @DataConsumer("getOperationBill") List<BillNeoDTO> operationBillList,
-            @DataConsumer("getCombiOpBill") List<BillNeoDTO> combiOpBillList,
-            @DataConsumer("getTransfusionBill") List<BillNeoDTO> transfusionBillList) {
-        List<BillNeoDTO> billNeoDTOs = new ArrayList<>();
-
-        addbillNeoDTO(billNeoDTOs, drugBillList);
-        addbillNeoDTO(billNeoDTOs, pacsBillList);
-        addbillNeoDTO(billNeoDTOs, lisDetailBillList);
-        addbillNeoDTO(billNeoDTOs, lisBillList);
-        addbillNeoDTO(billNeoDTOs, operationBillList);
-        addbillNeoDTO(billNeoDTOs, combiOpBillList);
-        addbillNeoDTO(billNeoDTOs, transfusionBillList);
-
-        return billNeoDTOs;
-    }
-
-    private void addbillNeoDTO(List<BillNeoDTO> billNeoDTOs, List<BillNeoDTO> billNeoDTOList) {
-        if (ListUtil.isNotEmpty(billNeoDTOList)) {
-            billNeoDTOs.addAll(billNeoDTOList);
-        }
-    }
-
-    /**
-     * 药品
-     *
-     * @param billNeoVO
-     * @return
-     */
-    @DataProvider("getDrugBill")
-    public List<BillNeoDTO> getDrugBill(@InvokeParameter("billNeoVO") BillNeoVO billNeoVO) {
-//        return neoFacade.getDrugBill(billNeoVO.getDrugList());
-        return ListUtil.newArrayList();
-    }
-
-    /**
-     * 检查
-     *
-     * @param billNeoVO
-     * @return
-     */
-    @DataProvider("getPacsBill")
-    public List<BillNeoDTO> getPacsBill(@InvokeParameter("billNeoVO") BillNeoVO billNeoVO) {
-//        return neoFacade.getPacsBill(billNeoVO.getPacsList());
-        return ListUtil.newArrayList();
-    }
-
-    /**
-     * 检验明细
-     *
-     * @param billNeoVO
-     * @return
-     */
-    @DataProvider("getLisDetailBill")
-    public List<BillNeoDTO> getLisDetailBill(@InvokeParameter("billNeoVO") BillNeoVO billNeoVO) {
-//        return neoFacade.getLisDetailBill(billNeoVO.getLisDetailList());
-        return ListUtil.newArrayList();
-    }
-
-    /**
-     * 检验套餐
-     *
-     * @param billNeoVO
-     * @return
-     */
-    @DataProvider("getLisBill")
-    public List<BillNeoDTO> getLisBill(@InvokeParameter("billNeoVO") BillNeoVO billNeoVO) {
-//        return neoFacade.getLisBill(billNeoVO.getLisList());
-        return ListUtil.newArrayList();
-    }
-
-    /**
-     * 手术和操作
-     *
-     * @param billNeoVO
-     * @return
-     */
-    @DataProvider("getOperationBill")
-    public List<BillNeoDTO> getOperationBill(@InvokeParameter("billNeoVO") BillNeoVO billNeoVO) {
-//        return neoFacade.getOperationBill(billNeoVO.getOperationList());
-        return ListUtil.newArrayList();
-    }
-
-    /**
-     * 联合项目
-     *
-     * @param billNeoVO
-     * @return
-     */
-    @DataProvider("getCombiOpBill")
-    public List<BillNeoDTO> getCombiOpBill(@InvokeParameter("billNeoVO") BillNeoVO billNeoVO) {
-//        return neoFacade.getCombiOpBill(billNeoVO.getCombiopList());
-        return ListUtil.newArrayList();
-    }
-
-    /**
-     * 输血
-     *
-     * @param billNeoVO
-     * @return
-     */
-    @DataProvider("getTransfusionBill")
-    public List<BillNeoDTO> getTransfusionBill(@InvokeParameter("billNeoVO") BillNeoVO billNeoVO) {
-//        return neoFacade.getTransfusionBill(billNeoVO.getTransfusionList());
-        return ListUtil.newArrayList();
-    }
-}

src/main/java/com/diagbot/aggregate/IndicationAggregate.java

@@ -109,7 +109,7 @@ public class IndicationAggregate {
         // 高风险提示
         if (indicationPushVO != null && indicationPushVO.getRuleTypeList().contains("3")) {
             try {
-                highRiskFacade.highRiskFac(indicationPushVO, wordCrfDTO, res);
+                highRiskFacade.highRiskFac(wordCrfDTO, res);
                 CoreUtil.getDebugStr(start, "高风险提示耗时", res.getDebug());
             } catch (Exception e) {
                 log.error("【高风险提示出错】", e);

src/main/java/com/diagbot/facade/HighRiskFacade.java

@@ -1,16 +1,11 @@
 package com.diagbot.facade;
 
-import com.diagbot.biz.push.entity.Item;
 import com.diagbot.dto.IndicationDTO;
 import com.diagbot.dto.WordCrfDTO;
 import com.diagbot.process.HighRiskProcess;
-import com.diagbot.vo.HighRiskNeoVO;
-import com.diagbot.vo.IndicationPushVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * @Description: 高风险合理性facade
  * @author: zhoutg
@@ -31,89 +26,14 @@ public class HighRiskFacade {
      * @param
      * @return
      */
-    public void highRiskFac(IndicationPushVO indicationPushVO, WordCrfDTO wordCrfDTO, IndicationDTO res) {
+    public void highRiskFac(WordCrfDTO wordCrfDTO, IndicationDTO res) {
         // 高危药品
         highRiskProcess.processDrug(wordCrfDTO, res);
 
         // 高危手术
         highRiskProcess.processOperation(wordCrfDTO, res);
-        // // 高风险图谱接口调用
-        // // HighRiskNeoVO highRiskNeoVO = fillHighRiskNeo(wordCrfDTO);
-        // List<HighRiskNeoDTO> highRiskNeoDTOList = neoFacade.getHighRiskNeo(wordCrfDTO);
-        // // 规则处理
-        // // TODO 测试数据开始
-        // // HighRiskNeoDTO highRiskNeoDTO = new HighRiskNeoDTO();
-        // // highRiskNeoDTO.setIsHighrisk(false);
-        // // highRiskNeoDTO.setName("锁骨下动脉药物洗脱支架置入术");
-        // // highRiskNeoDTO.setStandname("锁骨下动脉药物洗脱支架置入术");
-        // // highRiskNeoDTO.setType("手术");
-        // // List<NodeNeoDTO> factor = highRiskNeoDTO.getFactor();
-        // // NodeNeoDTO nodeNeo = new NodeNeoDTO();
-        // // nodeNeo.setTermtype("诊断");
-        // // nodeNeo.setName("急性胰腺炎");
-        // // factor.add(nodeNeo);
-        // // NodeNeoDTO nodeLis = new NodeNeoDTO();
-        // // nodeLis.setTermtype("化验");
-        // // nodeLis.setName("白细胞计数");
-        // // nodeLis.setMax(new BigDecimal(20));
-        // // nodeLis.setMin(new BigDecimal(10));
-        // // nodeLis.setValType(0);
-        // // factor.add(nodeLis);
-        // // NodeNeoDTO nodeLis1 = new NodeNeoDTO();
-        // // nodeLis1.setTermtype("化验");
-        // // nodeLis1.setName("红细胞压积");
-        // // nodeLis1.setVal("阳性");
-        // // factor.add(nodeLis1);
-        // //
-        // // NodeNeoDTO nodePass = new NodeNeoDTO();
-        // // nodePass.setTermtype("辅检");
-        // // nodePass.setName("胸部CT");
-        // // nodePass.setVal("肺叶根治性切除标本");
-        // // factor.add(nodePass);
-        // // NodeNeoDTO vital = new NodeNeoDTO();
-        // // vital.setName("体温");
-        // // vital.setMax(new BigDecimal("39.1"));
-        // // vital.setMin(new BigDecimal("35.1"));
-        // // vital.setValType(1);
-        // // vital.setTermtype("查体");
-        // // factor.add(vital);
-        // // //
-        // // NodeNeoDTO vitalBp = new NodeNeoDTO();
-        // // vitalBp.setName("意识模糊");
-        // // vitalBp.setValType(1);
-        // // vitalBp.setVal("意识模糊");
-        // // vitalBp.setTermtype("查体");
-        // // factor.add(vitalBp);
-        // //
-        // // NodeNeoDTO vitalBp2 = new NodeNeoDTO();
-        // // vitalBp2.setName("年龄");
-        // // vitalBp2.setMax(new BigDecimal("1"));
-        // // vitalBp2.setMin(new BigDecimal("18"));
-        // // vitalBp2.setValType(1);
-        // // vitalBp2.setTermtype("年龄");
-        // // factor.add(vitalBp2);
-        // //
-        // // highRiskNeoDTOList.add(highRiskNeoDTO);
-        // // TODO 测试数据结束
-        // highRiskProcess.process(highRiskNeoDTOList, res,wordCrfDTO);
 
         // 结果去重处理
         commonFacade.dealMsg(res.getHighRiskList());
     }
-
-
-    public HighRiskNeoVO fillHighRiskNeo(WordCrfDTO wordCrfDTO) {
-        HighRiskNeoVO highRiskNeoVO = new HighRiskNeoVO();
-
-        highRiskNeoVO.getDrugList().addAll(wordCrfDTO.getDrugOrder());
-
-        List<Item> items = wordCrfDTO.getOperationOrder();
-
-        for (Item item : items) {
-            highRiskNeoVO.getOperationList().put(item.getName(), item.getUniqueName());
-        }
-
-
-        return highRiskNeoVO;
-    }
 }