Merge remote-tracking branch 'origin/dev/neo2mysql20210120' into dev/neo2mysql20210120

src/main/java/com/diagbot/dto/BillNeoDTO.java

@@ -1,36 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Data;
-
-/**
- * @description: 开单合理性图谱数据
- * @author: Mark
- * @time: 2020/7/29 9:57
- */
-@Data
-public class BillNeoDTO {
-
-    // 开单项目名称
-    private String name;
-
-    // 开单标准名称
-    private String standname;
-
-    // 化验开单合理性项目
-    private LisBillNeoDTO lisBillNeoDTO;
-
-    // 辅检开单合理性项目
-    private PacsBillNeoDTO pacsBillNeoDTO;
-
-    // 药品开单合理性项目
-    private DrugBillNeoDTO drugBillNeoDTO;
-
-    // 手术和操作开单合理性项目
-    private OperationBillNeoDTO operationBillNeoDTO;
-
-    // 联合项目开单合理性项目
-    private CombiOpBillNeoDTO combiOpBillNeoDTO;
-
-    // 输血开单合理性项目
-    private TransfusionBillNeoDTO transfusionBillNeoDTO;
-}

src/main/java/com/diagbot/dto/BillNeoMaxDTO.java

@@ -1,77 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @description: 开单合理性图谱数据
- * @author: Mark
- * @time: 2020/7/29 9:57
- */
-@Data
-public class BillNeoMaxDTO {
-
-    /****************扩展数据开始******************/
-    // 开单名称
-    private String orderName;
-
-    // 开单标准名称
-    private String orderStandName;
-
-    // 类型
-    private String type;
-
-    // 日期
-    private String dateValue;
-    /****************扩展数据结束******************/
-
-    // 禁忌性别
-    private NodeNeoDTO gender;
-
-    // 年龄
-    private NodeNeoDTO ageNeoDTO;
-
-    // 临床表现
-    private List<NodeNeoDTO> clinicfindings = new ArrayList<>();
-
-    // 服用药品
-    private List<NodeNeoDTO> oralmeds = new ArrayList<>();
-
-    // 禁忌过敏药品
-    private List<NodeNeoDTO> allergicmeds = new ArrayList<>();
-
-    // 禁忌手术
-    private List<NodeNeoDTO> operations = new ArrayList<>();
-
-    // 禁忌医疗器械及物品
-    private List<NodeNeoDTO> meddevice = new ArrayList<>();
-
-    // 禁忌实验室检查
-    private List<NodeNeoDTO> lis = new ArrayList<>();
-
-    // 禁忌辅助检查
-    private List<NodeNeoDTO> pacs = new ArrayList<>();
-
-    // 禁忌疾病
-    private List<NodeNeoDTO> disease = new ArrayList<>();
-
-    // 禁用人群
-    private List<NodeNeoDTO> group = new ArrayList<>();
-
-    // 配伍禁忌
-    private List<NodeNeoDTO> conflictmeds = new ArrayList<>();
-
-    // 体征
-    private List<NodeNeoDTO> vitals = new ArrayList<>();
-
-    // 禁用辅助检查描述
-    private List<NodeNeoDTO> pacsDesc = new ArrayList<>();
-
-    // 互斥开单辅助检查
-    private List<NodeNeoDTO> pacsOrder = new ArrayList<>();
-
-    // 无需重复辅检开单项
-    private List<NodeNeoDTO> needlessPacsOrder = new ArrayList<>();
-}

src/main/java/com/diagbot/dto/CombiOpBillNeoDTO.java

@@ -1,48 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @description: 联合项目开单合理性图谱数据
- * @author: Mark
- * @time: 2020/7/29 9:57
- */
-@Data
-public class CombiOpBillNeoDTO {
-    // 禁忌性别
-    private NodeNeoDTO gender;
-
-    // 年龄
-    private NodeNeoDTO ageNeoDTO;
-
-    // 临床表现
-    private List<NodeNeoDTO> clinicfindings = new ArrayList<>();
-
-    // 体征
-    private List<NodeNeoDTO> vitals = new ArrayList<>();
-
-    // 服用药品
-    private List<NodeNeoDTO> oralmeds = new ArrayList<>();
-
-    // 禁忌药品过敏源
-    private List<NodeNeoDTO> medallergens = new ArrayList<>();
-
-    // 禁忌实验室检查
-    private List<NodeNeoDTO> lis = new ArrayList<>();
-
-    // 禁忌辅助检查
-    private List<NodeNeoDTO> pacs = new ArrayList<>();
-
-    // 禁忌疾病
-    private List<NodeNeoDTO> disease = new ArrayList<>();
-
-    // 禁用人群
-    private List<NodeNeoDTO> group = new ArrayList<>();
-
-    // 禁用辅助检查描述
-    private List<NodeNeoDTO> pacsDesc = new ArrayList<>();
-
-}

src/main/java/com/diagbot/dto/CriticalNeoDTO.java

@@ -1,25 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Data;
-
-/**
- * @description: 危急值图谱数据
- * @author: Mark
- * @time: 2020/7/29 9:57
- */
-@Data
-public class CriticalNeoDTO {
-
-    // 项目名称
-    private String name;
-
-    // 标准名称
-    private String standname;
-
-    // 危急值数据
-    private NodeNeoDTO critical;
-
-    // 类型，例如：“化验”，“辅检”，“体征”
-    private String type;
-
-}

src/main/java/com/diagbot/dto/DiseaseNeoDTO.java

@@ -1,45 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @description: 疾病图谱数据
- * @author: Mark
- * @time: 2020/08/10 10:19
- */
-@Data
-public class DiseaseNeoDTO {
-    // 性别
-    private NodeNeoDTO gender;
-
-    // 年龄
-    private NodeNeoDTO ageNeoDTO;
-
-    // 临床表现
-    private List<NodeNeoDTO> clinicfindings = new ArrayList<>();
-
-    // 药品
-    private List<NodeNeoDTO> medicines = new ArrayList<>();
-
-    // 过敏药品
-//    private List<NodeNeoDTO> allergicmeds = new ArrayList<>();
-
-    // 手术
-    private List<NodeNeoDTO> operations = new ArrayList<>();
-
-    // 化验
-    private List<NodeNeoDTO> lis = new ArrayList<>();
-
-    // 辅助检查
-    private List<NodeNeoDTO> pacs = new ArrayList<>();
-
-    // 鉴别诊断
-    private List<NodeNeoDTO> diff_disease = new ArrayList<>();
-
-    // 并发症
-    private List<NodeNeoDTO> complications = new ArrayList<>();
-
-}

src/main/java/com/diagbot/dto/DrugBillNeoDTO.java

@@ -1,56 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @description: 药品开单合理性图谱数据
- * @author: Mark
- * @time: 2020/7/29 9:57
- */
-@Data
-public class DrugBillNeoDTO {
-    // 禁忌性别
-    private NodeNeoDTO gender;
-
-    // 禁忌年龄
-    private NodeNeoDTO ageNeoDTO;
-
-    // 禁忌给药途径
-    private NodeNeoDTO geiyaoNeoDTO;
-
-    // 临床表现
-    private List<NodeNeoDTO> clinicfindings = new ArrayList<>();
-
-    // 体征
-    private List<NodeNeoDTO> vitals = new ArrayList<>();
-
-    // 禁忌手术
-    private List<NodeNeoDTO> operations = new ArrayList<>();
-
-    // 禁忌实验室检查
-    private List<NodeNeoDTO> lis = new ArrayList<>();
-
-    // 禁忌辅助检查
-    private List<NodeNeoDTO> pacs = new ArrayList<>();
-
-    // 禁忌过敏药品
-    private List<NodeNeoDTO> allergicmeds = new ArrayList<>();
-
-    // 禁忌疾病
-    private List<NodeNeoDTO> disease = new ArrayList<>();
-
-    // 禁用人群
-    private List<NodeNeoDTO> group = new ArrayList<>();
-
-    // 配伍禁忌
-    private List<NodeNeoDTO> conflictmeds = new ArrayList<>();
-
-    // 禁用辅助检查描述
-    private List<NodeNeoDTO> pacsDesc = new ArrayList<>();
-
-    // 禁忌医疗器械及物品
-    private List<NodeNeoDTO> meddevice = new ArrayList<>();
-}

src/main/java/com/diagbot/dto/HighRiskNeoDTO.java

@@ -1,37 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @description: 高危图谱数据
- * @author: Mark
- * @time: 2020/7/29 9:57
- */
-@Data
-public class HighRiskNeoDTO {
-
-    // 高危项目名称
-    private String name;
-
-    // 高危标准名称
-    private String standname;
-
-    // 是否高危 - True:是，False:否
-    private Boolean isHighrisk = false;
-
-    // 高危级别
-    private String highLevel;
-
-    // 高危相关因素
-    private List<NodeNeoDTO> factor = new ArrayList<>();
-
-    // 类型，“药品”，“手术”
-    private String type;
-
-    // 药品剂型
-    private String form;
-
-}

src/main/java/com/diagbot/dto/LisBillNeoDTO.java

@@ -1,48 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @description: 化验开单合理性图谱数据
- * @author: Mark
- * @time: 2020/7/29 9:57
- */
-@Data
-public class LisBillNeoDTO {
-    // 禁忌性别
-    private NodeNeoDTO gender;
-
-    // 年龄
-    private NodeNeoDTO ageNeoDTO;
-
-    // 临床表现
-    private List<NodeNeoDTO> clinicfindings = new ArrayList<>();
-
-    // 体征
-    private List<NodeNeoDTO> vitals = new ArrayList<>();
-
-    // 服用药品
-    private List<NodeNeoDTO> oralmeds = new ArrayList<>();
-
-    // 禁忌过敏药品
-//    private List<NodeNeoDTO> allergicmeds = new ArrayList<>();
-
-    // 禁忌手术
-    private List<NodeNeoDTO> operations = new ArrayList<>();
-
-    // 禁忌辅助检查
-    private List<NodeNeoDTO> pacs = new ArrayList<>();
-
-    // 禁忌疾病
-    private List<NodeNeoDTO> disease = new ArrayList<>();
-
-    // 禁用人群
-    private List<NodeNeoDTO> group = new ArrayList<>();
-
-    // 禁用辅助检查描述
-    private List<NodeNeoDTO> pacsDesc = new ArrayList<>();
-
-}

src/main/java/com/diagbot/dto/NeoEntityDTO.java

@@ -1,33 +0,0 @@
-package com.diagbot.dto;
-
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @description: 图谱实体内容
- * @author: Mark
- * @time: 2020/8/27 18:34
- */
-@Data
-public class NeoEntityDTO {
-
-    // 实体名称
-    private String name;
-
-    // 实体标签
-    private List<String> labels = new ArrayList<>();
-
-    // 实体属性
-    private Map<String, String> property = new HashMap<>();
-
-    // 实体属性列表
-    private List<Map<String, Object>> nodes = new ArrayList<>();
-
-    // 返回信息
-    private String msg;
-}

src/main/java/com/diagbot/dto/NeoPushGeneralDTO.java

@@ -1,13 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Data;
-
-/**
- * @description: 推理出参
- * @author: zhoutg
- * @time: 2020/8/17 15:34
- */
-@Data
-public class NeoPushGeneralDTO {
-    private String name;
-}

src/main/java/com/diagbot/dto/NeoRelationDTO.java

@@ -1,39 +0,0 @@
-package com.diagbot.dto;
-
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @description: 图谱关系内容
- * @author: Mark
- * @time: 2020/8/27 18:34
- */
-@Data
-public class NeoRelationDTO {
-
-    // 起始实体名称
-    private String startname;
-
-    // 起始实体标签
-    private String startlabel;
-
-    // 关系名称
-    private String relname;
-
-    // 关系属性
-    private Map<String, String> property = new HashMap<>();
-
-    // 终点实体名称
-    private String endname;
-
-    // 终点实体标签
-    private String endlabel;
-
-    // 返回信息
-    private String msg;
-}

src/main/java/com/diagbot/dto/NodeNeoDTO.java

@@ -1,37 +0,0 @@
-package com.diagbot.dto;
-
-
-import lombok.Data;
-
-import java.math.BigDecimal;
-
-@Data
-public class NodeNeoDTO {
-
-    // 最小值
-    private BigDecimal min;
-
-    // 最大值
-    private BigDecimal max;
-
-    // 单位
-    private String unit;
-
-    // 结果
-    private String val;
-
-    // 名称
-    private String name;
-
-    // 正则规则
-    private String regex;
-
-    // 类型
-    private String termtype;
-
-    // 取值类型(0：正常取区间，1：取两头)
-    private Integer valType = 0;
-
-    // 匹配方式 0：精确匹配，1：包含匹配
-    private int exactMatch = 0;
-}

src/main/java/com/diagbot/dto/OperationBillNeoDTO.java

@@ -1,57 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @description: 手术和操作开单合理性图谱数据
- * @author: Mark
- * @time: 2020/7/29 9:57
- */
-@Data
-public class OperationBillNeoDTO {
-    // 禁忌性别
-    private NodeNeoDTO gender;
-
-    // 禁忌年龄
-    private NodeNeoDTO ageNeoDTO;
-
-    // 临床表现
-    private List<NodeNeoDTO> clinicfindings = new ArrayList<>();
-
-    // 体征
-    private List<NodeNeoDTO> vitals = new ArrayList<>();
-
-    // 禁忌实验室检查
-    private List<NodeNeoDTO> lis = new ArrayList<>();
-
-    // 禁忌辅助检查
-    private List<NodeNeoDTO> pacs = new ArrayList<>();
-
-    // 禁忌过敏药品
-//    private List<NodeNeoDTO> allergicmeds = new ArrayList<>();
-
-    // 禁忌服用药品
-    private List<NodeNeoDTO> oralmeds = new ArrayList<>();
-
-    // 禁忌疾病
-    private List<NodeNeoDTO> disease = new ArrayList<>();
-
-    // 禁用人群
-    private List<NodeNeoDTO> group = new ArrayList<>();
-
-    // 配伍禁忌
-    private List<NodeNeoDTO> conflictmeds = new ArrayList<>();
-
-    // 禁用辅助检查描述
-    private List<NodeNeoDTO> pacsDesc = new ArrayList<>();
-
-    // 禁忌药物过敏原
-    private List<NodeNeoDTO> medallegen = new ArrayList<>();
-
-    // 禁忌医疗器械及物品
-    private List<NodeNeoDTO> meddevice = new ArrayList<>();
-
-}

src/main/java/com/diagbot/dto/OtherTipNeoDTO.java

@@ -1,20 +0,0 @@
-package com.diagbot.dto;
-
-import com.diagbot.biz.push.entity.Lis;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @description: 其他提醒数据
- * @author: Mark
- * @time: 2020/7/29 9:57
- */
-@Data
-public class OtherTipNeoDTO extends Lis {
-
-    // 其他提醒相关因素
-    private List<NodeNeoDTO> factor = new ArrayList<>();
-
-}

src/main/java/com/diagbot/dto/OtherTipPacsNeoDTO.java

@@ -1,15 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Data;
-
-/**
- * @description: 其他提醒数据——辅检
- * @author: Mark
- * @time: 2020/7/29 9:57
- */
-@Data
-public class OtherTipPacsNeoDTO {
-
-    // 提示语
-    private String msg;
-}

src/main/java/com/diagbot/dto/OtherTipTransfusionNeoDTO.java

@@ -1,36 +0,0 @@
-package com.diagbot.dto;
-
-import com.diagbot.biz.push.entity.Item;
-import com.diagbot.biz.push.entity.Lis;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @description: 其他提醒数据——输注
- * @author: Mark
- * @time: 2020/7/29 9:57
- */
-@Data
-public class OtherTipTransfusionNeoDTO {
-
-    // 输血名称
-    private String name;
-
-    // 化验
-    private List<Lis> lisList = new ArrayList<>();
-
-    // 辅检
-    private List<Item> pacs = new ArrayList<>();
-
-    // 辅检结果
-    private List<Item> pacsRes = new ArrayList<>();
-
-    // 手术及操作
-    private List<Item> operation = new ArrayList<>();
-
-    // 诊断
-    private List<Item> diag = new ArrayList<>();
-
-}

src/main/java/com/diagbot/dto/PacsBillNeoDTO.java

@@ -1,60 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @description: 辅检开单合理性图谱数据
- * @author: Mark
- * @time: 2020/7/29 9:57
- */
-@Data
-public class PacsBillNeoDTO {
-    // 禁忌性别
-    private NodeNeoDTO gender;
-
-    // 禁忌年龄
-    private NodeNeoDTO ageNeoDTO;
-
-    // 临床表现
-    private List<NodeNeoDTO> clinicfindings = new ArrayList<>();
-
-    // 体征
-    private List<NodeNeoDTO> vitals = new ArrayList<>();
-
-    // 禁忌服用药品
-    private List<NodeNeoDTO> oralmeds = new ArrayList<>();
-
-    // 禁忌过敏药品
-    private List<NodeNeoDTO> allergicmeds = new ArrayList<>();
-
-    // 禁忌手术
-    private List<NodeNeoDTO> operations = new ArrayList<>();
-
-    // 禁忌禁忌医疗器械及物品
-    private List<NodeNeoDTO> meddevice = new ArrayList<>();
-
-    // 禁忌实验室检查
-    private List<NodeNeoDTO> lis = new ArrayList<>();
-
-    // 禁忌辅助检查
-    private List<NodeNeoDTO> pacs = new ArrayList<>();
-
-    // 互斥开单辅助检查
-    private List<NodeNeoDTO> pacsOrder = new ArrayList<>();
-
-    // 禁忌疾病
-    private List<NodeNeoDTO> disease = new ArrayList<>();
-
-    // 禁用人群
-    private List<NodeNeoDTO> group = new ArrayList<>();
-
-    // 禁用辅助检查描述
-    private List<NodeNeoDTO> pacsDesc = new ArrayList<>();
-
-    // 无需重复辅检开单项
-    private List<NodeNeoDTO> needlessPacsOrder = new ArrayList<>();
-
-}

src/main/java/com/diagbot/dto/PresBillDTO.java

@@ -1,45 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Data;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.util.List;
-
-/**
- * @description: 药方开单合理性项目
- * @author: Mark
- * @time: 2020/7/29 9:57
- */
-@Data
-public class PresBillDTO {
-    // 禁忌性别
-    private String gender;
-
-    // 年龄最小值
-    private int minage;
-
-    // 年龄最大值
-    private int maxage;
-
-    // 临床表现
-    private List<String> clinicfindings;
-
-    // 禁忌手术
-    private List<String> operations;
-
-    // 禁忌操作
-    private List<String> procedures;
-
-    // 禁忌辅助检查
-    private List<String> PACS;
-
-    // 禁忌疾病
-    private List<String> disease;
-
-    // 禁用人群
-    private List<String> group;
-
-    // 配伍禁忌
-    private List<String> meds;
-}

src/main/java/com/diagbot/dto/TransfusionBillNeoDTO.java

@@ -1,53 +0,0 @@
-package com.diagbot.dto;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @description: 输血开单合理性图谱数据
- * @author: Mark
- * @time: 2020/7/29 9:57
- */
-@Data
-public class TransfusionBillNeoDTO {
-    // 禁忌性别
-    private NodeNeoDTO gender;
-
-    // 禁忌年龄
-    private NodeNeoDTO ageNeoDTO;
-
-    // 临床表现
-    private List<NodeNeoDTO> clinicfindings = new ArrayList<>();
-
-    // 体征
-    private List<NodeNeoDTO> vitals = new ArrayList<>();
-
-    // 禁忌实验室检查
-    private List<NodeNeoDTO> lis = new ArrayList<>();
-
-    // 禁忌辅助检查
-    private List<NodeNeoDTO> pacs = new ArrayList<>();
-
-    // 禁忌过敏药品
-//    private List<NodeNeoDTO> allergicmeds = new ArrayList<>();
-
-    // 禁忌服用药品
-    private List<NodeNeoDTO> oralmeds = new ArrayList<>();
-
-    // 禁忌疾病
-    private List<NodeNeoDTO> disease = new ArrayList<>();
-
-    // 禁用人群
-    private List<NodeNeoDTO> group = new ArrayList<>();
-
-    // 配伍禁忌
-    private List<NodeNeoDTO> conflictmeds = new ArrayList<>();
-
-    // 禁用辅助检查描述
-    private List<NodeNeoDTO> pacsDesc = new ArrayList<>();
-
-    // 禁用手术和操作
-    private List<NodeNeoDTO> operations = new ArrayList<>();
-}

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

@@ -452,38 +452,6 @@ public class NeoFacade {
         return neoPushDTO;
     }
 
-
-    /**
-     * 处理开单合理性图谱数据
-     *
-     * @param billNeoVO
-     * @return
-     */
-    public List<BillNeoDTO> getBillNeo(BillNeoVO billNeoVO) {
-        List<BillNeoDTO> billNeoDTOs = new ArrayList<>();
-        //                try {
-        //                    billNeoDTOs.addAll(getDrugBill(billNeoVO.getDrugList()));
-        //                    billNeoDTOs.addAll(getPacsBill(billNeoVO.getPacsList()));
-        //                    billNeoDTOs.addAll(getLisDetailBill(billNeoVO.getLisDetailList()));
-        //                    billNeoDTOs.addAll(getLisBill(billNeoVO.getLisList()));
-        //                    billNeoDTOs.addAll(getOperationBill(billNeoVO.getOperationList()));
-        //                    billNeoDTOs.addAll(getCombiOpBill(billNeoVO.getCombiopList()));
-        //                    billNeoDTOs.addAll(getTransfusionBill(billNeoVO.getTransfusionList()));
-        //                } catch (Exception ex) {
-        //                    ex.printStackTrace();
-        //                }
-
-        try {
-            Map<String, Object> invokeParams = new HashMap<>();
-            invokeParams.put("billNeoVO", billNeoVO);
-            billNeoDTOs = DataFacade.get("getBillNeo", invokeParams, List.class);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return billNeoDTOs;
-    }
-
     /**
      * 推送疾病信息
      *

src/main/java/com/diagbot/process/HighRiskProcess.java

@@ -2,9 +2,7 @@ package com.diagbot.process;
 
 import com.diagbot.biz.push.entity.Item;
 import com.diagbot.dto.BillMsg;
-import com.diagbot.dto.HighRiskNeoDTO;
 import com.diagbot.dto.IndicationDTO;
-import com.diagbot.dto.NodeNeoDTO;
 import com.diagbot.dto.RuleBaseDTO;
 import com.diagbot.dto.RuleConditionDTO;
 import com.diagbot.dto.RuleExtDTO;
@@ -27,7 +25,6 @@ import com.diagbot.vo.RuleVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -183,39 +180,4 @@ public class HighRiskProcess {
         }
         return null;
     }
-
-    /**
-     * 处理业务
-     *
-     * @param highRiskNeoDTOList
-     * @param res
-     */
-    public void process(List<HighRiskNeoDTO> highRiskNeoDTOList, IndicationDTO res, WordCrfDTO wordCrfDTO) {
-        List<BillMsg> highRiskList = new ArrayList<>();
-        CommonRule commonRule = new CommonRule();
-        for (HighRiskNeoDTO highRiskNeoDTO : highRiskNeoDTOList) {
-            System.out.println(highRiskNeoDTO);
-            String type = highRiskNeoDTO.getType();
-            if (highRiskNeoDTO.getIsHighrisk() == true) {
-                commonRule.highRisk(highRiskNeoDTO, highRiskList);
-            } else {
-                // 复杂情况高危手术
-                if (TypeEnum.operation.getName().equals(type)) {
-                    List<NodeNeoDTO> factor = highRiskNeoDTO.getFactor();
-                    for (NodeNeoDTO nodeNeoDTO : factor) {
-                        switch (TypeEnum.getEnum(nodeNeoDTO.getTermtype())) {
-                            case disease:
-                            case lis:
-                            case pacs:
-                            case vital:
-                            case age:
-                                commonRule.highRiskComplex(nodeNeoDTO, highRiskList, highRiskNeoDTO);
-                                break;
-                        }
-                    }
-                }
-            }
-        }
-        res.setHighRiskList(highRiskList);
-    }
 }

src/main/java/com/diagbot/rule/CommonRule.java

@@ -3,8 +3,6 @@ package com.diagbot.rule;
 import com.diagbot.biz.push.entity.Item;
 import com.diagbot.biz.push.entity.Pacs;
 import com.diagbot.dto.BillMsg;
-import com.diagbot.dto.HighRiskNeoDTO;
-import com.diagbot.dto.NodeNeoDTO;
 import com.diagbot.dto.RuleBaseDTO;
 import com.diagbot.dto.RuleSimpleDTO;
 import com.diagbot.dto.WordCrfDTO;
@@ -361,18 +359,6 @@ public class CommonRule {
         }
     }
 
-    /**
-     * 高风险药品、手术
-     *
-     * @param highRiskNeoDTO
-     * @param highRiskList
-     */
-    public void highRisk(HighRiskNeoDTO highRiskNeoDTO, List<BillMsg> highRiskList) {
-        BillMsg billMsg = MsgUtil.getCommonHighRiskMsg(highRiskNeoDTO.getName(),
-                highRiskNeoDTO.getHighLevel(), highRiskNeoDTO.getType());
-        highRiskList.add(billMsg);
-    }
-
     /**
      * 高风险药品、手术
      *
@@ -385,17 +371,6 @@ public class CommonRule {
         highRiskList.add(billMsg);
     }
 
-    /**
-     * fa'zha
-     *
-     * @param highRiskNeoDTO
-     * @param highRiskList
-     */
-    public void highRiskComplex(NodeNeoDTO nodeNeoDTO, List<BillMsg> highRiskList, HighRiskNeoDTO highRiskNeoDTO) {
-        BillMsg billMsg = MsgUtil.getCommonHighRiskMsg(nodeNeoDTO.getVal(), highRiskNeoDTO.getName(), nodeNeoDTO.getTermtype());
-        highRiskList.add(billMsg);
-    }
-
     /**
      * 返回诊断数据源(只留阳性诊断)
      *

src/main/java/com/diagbot/util/CoreUtil.java

@@ -2,7 +2,6 @@ package com.diagbot.util;
 
 import com.diagbot.biz.push.entity.Item;
 import com.diagbot.biz.push.entity.Lis;
-import com.diagbot.dto.NodeNeoDTO;
 import com.diagbot.dto.RuleBaseDTO;
 import com.diagbot.model.entity.BodyPart;
 import com.diagbot.model.entity.Clinical;
@@ -431,29 +430,6 @@ public class CoreUtil {
         return s;
     }
 
-    /**
-     * 获取提示信息（例如：年龄19[0,20]）
-     *
-     * @param nodeNeoDTO
-     * @return
-     */
-    public static String getStrMsgWithRange(NodeNeoDTO nodeNeoDTO, String name, String value) {
-        if (nodeNeoDTO == null) {
-            return "";
-        }
-        StringBuffer sb = new StringBuffer();
-        sb.append(name).append(value).append("[");
-        if (nodeNeoDTO.getMin() != null) {
-            sb.append(nodeNeoDTO.getMin());
-        }
-        sb.append(",");
-        if (nodeNeoDTO.getMax() != null) {
-            sb.append(nodeNeoDTO.getMax());
-        }
-        sb.append("]");
-        return sb.toString();
-    }
-
     /**
      * list 转 string
      * @param list

src/main/java/com/diagbot/util/NeoUtil.java

@@ -1,7 +1,5 @@
 package com.diagbot.util;
 
-import com.alibaba.fastjson.JSONObject;
-import com.diagbot.dto.NodeNeoDTO;
 import com.diagbot.dto.PushBaseDTO;
 import com.diagbot.model.entity.PD;
 import org.apache.commons.lang3.StringUtils;
@@ -14,48 +12,6 @@ public class NeoUtil {
 
     private static String regex = "(.*)\\([a-zA-Z0-9]+\\)";
 
-//    public static NodeNeoDTO updateNodeInfo(NodeInfo nodeInfo) {
-//        NodeNeoDTO nodeNeoDTO = new NodeNeoDTO();
-//
-//        String name = nodeInfo.getName();
-//        name = (null==name)?"":name;
-////        name = datautil.removekey(name, Constants.conflict);
-//        nodeNeoDTO.setName(name);
-//
-//        nodeNeoDTO.setRegex(nodeInfo.getRegex());
-//
-//        BigDecimal min = nodeInfo.getMinval();
-//        if (null!=min) {
-//            nodeNeoDTO.setMin(min);
-//        }
-//
-//        BigDecimal max = nodeInfo.getMaxval();
-//        if (null!=max) {
-//            nodeNeoDTO.setMax(max);
-//        }
-//
-//        String unit = nodeInfo.getUnit();
-//        unit = (null==unit)?"":unit;
-//        nodeNeoDTO.setUnit(unit);
-//
-//        Integer range = nodeInfo.getRange();
-//        range = (null==range)?0:range;
-//        nodeNeoDTO.setValType(range);
-//
-//        String type = nodeInfo.getTypeval();
-//        type = (null==type)?"":type;
-//        nodeNeoDTO.setTermtype(type);
-//
-//        if (nodeInfo.getMatchtype()!=null && nodeInfo.getMatchtype()==1) {
-//            nodeNeoDTO.setExactMatch(1);
-//        }
-//
-//        return nodeNeoDTO;
-//    }
-
-
-
-
     public static PushBaseDTO updatePushInfo(String name) {
         PushBaseDTO pushBaseDTO = new PushBaseDTO();
 
@@ -83,71 +39,6 @@ public class NeoUtil {
         return bd;
     }
 
-    public static NodeNeoDTO jsontoNodeNeoDTO(String name, JSONObject jobj) {
-
-        NodeNeoDTO nodeNeoDTO = null;
-        try {
-            nodeNeoDTO = new NodeNeoDTO();
-            nodeNeoDTO.setName(name.trim());
-            if (null!=jobj) {
-                for (String key : jobj.keySet()) {
-                    switch (key) {
-                        case "最大值":
-                            nodeNeoDTO.setMax(new BigDecimal(jobj.getString(key)));
-                            break;
-                        case "最小值":
-                            nodeNeoDTO.setMin(new BigDecimal(jobj.getString(key)));
-                            break;
-                        case "单位":
-                            nodeNeoDTO.setUnit(jobj.getString(key));
-                            break;
-                        case "范围":
-                            nodeNeoDTO.setValType(jobj.getIntValue(key));
-                            break;
-                        case "结果":
-                            nodeNeoDTO.setVal(jobj.getString(key));
-                            break;
-                    }
-                }
-            }
-        }
-        catch (Exception ex) {
-            ex.printStackTrace();
-        }
-        finally {
-            return nodeNeoDTO;
-        }
-    }
-
-
-//    public static String getMedType(String medname) {
-//        String medtype = Constants.yaoping;
-//        if (medname.matches(regex)) {
-//            medtype = Constants.yaopingleibie;
-//        }
-//
-//        return medtype;
-//    }
-//
-//    public static boolean matchBasic(YiBaoDiseaseName disease, int gender_code, double age){
-//        boolean match = true;
-//        if(disease != null){
-//            String gender_neo4j = disease.getGender();
-//            String age_neo4j = disease.getAge();
-//            if((gender_neo4j != null && gender_neo4j.equals("男") && gender_code != 1) ||
-//                    (gender_neo4j != null && gender_neo4j.equals("女") && gender_code != 2)){
-//                match = false;
-//            }else if(age_neo4j != null ){
-//                String[] betweenAge = age_neo4j.split("-");
-//                if(betweenAge.length == 2 && (age < Double.parseDouble(betweenAge[0])
-//                        || age > Double.parseDouble(betweenAge[1]))){
-//                    match = false;
-//                }
-//            }
-//        }
-//        return match;
-//    }
-
     /**
      * 性别、年龄匹配
      * @param disease
@@ -211,111 +102,9 @@ public class NeoUtil {
                 }
             }
         }
-
         return match;
     }
 
-
-    /*
-    public static NodeNeoDTO fillNodeNeoDTO(Vital vital) {
-        NodeNeoDTO nodeNeoDTO = new NodeNeoDTO();
-        Integer range;
-        BigDecimal max, min;
-
-        String name = (vital.getVitalidx()==null)?vital.getName():vital.getVitalidx();
-        nodeNeoDTO.setName(name);
-
-        max = (vital.getMaxval()==null)?null:new BigDecimal(vital.getMaxval());
-        nodeNeoDTO.setMax(max);
-
-        min = (vital.getMinval()==null)?null:new BigDecimal(vital.getMinval());
-        nodeNeoDTO.setMin(min);
-
-        range = (vital.getRange()==null)?0:vital.getRange();
-        nodeNeoDTO.setValType(range);
-
-        nodeNeoDTO.setUnit(vital.getUnit());
-
-        nodeNeoDTO.setTermtype(vital.getVitalidx());
-
-        return nodeNeoDTO;
-    }
-    */
-
-
-    public static boolean inlist(String name, List<NodeNeoDTO> NodeNeoDTOs) {
-        boolean isin = false;
-
-        for (NodeNeoDTO node : NodeNeoDTOs) {
-            if (node.getName().equals(name)) {
-                isin = true;
-                break;
-            }
-        }
-
-        return isin;
-    }
-
-
-//    public static boolean isExist(BaseRelation relationship) {
-    //
-    //        if (null==relationship) {
-    //            return false;
-    //        }
-    //        else if (null==relationship.getStatus() ||
-    //                (null!=relationship.getStatus() && relationship.getStatus()==1)) {
-    //            return true;
-    //        }
-    //        else {
-    //            return false;
-    //        }
-    //    }
-    //
-    //
-    //
-    //    public static boolean isExist(BaseNode node) {
-    //
-    //        if (null==node) {
-    //            return false;
-    //        }
-    //        else if (null==node.getStatus() ||
-    //                (null!=node.getStatus() && node.getStatus()==1)) {
-    //            return true;
-    //        }
-    //        else {
-    //            return false;
-    //        }
-    //    }
-    //
-    //
-    //    public static YiBaoDiseaseName extract_node(YiBaoDiseaseName yiBaoDiseaseName) {
-    //        for (YiBaoDiseaseNameSymptom symptom : yiBaoDiseaseName.getYiBaoDiseaseNameSymptoms()) {
-    //            if (isExist(symptom)) {
-    //                yiBaoDiseaseName.getSymptoms().add(symptom.getSymptom());
-    //            }
-    //        }
-    //
-    //        for (YiBaoDiseaseNameVital vital : yiBaoDiseaseName.getYiBaoDiseaseNameVitals()) {
-    //            if (isExist(vital)) {
-    //                yiBaoDiseaseName.getVitals().add(vital.getVital());
-    //            }
-    //        }
-    //
-    //        for (YiBaoDiseaseNameLisBigName lis : yiBaoDiseaseName.getYiBaoDiseaseNameLisnames()) {
-    //            if (isExist(lis)) {
-    //                yiBaoDiseaseName.getLisnames().add(lis.getLisBigName());
-    //            }
-    //        }
-    //
-    //        for (YiBaoDiseaseNamePacsName pacs : yiBaoDiseaseName.getYiBaoDiseaseNamePacsnames()) {
-    //            if (isExist(pacs)) {
-    //                yiBaoDiseaseName.getPacsnames().add(pacs.getPacsName());
-    //            }
-    //        }
-    //
-    //        return yiBaoDiseaseName;
-    //    }
-
     public static void main(String[] args) {
         PD pd = new PD();
         pd.setValue("两月");

src/main/java/com/diagbot/vo/BillNeoVO.java

@@ -1,36 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Data
-public class BillNeoVO {
-
-    // 化验入参
-    private List<Map<String, String>> lisList = new ArrayList();
-
-    // 化验细项入参
-    private List<Map<String, String>> lisDetailList = new ArrayList();
-
-    // 辅检入参
-    private List<Map<String, String>> pacsList = new ArrayList();
-
-    // 药品入参
-    private List<Map<String, Drug>> drugList = new ArrayList();
-
-    // 诊断入参
-    private List<Map<String, String>> diagList = new ArrayList();
-
-    // 手术和操作入参
-    private List<Map<String, String>> operationList = new ArrayList();
-
-    // 联合项目入参
-    private List<Map<String, String>> combiopList = new ArrayList();
-
-    // 输血开单项
-    private List<Map<String, String>> transfusionList = new ArrayList();
-}

src/main/java/com/diagbot/vo/CriticalNeoVO.java

@@ -1,29 +0,0 @@
-package com.diagbot.vo;
-
-import com.diagbot.biz.push.entity.Lis;
-import com.diagbot.model.label.PacsLabel;
-import com.diagbot.model.label.VitalLabel;
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-@Data
-public class CriticalNeoVO {
-
-    // 年龄
-    private Double age;
-
-    // 性别（1：男，2：女）
-    private Integer sex;
-
-    // 体征
-    private VitalLabel vitalLabel = new VitalLabel();
-
-    // 化验项目和结果
-    private List<Lis> lis = new ArrayList<>();
-
-    // 辅检结果
-    private PacsLabel pacsLabel = new PacsLabel();
-
-}

src/main/java/com/diagbot/vo/HighRiskNeoVO.java

@@ -1,18 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Data
-public class HighRiskNeoVO {
-
-    // 药品入参
-    private List<Drug> drugList = new ArrayList<>();
-
-    // 手术和操作入参
-    private Map<String, String> operationList = new HashMap<>();
-}

src/main/java/com/diagbot/vo/NeoEntityVO.java

@@ -1,32 +0,0 @@
-package com.diagbot.vo;
-
-import com.diagbot.vo.neoPushEntity.*;
-import lombok.Data;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @Description: 图谱修改入参
- * @Author:Mark
- * @time: 2020/8/28 9:34
- */
-@Data
-public class NeoEntityVO {
-    // 用户名
-    private String user;
-    // 节点ID
-    private Long ID;
-    // 节点标签
-    private String label;
-    // 节点名称
-    private String name;
-    // 节点更新标签
-    private String newlabel;
-    // 节点更新名称
-    private String newname;
-    // 节点更新属性
-    private EntityProp entityProp;
-
-}

src/main/java/com/diagbot/vo/NeoRelationVO.java

@@ -1,32 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Data;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @Description: 图谱修改入参
- * @Author:Mark
- * @time: 2020/8/28 9:34
- */
-@Data
-public class NeoRelationVO {
-    // 操作用户
-    private String user;
-    // 节点ID
-    private Long ID;
-    // 起始节点标签
-    private String startlabel;
-    // 起始节点名称
-    private String startname;
-    // 关系名称
-    private String relname;
-    // 终点节点标签
-    private String endabel;
-    // 终点节点名称
-    private String endname;
-    // 关系更新属性
-    private Map<String, String> property = new HashMap<>();
-
-}

src/main/java/com/diagbot/vo/PushNeoVO.java

@@ -1,19 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Data;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @description:
- * @author: zhoutg
- * @time: 2020/8/6 16:42
- */
-@Data
-public class PushNeoVO {
-
-    List<String> diags = new ArrayList<>();
-    private Integer sex;
-    private Integer age;
-}